diff options
author | Alan Cox <alan@linux.intel.com> | 2011-07-15 12:47:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 13:12:15 -0400 |
commit | 1e18d178ac5434b2a6b5d7b790cbdfb55dfd81bc (patch) | |
tree | 186dc4f82fcbd4509cb4c9be749213dbce68741e /drivers/staging | |
parent | c603685443208fa6c52d5080637b36bf7092ac69 (diff) |
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 ac791c48eeda..e7999a2a3796 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, | |||
347 | * if closed, act like it's not there for now | 347 | * if closed, act like it's not there for now |
348 | */ | 348 | */ |
349 | 349 | ||
350 | /* This ifdef can go once the cpu ident stuff is cleaned up in arch */ | 350 | i2c_adap = i2c_get_adapter(dev_priv->ops->i2c_bus); |
351 | #if defined(CONFIG_X86_MRST) | ||
352 | if (mrst_identify_cpu()) | ||
353 | i2c_adap = i2c_get_adapter(2); | ||
354 | else /* Oaktrail uses I2C 1 */ | ||
355 | #endif | ||
356 | i2c_adap = i2c_get_adapter(1); | ||
357 | 351 | ||
358 | if (i2c_adap == NULL) | 352 | if (i2c_adap == NULL) |
359 | printk(KERN_ALERT "No ddc adapter available!\n"); | 353 | dev_err(dev->dev, "No ddc adapter available!\n"); |
360 | /* | 354 | /* |
361 | * Attempt to get the fixed panel mode from DDC. Assume that the | 355 | * Attempt to get the fixed panel mode from DDC. Assume that the |
362 | * preferred mode is the right one. | 356 | * preferred mode is the right one. |
@@ -378,7 +372,6 @@ void mrst_lvds_init(struct drm_device *dev, | |||
378 | } | 372 | } |
379 | } | 373 | } |
380 | } | 374 | } |
381 | |||
382 | /* | 375 | /* |
383 | * If we didn't get EDID, try geting panel timing | 376 | * If we didn't get EDID, try geting panel timing |
384 | * from configuration data | 377 | * from configuration data |
@@ -386,8 +379,7 @@ void mrst_lvds_init(struct drm_device *dev, | |||
386 | mode_dev->panel_fixed_mode = mrst_lvds_get_configuration_mode(dev); | 379 | mode_dev->panel_fixed_mode = mrst_lvds_get_configuration_mode(dev); |
387 | 380 | ||
388 | if (mode_dev->panel_fixed_mode) { | 381 | if (mode_dev->panel_fixed_mode) { |
389 | mode_dev->panel_fixed_mode->type |= | 382 | mode_dev->panel_fixed_mode->type |= DRM_MODE_TYPE_PREFERRED; |
390 | DRM_MODE_TYPE_PREFERRED; | ||
391 | goto out; /* FIXME: check for quirks */ | 383 | goto out; /* FIXME: check for quirks */ |
392 | } | 384 | } |
393 | 385 | ||