1 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index acb4e77b39ef..16aebfb8a7ec 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -138,17 +138,14 @@ static struct lp5523_platform_data rx51_lp5523_platform_data = {
 
 static struct omap2_mcspi_device_config wl1251_mcspi_config = {
         .turbo_mode     = 0,
-        .single_channel = 1,
 };
 
 static struct omap2_mcspi_device_config mipid_mcspi_config = {
         .turbo_mode     = 0,
-        .single_channel = 1,
 };
 
 static struct omap2_mcspi_device_config tsc2005_mcspi_config = {
         .turbo_mode     = 0,
-        .single_channel = 1,
 };
 
 static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
@@ -1105,6 +1102,11 @@ static struct tsc2005_platform_data tsc2005_pdata = {
         .esd_timeout_ms         = 8000,
 };
 
+static struct gpio rx51_tsc2005_gpios[] __initdata = {
+        { RX51_TSC2005_IRQ_GPIO,   GPIOF_IN,            "tsc2005 IRQ"   },
+        { RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "tsc2005 reset" },
+};
+
 static void rx51_tsc2005_set_reset(bool enable)
 {
         gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
@@ -1114,20 +1116,18 @@ static void __init rx51_init_tsc2005(void)
 {
         int r;
 
-        r = gpio_request_one(RX51_TSC2005_IRQ_GPIO, GPIOF_IN, "tsc2005 IRQ");
-        if (r < 0) {
-                printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ");
-                rx51_peripherals_spi_board_info[RX51_SPI_TSC2005].irq = 0;
-        }
+        omap_mux_init_gpio(RX51_TSC2005_RESET_GPIO, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(RX51_TSC2005_IRQ_GPIO, OMAP_PIN_INPUT_PULLUP);
 
-        r = gpio_request_one(RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
-                "tsc2005 reset");
-        if (r >= 0) {
-                tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
-        } else {
-                printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");
+        r = gpio_request_array(rx51_tsc2005_gpios,
+                               ARRAY_SIZE(rx51_tsc2005_gpios));
+        if (r < 0) {
+                printk(KERN_ERR "tsc2005 board initialization failed\n");
                 tsc2005_pdata.esd_timeout_ms = 0;
+                return;
         }
+
+        tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
 }
 
 void __init rx51_peripherals_init(void)
@@ -1145,7 +1145,7 @@ void __init rx51_peripherals_init(void)
 
         partition = omap_mux_get("core");
         if (partition)
-                omap2_hsmmc_init(mmc);
+                omap_hsmmc_init(mmc);
 
         rx51_charger_init();
 }