gma500: Add oaktrail

PATCH New Alan Cox 1 participant 1 message Apr 5, 2011 Staging

lore

Share & tools

lore

Alan Cox

author

2011-04-05 16:17 UTC #0 lore raw

PATCH 1/1 gma500: Add oaktrail

Oaktrail needs a couple of slight plumbing tweaks

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/Kconfig     |    2 +-
 drivers/staging/gma500/mrst_lvds.c |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

drivers/staging/gma500/Kconfig +1 -1

index 5501eb9..ce8beda 100644
@@ -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

drivers/staging/gma500/mrst_lvds.c +10 -1

index 21b9056..4a08b74 100644
@@ -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");
 	/*