diff options
| author | Alan Cox | 2011-07-15 18:35:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-15 19:05:08 +0200 |
| commit | 3a970ac1b14cf1a49076d69369aa75a23d4ad2db (patch) | |
| tree | 3127d9283a87f2f5d8cda61522de225b96b31e72 /drivers/staging/gma500/psb_drv.c | |
| parent | gma500: resync with Medfield progress (diff) | |
| download | kernel-qcow2-linux-3a970ac1b14cf1a49076d69369aa75a23d4ad2db.tar.gz kernel-qcow2-linux-3a970ac1b14cf1a49076d69369aa75a23d4ad2db.tar.xz kernel-qcow2-linux-3a970ac1b14cf1a49076d69369aa75a23d4ad2db.zip | |
gma500: Clean up the DPU config and make it runtime
We really don't want this all done by ifdeffery - and this isn't any need
as it's fairly easy to sort out.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_drv.c')
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index 4b740aac2a42..b2cdce7b97ef 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -421,15 +421,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) #if defined(CONFIG_DRM_PSB_MFLD) /* FIXME: this is not the right place for this stuff ! */ - if (IS_MFLD(dev)) { -#ifdef CONFIG_MDFLD_DSI_DPU - /*init dpu info*/ - mdfld_dbi_dpu_init(dev); -#else - mdfld_dbi_dsr_init(dev); -#endif /*CONFIG_MDFLD_DSI_DPU*/ - /* INIT_WORK(&dev_priv->te_work, mdfld_te_handler_work);*/ - } + mdfld_output_setup(dev); #endif if (drm_psb_no_fb == 0) { psb_modeset_init(dev); @@ -444,6 +436,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) switch (psb_intel_output->type) { case INTEL_OUTPUT_LVDS: + case INTEL_OUTPUT_MIPI: ret = gma_backlight_init(dev); break; } |