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>

diff --git a/drivers/staging/gma500/Kconfig b/drivers/staging/gma500/Kconfig
index 5501eb9b3355050eb33526829c51e0e9c94d2fa3..ce8bedaeaac21589f84768e4788bbc4939b36488 100644 (file)
--- 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 21b9056ec84abcd73299978952db616fe91cd9d9..4a08b74f5ff92277df6182b236419f6bc683ea5f 100644 (file)
--- 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");
        /*