ARM i.MX51: Full iomux support

[~andy/linux] / arch / arm / mach-mx5 / eukrea_mbimxsd-baseboard.c

diff --git a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
index 038d8c94f79efa3b5cffed06ac241d7d50e3d964..c372a4373691b33e9749826dae6e74858af45eea 100644 (file)
--- a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
@@ -45,14 +45,13 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
-#define MBIMXSD_GPIO_3_31 IOMUX_PAD(0x554, 0x16C, 3, 0x0, 0, \
-                               MX51_PAD_CTRL_1 | PAD_CTL_PUS_22K_UP)
-
-static struct pad_desc eukrea_mbimxsd_pads[] = {
+static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
        /* LED */
-       MX51_PAD_NANDF_D10__GPIO_3_30,
+       MX51_PAD_NANDF_D10__GPIO3_30,
        /* SWITCH */
-       MBIMXSD_GPIO_3_31,
+       _MX51_PAD_NANDF_D9__GPIO3_31 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
+                       PAD_CTL_PKE | PAD_CTL_SRE_FAST |
+                       PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
        /* UART2 */
        MX51_PAD_UART2_RXD__UART2_RXD,
        MX51_PAD_UART2_TXD__UART2_TXD,
@@ -70,8 +69,8 @@ static struct pad_desc eukrea_mbimxsd_pads[] = {
        MX51_PAD_SD1_DATA3__SD1_DATA3,
 };
 
-#define GPIO_LED1      (2 * 32 + 30)
-#define GPIO_SWITCH1   (2 * 32 + 31)
+#define GPIO_LED1      IMX_GPIO_NR(3, 30)
+#define GPIO_SWITCH1   IMX_GPIO_NR(3, 31)
 
 static struct gpio_led eukrea_mbimxsd_leds[] = {
        {