Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296189
b: refs/heads/master
c: fe5e079
h: refs/heads/master
i:
  296187: 721cbbe
v: v3
  • Loading branch information
Nicolas Ferre committed Mar 1, 2012
1 parent e34cd36 commit 62c6c03
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e261501d05bd2df244d31e0866b1e81776766ecf
refs/heads/master: fe5e07967187f3af538c237921993ec5889b3f2a
10 changes: 7 additions & 3 deletions trunk/arch/arm/mach-at91/board-snapper9260.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {
/* Audio codec */
I2C_BOARD_INFO("tlv320aic23", 0x1a),
},
{
};

static struct i2c_board_info __initdata snapper9260_i2c_isl1208 = {
/* RTC */
I2C_BOARD_INFO("isl1208", 0x6f),
.irq = gpio_to_irq(AT91_PIN_PA31),
},
};

static void __init snapper9260_add_device_nand(void)
Expand All @@ -163,6 +163,10 @@ static void __init snapper9260_board_init(void)
{
at91_add_device_i2c(snapper9260_i2c_devices,
ARRAY_SIZE(snapper9260_i2c_devices));

snapper9260_i2c_isl1208.irq = gpio_to_irq(AT91_PIN_PA31);
i2c_register_board_info(0, &snapper9260_i2c_isl1208, 1);

at91_add_device_serial();
at91_add_device_usbh(&snapper9260_usbh_data);
at91_add_device_udc(&snapper9260_udc_data);
Expand Down

0 comments on commit 62c6c03

Please sign in to comment.