diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-15 17:47:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 19:12:15 +0200 |
| commit | 1e18d178ac5434b2a6b5d7b790cbdfb55dfd81bc (patch) | |
| tree | 186dc4f82fcbd4509cb4c9be749213dbce68741e /drivers/staging | |
| parent | c603685443208fa6c52d5080637b36bf7092ac69 (diff) | |
| download | linux-0-day-1e18d178ac5434b2a6b5d7b790cbdfb55dfd81bc.tar.gz linux-0-day-1e18d178ac5434b2a6b5d7b790cbdfb55dfd81bc.tar.xz | |
gma500: wire up the mrst i2c bus from chip_info
We did the groundwork earlier now we can use it
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/gma500/mrst_lvds.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index ac791c48eedae..e7999a2a3796c 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -347,16 +347,10 @@ void mrst_lvds_init(struct drm_device *dev, * if closed, act like it's not there for now */ - /* This ifdef can go once the cpu ident stuff is cleaned up in arch */ -#if defined(CONFIG_X86_MRST) - if (mrst_identify_cpu()) - i2c_adap = i2c_get_adapter(2); - else /* Oaktrail uses I2C 1 */ -#endif - i2c_adap = i2c_get_adapter(1); + i2c_adap = i2c_get_adapter(dev_priv->ops->i2c_bus); if (i2c_adap == NULL) - printk(KERN_ALERT "No ddc adapter available!\n"); + dev_err(dev->dev, "No ddc adapter available!\n"); /* * Attempt to get the fixed panel mode from DDC. Assume that the * preferred mode is the right one. @@ -378,7 +372,6 @@ void mrst_lvds_init(struct drm_device *dev, } } } - /* * If we didn't get EDID, try geting panel timing * from configuration data @@ -386,8 +379,7 @@ void mrst_lvds_init(struct drm_device *dev, mode_dev->panel_fixed_mode = mrst_lvds_get_configuration_mode(dev); if (mode_dev->panel_fixed_mode) { - mode_dev->panel_fixed_mode->type |= - DRM_MODE_TYPE_PREFERRED; + mode_dev->panel_fixed_mode->type |= DRM_MODE_TYPE_PREFERRED; goto out; /* FIXME: check for quirks */ } |