Merge branch 'imx/cleanup' into imx/devel

This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 12 insertions, 12 deletions

diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index 4a3cca3725f2..e7bff1e2cd2b 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -16,7 +16,6 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
-#include <linux/irq.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/regulator/machine.h>
@@ -417,6 +416,11 @@ static void __init mx28evk_add_regulators(void)
 static void __init mx28evk_add_regulators(void) {}
 #endif
 
+static struct gpio mx28evk_lcd_gpios[] = {
+        { MX28EVK_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, "lcd-enable" },
+        { MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },
+};
+
 static void __init mx28evk_init(void)
 {
         int ret;
@@ -443,19 +447,12 @@ static void __init mx28evk_init(void)
                 mx28_add_flexcan(1, &mx28evk_flexcan_pdata[1]);
         }
 
-        ret = gpio_request_one(MX28EVK_LCD_ENABLE, GPIOF_DIR_OUT, "lcd-enable");
-        if (ret)
-                pr_warn("failed to request gpio lcd-enable: %d\n", ret);
-        else
-                gpio_set_value(MX28EVK_LCD_ENABLE, 1);
-
-        ret = gpio_request_one(MX28EVK_BL_ENABLE, GPIOF_DIR_OUT, "bl-enable");
+        ret = gpio_request_array(mx28evk_lcd_gpios,
+                                 ARRAY_SIZE(mx28evk_lcd_gpios));
         if (ret)
-                pr_warn("failed to request gpio bl-enable: %d\n", ret);
+                pr_warn("failed to request gpio pins for lcd: %d\n", ret);
         else
-                gpio_set_value(MX28EVK_BL_ENABLE, 1);
-
-        mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
+                mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
 
         mx28_add_saif(0);
         mx28_add_saif(1);
@@ -480,6 +477,9 @@ static void __init mx28evk_init(void)
                                "mmc1-slot-power");
         if (ret)
                 pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
+        else
+                mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
+
         mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
         mx28_add_rtc_stmp3xxx();