From 662cbbc83cb0eb99c725cdefa5a13bd7dd4cf285 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 13 Aug 2010 21:17:59 +0200 Subject: [PATCH] --- yaml --- r: 209383 b: refs/heads/master c: 4e13c0ea2ca076068fa2dff20709434d6f41e1ce h: refs/heads/master i: 209381: 0749d31b977feacd5c091bc7eaaf36c533264c76 209379: 5520128e84e9cc5f712d5050aeb19cde650cedf5 209375: 83e457295605a1a70598b78feeb2403d632b17fb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smartq.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d92bff2387c3..e1a505fa01d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08ee000b51fc8a4b5e88c478a860f4a689be20b5 +refs/heads/master: 4e13c0ea2ca076068fa2dff20709434d6f41e1ce diff --git a/trunk/arch/arm/mach-s3c64xx/mach-smartq.c b/trunk/arch/arm/mach-s3c64xx/mach-smartq.c index 20ddce689924..3a9639bc3d9b 100644 --- a/trunk/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/trunk/arch/arm/mach-s3c64xx/mach-smartq.c @@ -227,6 +227,10 @@ static struct platform_device smartq_lcd_power_device = { .dev.platform_data = &smartq_lcd_power_data, }; +static struct i2c_board_info smartq_i2c_devs[] __initdata = { + { I2C_BOARD_INFO("wm8987", 0x1a), }, +}; + static struct platform_device *smartq_devices[] __initdata = { &s3c_device_hsmmc1, /* Init iNAND first, ... */ &s3c_device_hsmmc0, /* ... then the external SD card */ @@ -240,6 +244,7 @@ static struct platform_device *smartq_devices[] __initdata = { &s3c_device_timer[1], &s3c_device_ts, &s3c_device_usb_hsotg, + &s3c64xx_device_iis0, &smartq_backlight_device, &smartq_lcd_control_device, &smartq_lcd_power_device, @@ -381,6 +386,9 @@ void __init smartq_machine_init(void) s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata); s3c24xx_ts_set_platdata(&smartq_touchscreen_pdata); + i2c_register_board_info(0, smartq_i2c_devs, + ARRAY_SIZE(smartq_i2c_devs)); + WARN_ON(smartq_lcd_setup_gpio()); WARN_ON(smartq_power_off_init()); WARN_ON(smartq_usb_host_init());