1 files changed, 14 insertions, 1 deletions

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 0b0825fe6751..c2ef4ff846c7 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)
         /* GPIO10 pullup/down register, Enable pullup on GPIO10 */
         omap_cfg_reg(V2_1710_GPIO10);
 
+        /* Mux pins for keypad */
+        omap_cfg_reg(F18_1610_KBC0);
+        omap_cfg_reg(D20_1610_KBC1);
+        omap_cfg_reg(D19_1610_KBC2);
+        omap_cfg_reg(E18_1610_KBC3);
+        omap_cfg_reg(C21_1610_KBC4);
+        omap_cfg_reg(G18_1610_KBR0);
+        omap_cfg_reg(F19_1610_KBR1);
+        omap_cfg_reg(H14_1610_KBR2);
+        omap_cfg_reg(E20_1610_KBR3);
+        omap_cfg_reg(E19_1610_KBR4);
+        omap_cfg_reg(N19_1610_KBR5);
+
         platform_add_devices(devices, ARRAY_SIZE(devices));
         spi_register_board_info(h3_spi_board_info,
                                 ARRAY_SIZE(h3_spi_board_info));
@@ -405,7 +418,7 @@ static void __init h3_init(void)
         omap_serial_init();
         omap_register_i2c_bus(1, 100, h3_i2c_board_info,
                               ARRAY_SIZE(h3_i2c_board_info));
-        omap_usb_init(&h3_usb_config);
+        omap1_usb_init(&h3_usb_config);
         h3_mmc_init();
 }