diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-08-13 15:17:59 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-14 11:16:28 -0400 |
commit | 4e13c0ea2ca076068fa2dff20709434d6f41e1ce (patch) | |
tree | abd30391b0e88d44ba491871a39ed772d3f35b99 /arch | |
parent | 08ee000b51fc8a4b5e88c478a860f4a689be20b5 (diff) |
ARM: S3C64XX: Add audio support to SmartQ
This adds the I²C board information for the WM8987 used in the SmartQ as audio
codec and adds the I²C/I²S platform drivers.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index 20ddce689924..3a9639bc3d9b 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c | |||
@@ -227,6 +227,10 @@ static struct platform_device smartq_lcd_power_device = { | |||
227 | .dev.platform_data = &smartq_lcd_power_data, | 227 | .dev.platform_data = &smartq_lcd_power_data, |
228 | }; | 228 | }; |
229 | 229 | ||
230 | static struct i2c_board_info smartq_i2c_devs[] __initdata = { | ||
231 | { I2C_BOARD_INFO("wm8987", 0x1a), }, | ||
232 | }; | ||
233 | |||
230 | static struct platform_device *smartq_devices[] __initdata = { | 234 | static struct platform_device *smartq_devices[] __initdata = { |
231 | &s3c_device_hsmmc1, /* Init iNAND first, ... */ | 235 | &s3c_device_hsmmc1, /* Init iNAND first, ... */ |
232 | &s3c_device_hsmmc0, /* ... then the external SD card */ | 236 | &s3c_device_hsmmc0, /* ... then the external SD card */ |
@@ -240,6 +244,7 @@ static struct platform_device *smartq_devices[] __initdata = { | |||
240 | &s3c_device_timer[1], | 244 | &s3c_device_timer[1], |
241 | &s3c_device_ts, | 245 | &s3c_device_ts, |
242 | &s3c_device_usb_hsotg, | 246 | &s3c_device_usb_hsotg, |
247 | &s3c64xx_device_iis0, | ||
243 | &smartq_backlight_device, | 248 | &smartq_backlight_device, |
244 | &smartq_lcd_control_device, | 249 | &smartq_lcd_control_device, |
245 | &smartq_lcd_power_device, | 250 | &smartq_lcd_power_device, |
@@ -381,6 +386,9 @@ void __init smartq_machine_init(void) | |||
381 | s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata); | 386 | s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata); |
382 | s3c24xx_ts_set_platdata(&smartq_touchscreen_pdata); | 387 | s3c24xx_ts_set_platdata(&smartq_touchscreen_pdata); |
383 | 388 | ||
389 | i2c_register_board_info(0, smartq_i2c_devs, | ||
390 | ARRAY_SIZE(smartq_i2c_devs)); | ||
391 | |||
384 | WARN_ON(smartq_lcd_setup_gpio()); | 392 | WARN_ON(smartq_lcd_setup_gpio()); |
385 | WARN_ON(smartq_power_off_init()); | 393 | WARN_ON(smartq_power_off_init()); |
386 | WARN_ON(smartq_usb_host_init()); | 394 | WARN_ON(smartq_usb_host_init()); |