diff options
| author | Alan Cox | 2011-04-05 17:55:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-05 20:41:13 +0200 |
| commit | 8a789f8c306b5e3fe6ef71bb5412055075d8c87f (patch) | |
| tree | f08cb6ca5601245357ca679e4d5b5afd61410c78 /drivers/staging/gma500 | |
| parent | staging: gma500: enable the 2D op stuff (diff) | |
| download | kernel-qcow2-linux-8a789f8c306b5e3fe6ef71bb5412055075d8c87f.tar.gz kernel-qcow2-linux-8a789f8c306b5e3fe6ef71bb5412055075d8c87f.tar.xz kernel-qcow2-linux-8a789f8c306b5e3fe6ef71bb5412055075d8c87f.zip | |
staging: gma500: Add oaktrail
Oaktrail needs a couple of slight plumbing tweaks
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
| -rw-r--r-- | drivers/staging/gma500/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/mrst_lvds.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/staging/gma500/Kconfig b/drivers/staging/gma500/Kconfig index 5501eb9b3355..ce8bedaeaac2 100644 --- a/drivers/staging/gma500/Kconfig +++ b/drivers/staging/gma500/Kconfig @@ -1,6 +1,6 @@ config DRM_PSB tristate "Intel GMA500 KMS Framebuffer" - depends on DRM && PCI + depends on DRM && PCI && X86 select FB_CFB_COPYAREA select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index 21b9056ec84a..4a08b74f5ff9 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -22,6 +22,7 @@ #include <linux/i2c.h> #include <drm/drmP.h> +#include <asm/mrst.h> #include "psb_intel_bios.h" #include "psb_drv.h" @@ -300,7 +301,15 @@ void mrst_lvds_init(struct drm_device *dev, * 4) make sure lid is open * if closed, act like it's not there for now */ - i2c_adap = i2c_get_adapter(2); + + /* 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); + if (i2c_adap == NULL) printk(KERN_ALERT "No ddc adapter available!\n"); /* |