summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp/teton_bga.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 08:11:43 +0400
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 08:11:43 +0400
commitb1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch)
tree17d15f3a6dc5bdd6205070dbef0e339421b13d25 /arch/arm/mach-mmp/teton_bga.c
parent9d14070f656addddce3d63fd483de46930b51850 (diff)
parentc1537b4863da620f12f5b42ece61bf65314148ed (diff)
downloadlinux-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'arch/arm/mach-mmp/teton_bga.c')
-rw-r--r--arch/arm/mach-mmp/teton_bga.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
index 8ac22a62bf1a..0523e422990e 100644
--- a/arch/arm/mach-mmp/teton_bga.c
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -66,7 +66,7 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
{
I2C_BOARD_INFO("ds1337", 0x68),
- .irq = gpio_to_irq(RTC_INT_GPIO)
+ .irq = MMP_GPIO_TO_IRQ(RTC_INT_GPIO)
},
};
@@ -78,6 +78,7 @@ static void __init teton_bga_init(void)
pxa168_add_uart(1);
pxa168_add_keypad(&teton_bga_keypad_info);
pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
+ platform_device_register(&pxa168_device_gpio);
}
MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")