Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[pandora-kernel.git] / arch / arm / mach-omap1 / board-fsample.c

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 059bac6..149fdd3 100644 (file)
--- 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)
        omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
        omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
 
+       /* Mux pins for keypad */
+       omap_cfg_reg(E2_7XX_KBR0);
+       omap_cfg_reg(J7_7XX_KBR1);
+       omap_cfg_reg(E1_7XX_KBR2);
+       omap_cfg_reg(F3_7XX_KBR3);
+       omap_cfg_reg(D2_7XX_KBR4);
+       omap_cfg_reg(C2_7XX_KBC0);
+       omap_cfg_reg(D3_7XX_KBC1);
+       omap_cfg_reg(E4_7XX_KBC2);
+       omap_cfg_reg(F4_7XX_KBC3);
+       omap_cfg_reg(E3_7XX_KBC4);
+
        platform_add_devices(devices, ARRAY_SIZE(devices));
 
        omap_board_config = fsample_config;
@@ -374,8 +386,6 @@ static void __init omap_fsample_map_io(void)
 
 MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
 /* Maintainer: Brian Swetland <swetland@google.com> */
-       .phys_io        = 0xfff00000,
-       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
        .boot_params    = 0x10000100,
        .map_io         = omap_fsample_map_io,
        .reserve        = omap_reserve,