diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2010-09-27 08:32:49 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-10-30 01:45:35 +0200 |
| commit | 68730b451b7d44a9e85b76aac2d8c1aa751d38a4 (patch) | |
| tree | 42cd08ee24642a67fe2659bf6285ed4684c13689 /arch/arm | |
| parent | ARM: h1940: Fix backlight and LCD power functions (diff) | |
| download | linux-68730b451b7d44a9e85b76aac2d8c1aa751d38a4.tar.xz linux-68730b451b7d44a9e85b76aac2d8c1aa751d38a4.zip | |
ARM: h1940: add UDA1380 to i2c devices list
Register UDA1380 codec during H1940 machine init
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 974c6e4fb6ad..a5cd324708cb 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -24,6 +24,7 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/pwm_backlight.h> +#include <linux/i2c.h> #include <video/platform_lcd.h> #include <linux/mmc/host.h> @@ -59,6 +60,8 @@ #include <plat/mci.h> #include <plat/ts.h> +#include <sound/uda1380.h> + #define H1940_LATCH ((void __force __iomem *)0xF8000000) #define H1940_PA_LATCH S3C2410_CS2 @@ -365,12 +368,26 @@ static struct platform_device h1940_lcd_powerdev = { .dev.platform_data = &h1940_lcd_power_data, }; +static struct uda1380_platform_data uda1380_info = { + .gpio_power = H1940_LATCH_UDA_POWER, + .gpio_reset = S3C2410_GPA(12), + .dac_clk = UDA1380_DAC_CLK_SYSCLK, +}; + +static struct i2c_board_info h1940_i2c_devices[] = { + { + I2C_BOARD_INFO("uda1380", 0x1a), + .platform_data = &uda1380_info, + }, +}; + static struct platform_device *h1940_devices[] __initdata = { &s3c_device_ohci, &s3c_device_lcd, &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_iis, + &s3c_device_pcm, &s3c_device_usbgadget, &h1940_device_leds, &h1940_device_bluetooth, @@ -465,6 +482,9 @@ static void __init h1940_init(void) gpio_direction_output(H1940_LATCH_SD_POWER, 0); platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices)); + + i2c_register_board_info(0, h1940_i2c_devices, + ARRAY_SIZE(h1940_i2c_devices)); } MACHINE_START(H1940, "IPAQ-H1940") |