diff --git a/[refs] b/[refs] index 8fa7846d4ef7..68f6d5f36a53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2ce697309ba5215cc5b2d5a11c8599d9eb1c75c +refs/heads/master: 759305c62f294d4f5fb1d8dde5ece98d2f71cfcb diff --git a/trunk/arch/arm/mach-mmp/teton_bga.c b/trunk/arch/arm/mach-mmp/teton_bga.c index f556b2059754..a4a375c58e0c 100644 --- a/trunk/arch/arm/mach-mmp/teton_bga.c +++ b/trunk/arch/arm/mach-mmp/teton_bga.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -38,6 +39,13 @@ static unsigned long teton_bga_pin_config[] __initdata = { GPIO110_KP_MKIN0, GPIO111_KP_MKOUT7, GPIO112_KP_MKOUT6, + + /* I2C Bus */ + GPIO105_CI2C_SDA, + GPIO106_CI2C_SCL, + + /* RTC */ + GPIO78_GPIO, }; static unsigned int teton_bga_matrix_key_map[] = { @@ -55,6 +63,13 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = { .debounce_interval = 30, }; +static struct i2c_board_info teton_bga_i2c_info[] __initdata = { + { + I2C_BOARD_INFO("ds1337", 0x68), + .irq = gpio_to_irq(RTC_INT_GPIO) + }, +}; + static void __init teton_bga_init(void) { mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config)); @@ -62,6 +77,7 @@ static void __init teton_bga_init(void) /* on-chip devices */ pxa168_add_uart(1); pxa168_add_keypad(&teton_bga_keypad_info); + pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info)); } MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")