Commit 8a789f8c authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

staging: gma500: Add oaktrail

Oaktrail needs a couple of slight plumbing tweaks
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cb048d55
config DRM_PSB config DRM_PSB
tristate "Intel GMA500 KMS Framebuffer" tristate "Intel GMA500 KMS Framebuffer"
depends on DRM && PCI depends on DRM && PCI && X86
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <asm/mrst.h>
#include "psb_intel_bios.h" #include "psb_intel_bios.h"
#include "psb_drv.h" #include "psb_drv.h"
...@@ -300,7 +301,15 @@ void mrst_lvds_init(struct drm_device *dev, ...@@ -300,7 +301,15 @@ void mrst_lvds_init(struct drm_device *dev,
* 4) make sure lid is open * 4) make sure lid is open
* if closed, act like it's not there for now * 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); i2c_adap = i2c_get_adapter(2);
else /* Oaktrail uses I2C 1 */
#endif
i2c_adap = i2c_get_adapter(1);
if (i2c_adap == NULL) if (i2c_adap == NULL)
printk(KERN_ALERT "No ddc adapter available!\n"); printk(KERN_ALERT "No ddc adapter available!\n");
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment