aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-h3.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-07-05 09:31:39 -0400
committerTony Lindgren <tony@atomide.com>2010-07-05 09:31:39 -0400
commit93c43f2561f18b50e3376be968d0688315afc44c (patch)
tree52b7642f38ec4d015e8a01fac82db3aa5a660a49 /arch/arm/mach-omap1/board-h3.c
parent0d600ff6fe06d99e56166a41521e120ce37e1dd4 (diff)
omap: mux: Do keypad muxing in board-*.c files
This way we get pin muxing out of plat-omap and can convert H4 to use the new mux functions. Note that it should be safe to assume we can mux all the keypad pins except on H4 which may have Menelaus connected. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h3.c')
-rw-r--r--arch/arm/mach-omap1/board-h3.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 0be1d3b8181d..a228e9d6eb7b 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -397,6 +397,19 @@ static void __init h3_init(void)
397 /* GPIO10 pullup/down register, Enable pullup on GPIO10 */ 397 /* GPIO10 pullup/down register, Enable pullup on GPIO10 */
398 omap_cfg_reg(V2_1710_GPIO10); 398 omap_cfg_reg(V2_1710_GPIO10);
399 399
400 /* Mux pins for keypad */
401 omap_cfg_reg(F18_1610_KBC0);
402 omap_cfg_reg(D20_1610_KBC1);
403 omap_cfg_reg(D19_1610_KBC2);
404 omap_cfg_reg(E18_1610_KBC3);
405 omap_cfg_reg(C21_1610_KBC4);
406 omap_cfg_reg(G18_1610_KBR0);
407 omap_cfg_reg(F19_1610_KBR1);
408 omap_cfg_reg(H14_1610_KBR2);
409 omap_cfg_reg(E20_1610_KBR3);
410 omap_cfg_reg(E19_1610_KBR4);
411 omap_cfg_reg(N19_1610_KBR5);
412
400 platform_add_devices(devices, ARRAY_SIZE(devices)); 413 platform_add_devices(devices, ARRAY_SIZE(devices));
401 spi_register_board_info(h3_spi_board_info, 414 spi_register_board_info(h3_spi_board_info,
402 ARRAY_SIZE(h3_spi_board_info)); 415 ARRAY_SIZE(h3_spi_board_info));