diff options
-rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 3 |
5 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index a45340de7465..bfbb63936f33 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c | |||
@@ -41,6 +41,9 @@ static struct i2c_board_info __initdata da830_evm_i2c_devices[] = { | |||
41 | I2C_BOARD_INFO("24c256", 0x50), | 41 | I2C_BOARD_INFO("24c256", 0x50), |
42 | .platform_data = &da830_evm_i2c_eeprom_info, | 42 | .platform_data = &da830_evm_i2c_eeprom_info, |
43 | }, | 43 | }, |
44 | { | ||
45 | I2C_BOARD_INFO("tlv320aic3x", 0x18), | ||
46 | } | ||
44 | }; | 47 | }; |
45 | 48 | ||
46 | static struct davinci_i2c_platform_data da830_evm_i2c_0_pdata = { | 49 | static struct davinci_i2c_platform_data da830_evm_i2c_0_pdata = { |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index f2946a0cf6f6..c759d72494e0 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -143,6 +143,12 @@ static struct platform_device da850_evm_nandflash_device = { | |||
143 | .resource = da850_evm_nandflash_resource, | 143 | .resource = da850_evm_nandflash_resource, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | static struct i2c_board_info __initdata da850_evm_i2c_devices[] = { | ||
147 | { | ||
148 | I2C_BOARD_INFO("tlv320aic3x", 0x18), | ||
149 | } | ||
150 | }; | ||
151 | |||
146 | static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = { | 152 | static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = { |
147 | .bus_freq = 100, /* kHz */ | 153 | .bus_freq = 100, /* kHz */ |
148 | .bus_delay = 0, /* usec */ | 154 | .bus_delay = 0, /* usec */ |
@@ -343,6 +349,9 @@ static __init void da850_evm_init(void) | |||
343 | 349 | ||
344 | davinci_serial_init(&da850_evm_uart_config); | 350 | davinci_serial_init(&da850_evm_uart_config); |
345 | 351 | ||
352 | i2c_register_board_info(1, da850_evm_i2c_devices, | ||
353 | ARRAY_SIZE(da850_evm_i2c_devices)); | ||
354 | |||
346 | /* | 355 | /* |
347 | * shut down uart 0 and 1; they are not used on the board and | 356 | * shut down uart 0 and 1; they are not used on the board and |
348 | * accessing them causes endless "too much work in irq53" messages | 357 | * accessing them causes endless "too much work in irq53" messages |
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 38157f78e1a4..9f25fd8ca4a9 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c | |||
@@ -139,7 +139,7 @@ static struct i2c_board_info dm355evm_i2c_info[] = { | |||
139 | { I2C_BOARD_INFO("dm355evm_msp", 0x25), | 139 | { I2C_BOARD_INFO("dm355evm_msp", 0x25), |
140 | .platform_data = dm355evm_mmcsd_gpios, | 140 | .platform_data = dm355evm_mmcsd_gpios, |
141 | /* plus irq */ }, | 141 | /* plus irq */ }, |
142 | /* { I2C_BOARD_INFO("tlv320aic3x", 0x1b), }, */ | 142 | { I2C_BOARD_INFO("tlv320aic33", 0x1b), }, |
143 | /* { I2C_BOARD_INFO("tvp5146", 0x5d), }, */ | 143 | /* { I2C_BOARD_INFO("tvp5146", 0x5d), }, */ |
144 | }; | 144 | }; |
145 | 145 | ||
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 6a27c5db3282..31cf84fbb01a 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
@@ -559,8 +559,10 @@ static struct i2c_board_info __initdata i2c_info[] = { | |||
559 | I2C_BOARD_INFO("24c256", 0x50), | 559 | I2C_BOARD_INFO("24c256", 0x50), |
560 | .platform_data = &eeprom_info, | 560 | .platform_data = &eeprom_info, |
561 | }, | 561 | }, |
562 | { | ||
563 | I2C_BOARD_INFO("tlv320aic33", 0x1b), | ||
564 | }, | ||
562 | /* ALSO: | 565 | /* ALSO: |
563 | * - tvl320aic33 audio codec (0x1b) | ||
564 | * - tvp5146 video decoder (0x5d) | 566 | * - tvp5146 video decoder (0x5d) |
565 | */ | 567 | */ |
566 | }; | 568 | }; |
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index cb30afe22050..20547049b489 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
@@ -299,6 +299,9 @@ static struct i2c_board_info __initdata i2c_info[] = { | |||
299 | { | 299 | { |
300 | I2C_BOARD_INFO("cpld_reg0", 0x3a), | 300 | I2C_BOARD_INFO("cpld_reg0", 0x3a), |
301 | }, | 301 | }, |
302 | { | ||
303 | I2C_BOARD_INFO("tlv320aic33", 0x18), | ||
304 | } | ||
302 | }; | 305 | }; |
303 | 306 | ||
304 | static struct davinci_i2c_platform_data i2c_pdata = { | 307 | static struct davinci_i2c_platform_data i2c_pdata = { |