aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-at91/board-afeb-9260v1.c6
-rw-r--r--arch/arm/mach-at91/board-sam9g20ek.c9
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index e263fda3e2d1..970fd6b6753e 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -156,6 +156,8 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = {
156 * MCI (SD/MMC) 156 * MCI (SD/MMC)
157 */ 157 */
158static struct at91_mmc_data __initdata afeb9260_mmc_data = { 158static struct at91_mmc_data __initdata afeb9260_mmc_data = {
159 .det_pin = AT91_PIN_PC9,
160 .wp_pin = AT91_PIN_PC4,
159 .slot_b = 1, 161 .slot_b = 1,
160 .wire4 = 1, 162 .wire4 = 1,
161}; 163};
@@ -164,6 +166,8 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = {
164 166
165static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { 167static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
166 { 168 {
169 I2C_BOARD_INFO("tlv320aic23", 0x1a),
170 }, {
167 I2C_BOARD_INFO("fm3130", 0x68), 171 I2C_BOARD_INFO("fm3130", 0x68),
168 }, { 172 }, {
169 I2C_BOARD_INFO("24c64", 0x50), 173 I2C_BOARD_INFO("24c64", 0x50),
@@ -196,6 +200,8 @@ static void __init afeb9260_board_init(void)
196 /* I2C */ 200 /* I2C */
197 at91_add_device_i2c(afeb9260_i2c_devices, 201 at91_add_device_i2c(afeb9260_i2c_devices,
198 ARRAY_SIZE(afeb9260_i2c_devices)); 202 ARRAY_SIZE(afeb9260_i2c_devices));
203 /* Audio */
204 at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
199} 205}
200 206
201MACHINE_START(AFEB9260, "Custom afeb9260 board") 207MACHINE_START(AFEB9260, "Custom afeb9260 board")
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 438efbb17482..cc270beadd5d 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -218,6 +218,13 @@ static struct gpio_led ek_leds[] = {
218 } 218 }
219}; 219};
220 220
221static struct i2c_board_info __initdata ek_i2c_devices[] = {
222 {
223 I2C_BOARD_INFO("24c512", 0x50),
224 },
225};
226
227
221static void __init ek_board_init(void) 228static void __init ek_board_init(void)
222{ 229{
223 /* Serial */ 230 /* Serial */
@@ -235,7 +242,7 @@ static void __init ek_board_init(void)
235 /* MMC */ 242 /* MMC */
236 at91_add_device_mmc(0, &ek_mmc_data); 243 at91_add_device_mmc(0, &ek_mmc_data);
237 /* I2C */ 244 /* I2C */
238 at91_add_device_i2c(NULL, 0); 245 at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
239 /* LEDs */ 246 /* LEDs */
240 at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); 247 at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
241 /* PCK0 provides MCLK to the WM8731 */ 248 /* PCK0 provides MCLK to the WM8731 */