ARM: OMAP: Partial revert for EAC IO address changes

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-omap2evm.c

diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index d284551a74696d015f6e7cb37ab568ed4acf8862..86477ccc9967de9278932ab32163d388ae9b0e58 100644 (file)
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -34,14 +34,20 @@
 #include <mach/gpio.h>
 #include <mach/board.h>
 #include <mach/common.h>
-#include <mach/hsmmc.h>
-#include <mach/keypad.h>
+#include <mach/mmc.h>
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 #include <mach/mcspi.h>
 #include <mach/mux.h>
 
-#define GPMC_OFF_CONFIG1_0 0x60
+#include "mmc-twl4030.h"
+
+#define OMAP2EVM_ETHR_START            0x2c000000
+#define OMAP2EVM_ETHR_SIZE             1024
+#define OMAP2EVM_ETHR_GPIO_IRQ         149
+#define        OMAP2_EVM_TS_GPIO               85
+
+#define GPMC_OFF_CONFIG1_0             0x60
 
 static struct mtd_partition omap2evm_nand_partitions[] = {
        {
@@ -211,7 +217,7 @@ static void ads7846_dev_init(void)
 
 static int ads7846_get_pendown_state(void)
 {
-       return !omap_get_gpio_datain(OMAP2_EVM_TS_GPIO);
+       return !gpio_get_value(OMAP2_EVM_TS_GPIO);
 }
 
 struct ads7846_platform_data ads7846_config = {
@@ -270,7 +276,6 @@ static struct twl4030_keypad_data omap2evm_kp_data = {
        .keymap         = omap2evm_keymap,
        .keymapsize     = ARRAY_SIZE(omap2evm_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static void __init omap2_evm_init_irq(void)
@@ -337,6 +342,16 @@ static struct platform_device *omap2_evm_devices[] __initdata = {
        &omap2evm_smc911x_device,
 };
 
+static struct twl4030_hsmmc_info mmc[] __initdata = {
+       {
+               .mmc            = 1,
+               .wires          = 4,
+               .gpio_cd        = -EINVAL,
+               .gpio_wp        = -EINVAL,
+       },
+       {}      /* Terminator */
+};
+
 static void __init omap2_evm_init(void)
 {
        omap2_evm_i2c_init();
@@ -347,7 +362,7 @@ static void __init omap2_evm_init(void)
        spi_register_board_info(omap2evm_spi_board_info,
                                ARRAY_SIZE(omap2evm_spi_board_info));
        omap_serial_init();
-       hsmmc_init();
+       twl4030_mmc_init(mmc);
        omap2evm_flash_init();
        ads7846_dev_init();
 }