diff options
author | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:39 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:39 -0400 |
commit | 93c43f2561f18b50e3376be968d0688315afc44c (patch) | |
tree | 52b7642f38ec4d015e8a01fac82db3aa5a660a49 /arch/arm/mach-omap1/board-fsample.c | |
parent | 0d600ff6fe06d99e56166a41521e120ce37e1dd4 (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-fsample.c')
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 096f2ed102cb..405ff7a3b82d 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -292,6 +292,18 @@ static void __init omap_fsample_init(void) | |||
292 | omap_cfg_reg(L3_1610_FLASH_CS2B_OE); | 292 | omap_cfg_reg(L3_1610_FLASH_CS2B_OE); |
293 | omap_cfg_reg(M8_1610_FLASH_CS2B_WE); | 293 | omap_cfg_reg(M8_1610_FLASH_CS2B_WE); |
294 | 294 | ||
295 | /* Mux pins for keypad */ | ||
296 | omap_cfg_reg(E2_7XX_KBR0); | ||
297 | omap_cfg_reg(J7_7XX_KBR1); | ||
298 | omap_cfg_reg(E1_7XX_KBR2); | ||
299 | omap_cfg_reg(F3_7XX_KBR3); | ||
300 | omap_cfg_reg(D2_7XX_KBR4); | ||
301 | omap_cfg_reg(C2_7XX_KBC0); | ||
302 | omap_cfg_reg(D3_7XX_KBC1); | ||
303 | omap_cfg_reg(E4_7XX_KBC2); | ||
304 | omap_cfg_reg(F4_7XX_KBC3); | ||
305 | omap_cfg_reg(E3_7XX_KBC4); | ||
306 | |||
295 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 307 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
296 | 308 | ||
297 | omap_board_config = fsample_config; | 309 | omap_board_config = fsample_config; |