renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code

staging: gma500: Add oaktrail

Browse Source 
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>
This commit is contained in:
Alan Cox 2011-04-05 16:55:26 +01:00 committed by Greg Kroah-Hartman
parent cb048d5586
commit 8a789f8c30
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/gma500/Kconfig
View File

@ -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

11
drivers/staging/gma500/mrst_lvds.c
View File

@ -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");
/*