1 files changed, 5 insertions, 21 deletions

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index c1cc99ce0e29..6f6c601eeab7 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -98,10 +98,10 @@ static struct gpio_keys_button pandora_gpio_keys[] = {
         GPIO_BUTTON_LOW(103,    KEY_DOWN,       "down"),
         GPIO_BUTTON_LOW(96,     KEY_LEFT,       "left"),
         GPIO_BUTTON_LOW(98,     KEY_RIGHT,      "right"),
-        GPIO_BUTTON_LOW(111,    BTN_A,          "a"),
-        GPIO_BUTTON_LOW(106,    BTN_B,          "b"),
-        GPIO_BUTTON_LOW(109,    BTN_X,          "x"),
-        GPIO_BUTTON_LOW(101,    BTN_Y,          "y"),
+        GPIO_BUTTON_LOW(109,    KEY_KP1,        "game 1"),
+        GPIO_BUTTON_LOW(111,    KEY_KP2,        "game 2"),
+        GPIO_BUTTON_LOW(106,    KEY_KP3,        "game 3"),
+        GPIO_BUTTON_LOW(101,    KEY_KP4,        "game 4"),
         GPIO_BUTTON_LOW(102,    BTN_TL,         "l"),
         GPIO_BUTTON_LOW(97,     BTN_TL2,        "l2"),
         GPIO_BUTTON_LOW(105,    BTN_TR,         "r"),
@@ -315,7 +315,7 @@ static int __init omap3pandora_i2c_init(void)
         omap_register_i2c_bus(1, 2600, omap3pandora_i2c_boardinfo,
                         ARRAY_SIZE(omap3pandora_i2c_boardinfo));
         /* i2c2 pins are not connected */
-        omap_register_i2c_bus(3, 400, NULL, 0);
+        omap_register_i2c_bus(3, 100, NULL, 0);
         return 0;
 }
 
@@ -368,23 +368,8 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
         }
 };
 
-static struct platform_device omap3pandora_lcd_device = {
-        .name           = "pandora_lcd",
-        .id             = -1,
-};
-
-static struct omap_lcd_config omap3pandora_lcd_config __initdata = {
-        .ctrl_name      = "internal",
-};
-
-static struct omap_board_config_kernel omap3pandora_config[] __initdata = {
-        { OMAP_TAG_LCD,         &omap3pandora_lcd_config },
-};
-
 static void __init omap3pandora_init_irq(void)
 {
-        omap_board_config = omap3pandora_config;
-        omap_board_config_size = ARRAY_SIZE(omap3pandora_config);
         omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
                              mt46h32m32lf6_sdrc_params);
         omap_init_irq();
@@ -392,7 +377,6 @@ static void __init omap3pandora_init_irq(void)
 }
 
 static struct platform_device *omap3pandora_devices[] __initdata = {
-        &omap3pandora_lcd_device,
         &pandora_leds_gpio,
         &pandora_keys_gpio,
 };