update PAD settings

diff --git a/arch/arm/mach-mxs/mach-tx28.c b/arch/arm/mach-mxs/mach-tx28.c
index dda8491a5c7c8eec7804d6e2ac9897f1695274b3..ef9347458fcd5bce79d7752eeb137c4d12210b7a 100644 (file)
--- a/arch/arm/mach-mxs/mach-tx28.c
+++ b/arch/arm/mach-mxs/mach-tx28.c
@@ -46,9 +46,11 @@
 #define TX28_STK5_GPIO_LCD_RESET       MXS_GPIO_NR(3, 30)
 #define TX28_STK5_GPIO_EDT_IRQ         MXS_GPIO_NR(2, 5)
 #define TX28_STK5_GPIO_EDT_RESET       MXS_GPIO_NR(2, 6)
+#define TX28_STK5_GPIO_EDT_WAKE                MXS_GPIO_NR(4, 9)
 
 #define TX28_GPIO_IN_PAD_CTRL          (MXS_PAD_3V3 | MXS_PAD_4MA | \
                                        MXS_PAD_PULLUP)
+#define TX28_LCD_PAD_CTRL              (MXS_PAD_3V3 | MXS_PAD_4MA)
 
 static const iomux_cfg_t tx28_stk5v3_pads[] __initconst = {
        /* LED */
@@ -56,41 +58,40 @@ static const iomux_cfg_t tx28_stk5v3_pads[] __initconst = {
                MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
 
        /* framebuffer */
-#define LCD_MODE (MXS_PAD_3V3 | MXS_PAD_4MA)
-       MX28_PAD_LCD_D00__LCD_D0 | LCD_MODE,
-       MX28_PAD_LCD_D01__LCD_D1 | LCD_MODE,
-       MX28_PAD_LCD_D02__LCD_D2 | LCD_MODE,
-       MX28_PAD_LCD_D03__LCD_D3 | LCD_MODE,
-       MX28_PAD_LCD_D04__LCD_D4 | LCD_MODE,
-       MX28_PAD_LCD_D05__LCD_D5 | LCD_MODE,
-       MX28_PAD_LCD_D06__LCD_D6 | LCD_MODE,
-       MX28_PAD_LCD_D07__LCD_D7 | LCD_MODE,
-       MX28_PAD_LCD_D08__LCD_D8 | LCD_MODE,
-       MX28_PAD_LCD_D09__LCD_D9 | LCD_MODE,
-       MX28_PAD_LCD_D10__LCD_D10 | LCD_MODE,
-       MX28_PAD_LCD_D11__LCD_D11 | LCD_MODE,
-       MX28_PAD_LCD_D12__LCD_D12 | LCD_MODE,
-       MX28_PAD_LCD_D13__LCD_D13 | LCD_MODE,
-       MX28_PAD_LCD_D14__LCD_D14 | LCD_MODE,
-       MX28_PAD_LCD_D15__LCD_D15 | LCD_MODE,
-       MX28_PAD_LCD_D16__LCD_D16 | LCD_MODE,
-       MX28_PAD_LCD_D17__LCD_D17 | LCD_MODE,
-       MX28_PAD_LCD_D18__LCD_D18 | LCD_MODE,
-       MX28_PAD_LCD_D19__LCD_D19 | LCD_MODE,
-       MX28_PAD_LCD_D20__LCD_D20 | LCD_MODE,
-       MX28_PAD_LCD_D21__LCD_D21 | LCD_MODE,
-       MX28_PAD_LCD_D22__LCD_D22 | LCD_MODE,
-       MX28_PAD_LCD_D23__LCD_D23 | LCD_MODE,
-       MX28_PAD_LCD_RD_E__LCD_VSYNC | LCD_MODE,
-       MX28_PAD_LCD_WR_RWN__LCD_HSYNC | LCD_MODE,
-       MX28_PAD_LCD_RS__LCD_DOTCLK | LCD_MODE,
-       MX28_PAD_LCD_CS__LCD_CS | LCD_MODE,
-       MX28_PAD_LCD_VSYNC__LCD_VSYNC | LCD_MODE,
-       MX28_PAD_LCD_HSYNC__LCD_HSYNC | LCD_MODE,
-       MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | LCD_MODE,
-       MX28_PAD_LCD_ENABLE__GPIO_1_31 | LCD_MODE,
-       MX28_PAD_LCD_RESET__GPIO_3_30 | LCD_MODE,
-       MX28_PAD_PWM0__GPIO_3_16 | LCD_MODE,
+       MX28_PAD_LCD_D00__LCD_D0 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D01__LCD_D1 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D02__LCD_D2 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D03__LCD_D3 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D04__LCD_D4 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D05__LCD_D5 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D06__LCD_D6 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D07__LCD_D7 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D08__LCD_D8 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D09__LCD_D9 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D10__LCD_D10 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D11__LCD_D11 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D12__LCD_D12 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D13__LCD_D13 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D14__LCD_D14 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D15__LCD_D15 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D16__LCD_D16 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D17__LCD_D17 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D18__LCD_D18 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D19__LCD_D19 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D20__LCD_D20 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D21__LCD_D21 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D22__LCD_D22 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_D23__LCD_D23 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_RD_E__LCD_VSYNC | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_WR_RWN__LCD_HSYNC | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_RS__LCD_DOTCLK | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_CS__LCD_CS | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_VSYNC__LCD_VSYNC | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_HSYNC__LCD_HSYNC | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_ENABLE__GPIO_1_31 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_LCD_RESET__GPIO_3_30 | TX28_LCD_PAD_CTRL,
+       MX28_PAD_PWM0__GPIO_3_16 | TX28_LCD_PAD_CTRL,
 
        /* UART1 */
        MX28_PAD_AUART0_CTS__DUART_RX,
@@ -143,17 +144,27 @@ static const iomux_cfg_t tx28_stk5v3_pads[] __initconst = {
        MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0,
        MX28_PAD_SAIF1_SDATA0__SAIF0_SDATA1,
 
-       /* USB Host */
-       MX28_PAD_SPDIF__GPIO_3_27 | MXS_PAD_CTRL,       /* USB host vbusen */
-       MX28_PAD_GPMI_CE2N__GPIO_0_18 | MXS_PAD_CTRL,   /* USB otg vbusen */
-       MX28_PAD_PWM2__USB0_ID |
-               MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP,
+       /* SAIF1 */
+       MX28_PAD_LCD_DOTCLK__GPIO_1_30 | TX28_GPIO_IN_PAD_CTRL,
+
+       MX28_PAD_AUART2_RTS__SAIF1_LRCLK,
+       MX28_PAD_AUART2_CTS__SAIF1_BITCLK,
+       MX28_PAD_LCD_VSYNC__SAIF1_SDATA0,
+       MX28_PAD_LCD_HSYNC__SAIF1_SDATA1,
+
+       /* USBH port */
+       MX28_PAD_SPDIF__GPIO_3_27 | MXS_PAD_CTRL,       /* USBH_VBUSEN */
+       MX28_PAD_JTAG_RTCK__GPIO_4_20 | TX28_GPIO_IN_PAD_CTRL,  /* USBH_OC */
+
+       /* USBOTG Port */
+       MX28_PAD_GPMI_CE2N__GPIO_0_18 | MXS_PAD_CTRL,   /* USBOTG_VBUSEN */
+       MX28_PAD_GPMI_CE3N__GPIO_0_19 | TX28_GPIO_IN_PAD_CTRL,  /* USBOTG_OC */
+       MX28_PAD_PWM2__USB0_ID | TX28_GPIO_IN_PAD_CTRL,
 
        /* EDT Touchscreen */
-       MX28_PAD_SSP0_DATA5__GPIO_2_5 |
-               MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP,
-       MX28_PAD_SSP0_DATA6__GPIO_2_6 |
-               MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP,
+       MX28_PAD_SSP0_DATA5__GPIO_2_5 | TX28_GPIO_IN_PAD_CTRL,
+       MX28_PAD_SSP0_DATA6__GPIO_2_6 | TX28_GPIO_IN_PAD_CTRL,
+       MX28_PAD_ENET0_RXD2__GPIO_4_9 | TX28_GPIO_IN_PAD_CTRL,
 };
 
 static const struct gpio_led tx28_stk5v3_leds[] __initconst = {