pinctrl: add pinctrl driver for imx6sx

Add a pinctrl driver for i.MX6 SoloX based on pinctrl-imx core
driver.

Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt
new file mode 100644 (file)
index 0000000..b1b5952
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt
@@ -0,0 +1,36 @@
+* Freescale i.MX6 SoloX IOMUX Controller
+
+Please refer to fsl,imx-pinctrl.txt in this directory for common binding part
+and usage.
+
+Required properties:
+- compatible: "fsl,imx6sx-iomuxc"
+- fsl,pins: each entry consists of 6 integers and represents the mux and config
+  setting for one pin.  The first 5 integers <mux_reg conf_reg input_reg mux_val
+  input_val> are specified using a PIN_FUNC_ID macro, which can be found in
+  imx6sx-pinfunc.h under device tree source folder.  The last integer CONFIG is
+  the pad setting value like pull-up on this pin.  Please refer to i.MX6 SoloX
+  Reference Manual for detailed CONFIG settings.
+
+CONFIG bits definition:
+PAD_CTL_HYS                     (1 << 16)
+PAD_CTL_PUS_100K_DOWN           (0 << 14)
+PAD_CTL_PUS_47K_UP              (1 << 14)
+PAD_CTL_PUS_100K_UP             (2 << 14)
+PAD_CTL_PUS_22K_UP              (3 << 14)
+PAD_CTL_PUE                     (1 << 13)
+PAD_CTL_PKE                     (1 << 12)
+PAD_CTL_ODE                     (1 << 11)
+PAD_CTL_SPEED_LOW               (0 << 6)
+PAD_CTL_SPEED_MED               (1 << 6)
+PAD_CTL_SPEED_HIGH              (3 << 6)
+PAD_CTL_DSE_DISABLE             (0 << 3)
+PAD_CTL_DSE_260ohm              (1 << 3)
+PAD_CTL_DSE_130ohm              (2 << 3)
+PAD_CTL_DSE_87ohm               (3 << 3)
+PAD_CTL_DSE_65ohm               (4 << 3)
+PAD_CTL_DSE_52ohm               (5 << 3)
+PAD_CTL_DSE_43ohm               (6 << 3)
+PAD_CTL_DSE_37ohm               (7 << 3)
+PAD_CTL_SRE_FAST                (1 << 0)
+PAD_CTL_SRE_SLOW                (0 << 0)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 29a0d89934567e6b9f550207c8b2ecf9a6cca6ec..0042ccb46b9a1277fa2824845e2affb9844505a4 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -188,6 +188,13 @@ config PINCTRL_IMX6SL
        help
          Say Y here to enable the imx6sl pinctrl driver
 
+config PINCTRL_IMX6SX
+       bool "IMX6SX pinctrl driver"
+       depends on SOC_IMX6SX
+       select PINCTRL_IMX
+       help
+         Say Y here to enable the imx6sx pinctrl driver
+
 config PINCTRL_VF610
        bool "Freescale Vybrid VF610 pinctrl driver"
        depends on SOC_VF610

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index c06432db970f762020f47f34f90f731306658ae2..c4b5d405b8f58d55628d4a80e544bb762efdf430 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_PINCTRL_IMX53)   += pinctrl-imx53.o
 obj-$(CONFIG_PINCTRL_IMX6Q)    += pinctrl-imx6q.o
 obj-$(CONFIG_PINCTRL_IMX6Q)    += pinctrl-imx6dl.o
 obj-$(CONFIG_PINCTRL_IMX6SL)   += pinctrl-imx6sl.o
+obj-$(CONFIG_PINCTRL_IMX6SX)   += pinctrl-imx6sx.o
 obj-$(CONFIG_PINCTRL_FALCON)   += pinctrl-falcon.o
 obj-$(CONFIG_PINCTRL_MXS)      += pinctrl-mxs.o
 obj-$(CONFIG_PINCTRL_IMX23)    += pinctrl-imx23.o

diff --git a/drivers/pinctrl/pinctrl-imx6sx.c b/drivers/pinctrl/pinctrl-imx6sx.c
new file mode 100644 (file)
index 0000000..09758a5
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-imx6sx.c
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/pinctrl/pinctrl.h>
+
+#include "pinctrl-imx.h"
+
+enum imx6sx_pads {
+       MX6Sx_PAD_RESERVE0 = 0,
+       MX6Sx_PAD_RESERVE1 = 1,
+       MX6Sx_PAD_RESERVE2 = 2,
+       MX6Sx_PAD_RESERVE3 = 3,
+       MX6Sx_PAD_RESERVE4 = 4,
+       MX6SX_PAD_GPIO1_IO00 = 5,
+       MX6SX_PAD_GPIO1_IO01 = 6,
+       MX6SX_PAD_GPIO1_IO02 = 7,
+       MX6SX_PAD_GPIO1_IO03 = 8,
+       MX6SX_PAD_GPIO1_IO04 = 9,
+       MX6SX_PAD_GPIO1_IO05 = 10,
+       MX6SX_PAD_GPIO1_IO06 = 11,
+       MX6SX_PAD_GPIO1_IO07 = 12,
+       MX6SX_PAD_GPIO1_IO08 = 13,
+       MX6SX_PAD_GPIO1_IO09 = 14,
+       MX6SX_PAD_GPIO1_IO10 = 15,
+       MX6SX_PAD_GPIO1_IO11 = 16,
+       MX6SX_PAD_GPIO1_IO12 = 17,
+       MX6SX_PAD_GPIO1_IO13 = 18,
+       MX6SX_PAD_CSI_DATA00 = 19,
+       MX6SX_PAD_CSI_DATA01 = 20,
+       MX6SX_PAD_CSI_DATA02 = 21,
+       MX6SX_PAD_CSI_DATA03 = 22,
+       MX6SX_PAD_CSI_DATA04 = 23,
+       MX6SX_PAD_CSI_DATA05 = 24,
+       MX6SX_PAD_CSI_DATA06 = 25,
+       MX6SX_PAD_CSI_DATA07 = 26,
+       MX6SX_PAD_CSI_HSYNC = 27,
+       MX6SX_PAD_CSI_MCLK = 28,
+       MX6SX_PAD_CSI_PIXCLK = 29,
+       MX6SX_PAD_CSI_VSYNC = 30,
+       MX6SX_PAD_ENET1_COL = 31,
+       MX6SX_PAD_ENET1_CRS = 32,
+       MX6SX_PAD_ENET1_MDC = 33,
+       MX6SX_PAD_ENET1_MDIO = 34,
+       MX6SX_PAD_ENET1_RX_CLK = 35,
+       MX6SX_PAD_ENET1_TX_CLK = 36,
+       MX6SX_PAD_ENET2_COL = 37,
+       MX6SX_PAD_ENET2_CRS = 38,
+       MX6SX_PAD_ENET2_RX_CLK = 39,
+       MX6SX_PAD_ENET2_TX_CLK = 40,
+       MX6SX_PAD_KEY_COL0 = 41,
+       MX6SX_PAD_KEY_COL1 = 42,
+       MX6SX_PAD_KEY_COL2 = 43,
+       MX6SX_PAD_KEY_COL3 = 44,
+       MX6SX_PAD_KEY_COL4 = 45,
+       MX6SX_PAD_KEY_ROW0 = 46,
+       MX6SX_PAD_KEY_ROW1 = 47,
+       MX6SX_PAD_KEY_ROW2 = 48,
+       MX6SX_PAD_KEY_ROW3 = 49,
+       MX6SX_PAD_KEY_ROW4 = 50,
+       MX6SX_PAD_LCD1_CLK = 51,
+       MX6SX_PAD_LCD1_DATA00 = 52,
+       MX6SX_PAD_LCD1_DATA01 = 53,
+       MX6SX_PAD_LCD1_DATA02 = 54,
+       MX6SX_PAD_LCD1_DATA03 = 55,
+       MX6SX_PAD_LCD1_DATA04 = 56,
+       MX6SX_PAD_LCD1_DATA05 = 57,
+       MX6SX_PAD_LCD1_DATA06 = 58,
+       MX6SX_PAD_LCD1_DATA07 = 59,
+       MX6SX_PAD_LCD1_DATA08 = 60,
+       MX6SX_PAD_LCD1_DATA09 = 61,
+       MX6SX_PAD_LCD1_DATA10 = 62,
+       MX6SX_PAD_LCD1_DATA11 = 63,
+       MX6SX_PAD_LCD1_DATA12 = 64,
+       MX6SX_PAD_LCD1_DATA13 = 65,
+       MX6SX_PAD_LCD1_DATA14 = 66,
+       MX6SX_PAD_LCD1_DATA15 = 67,
+       MX6SX_PAD_LCD1_DATA16 = 68,
+       MX6SX_PAD_LCD1_DATA17 = 69,
+       MX6SX_PAD_LCD1_DATA18 = 70,
+       MX6SX_PAD_LCD1_DATA19 = 71,
+       MX6SX_PAD_LCD1_DATA20 = 72,
+       MX6SX_PAD_LCD1_DATA21 = 73,
+       MX6SX_PAD_LCD1_DATA22 = 74,
+       MX6SX_PAD_LCD1_DATA23 = 75,
+       MX6SX_PAD_LCD1_ENABLE = 76,
+       MX6SX_PAD_LCD1_HSYNC = 77,
+       MX6SX_PAD_LCD1_RESET = 78,
+       MX6SX_PAD_LCD1_VSYNC = 79,
+       MX6SX_PAD_NAND_ALE = 80,
+       MX6SX_PAD_NAND_CE0_B = 81,
+       MX6SX_PAD_NAND_CE1_B = 82,
+       MX6SX_PAD_NAND_CLE = 83,
+       MX6SX_PAD_NAND_DATA00 = 84 ,
+       MX6SX_PAD_NAND_DATA01 = 85,
+       MX6SX_PAD_NAND_DATA02 = 86,
+       MX6SX_PAD_NAND_DATA03 = 87,
+       MX6SX_PAD_NAND_DATA04 = 88,
+       MX6SX_PAD_NAND_DATA05 = 89,
+       MX6SX_PAD_NAND_DATA06 = 90,
+       MX6SX_PAD_NAND_DATA07 = 91,
+       MX6SX_PAD_NAND_RE_B = 92,
+       MX6SX_PAD_NAND_READY_B = 93,
+       MX6SX_PAD_NAND_WE_B = 94,
+       MX6SX_PAD_NAND_WP_B = 95,
+       MX6SX_PAD_QSPI1A_DATA0 = 96,
+       MX6SX_PAD_QSPI1A_DATA1 = 97,
+       MX6SX_PAD_QSPI1A_DATA2 = 98,
+       MX6SX_PAD_QSPI1A_DATA3 = 99,
+       MX6SX_PAD_QSPI1A_DQS = 100,
+       MX6SX_PAD_QSPI1A_SCLK = 101,
+       MX6SX_PAD_QSPI1A_SS0_B = 102,
+       MX6SX_PAD_QSPI1A_SS1_B = 103,
+       MX6SX_PAD_QSPI1B_DATA0 = 104,
+       MX6SX_PAD_QSPI1B_DATA1 = 105,
+       MX6SX_PAD_QSPI1B_DATA2 = 106,
+       MX6SX_PAD_QSPI1B_DATA3 = 107,
+       MX6SX_PAD_QSPI1B_DQS = 108,
+       MX6SX_PAD_QSPI1B_SCLK = 109,
+       MX6SX_PAD_QSPI1B_SS0_B = 110,
+       MX6SX_PAD_QSPI1B_SS1_B = 111,
+       MX6SX_PAD_RGMII1_RD0 = 112,
+       MX6SX_PAD_RGMII1_RD1 = 113,
+       MX6SX_PAD_RGMII1_RD2 = 114,
+       MX6SX_PAD_RGMII1_RD3 = 115,
+       MX6SX_PAD_RGMII1_RX_CTL = 116,
+       MX6SX_PAD_RGMII1_RXC = 117,
+       MX6SX_PAD_RGMII1_TD0 = 118,
+       MX6SX_PAD_RGMII1_TD1 = 119,
+       MX6SX_PAD_RGMII1_TD2 = 120,
+       MX6SX_PAD_RGMII1_TD3 = 121,
+       MX6SX_PAD_RGMII1_TX_CTL = 122,
+       MX6SX_PAD_RGMII1_TXC = 123,
+       MX6SX_PAD_RGMII2_RD0 = 124,
+       MX6SX_PAD_RGMII2_RD1 = 125,
+       MX6SX_PAD_RGMII2_RD2 = 126,
+       MX6SX_PAD_RGMII2_RD3 = 127,
+       MX6SX_PAD_RGMII2_RX_CTL = 128,
+       MX6SX_PAD_RGMII2_RXC = 129,
+       MX6SX_PAD_RGMII2_TD0 = 130,
+       MX6SX_PAD_RGMII2_TD1 = 131,
+       MX6SX_PAD_RGMII2_TD2 = 132,
+       MX6SX_PAD_RGMII2_TD3 = 133,
+       MX6SX_PAD_RGMII2_TX_CTL = 134,
+       MX6SX_PAD_RGMII2_TXC = 135,
+       MX6SX_PAD_SD1_CLK = 136,
+       MX6SX_PAD_SD1_CMD = 137,
+       MX6SX_PAD_SD1_DATA0 = 138,
+       MX6SX_PAD_SD1_DATA1 = 139,
+       MX6SX_PAD_SD1_DATA2 = 140,
+       MX6SX_PAD_SD1_DATA3 = 141,
+       MX6SX_PAD_SD2_CLK = 142,
+       MX6SX_PAD_SD2_CMD = 143,
+       MX6SX_PAD_SD2_DATA0 = 144,
+       MX6SX_PAD_SD2_DATA1 = 145,
+       MX6SX_PAD_SD2_DATA2 = 146,
+       MX6SX_PAD_SD2_DATA3 = 147,
+       MX6SX_PAD_SD3_CLK = 148,
+       MX6SX_PAD_SD3_CMD = 149,
+       MX6SX_PAD_SD3_DATA0 = 150,
+       MX6SX_PAD_SD3_DATA1 = 151,
+       MX6SX_PAD_SD3_DATA2 = 152,
+       MX6SX_PAD_SD3_DATA3 = 153,
+       MX6SX_PAD_SD3_DATA4 = 154,
+       MX6SX_PAD_SD3_DATA5 = 155,
+       MX6SX_PAD_SD3_DATA6 = 156,
+       MX6SX_PAD_SD3_DATA7 = 157,
+       MX6SX_PAD_SD4_CLK = 158,
+       MX6SX_PAD_SD4_CMD = 159,
+       MX6SX_PAD_SD4_DATA0 = 160,
+       MX6SX_PAD_SD4_DATA1 = 161,
+       MX6SX_PAD_SD4_DATA2 = 162,
+       MX6SX_PAD_SD4_DATA3 = 163,
+       MX6SX_PAD_SD4_DATA4 = 164,
+       MX6SX_PAD_SD4_DATA5 = 165,
+       MX6SX_PAD_SD4_DATA6 = 166,
+       MX6SX_PAD_SD4_DATA7 = 167,
+       MX6SX_PAD_SD4_RESET_B = 168,
+       MX6SX_PAD_USB_H_DATA = 169,
+       MX6SX_PAD_USB_H_STROBE = 170,
+};
+
+/* Pad names for the pinmux subsystem */
+static const struct pinctrl_pin_desc imx6sx_pinctrl_pads[] = {
+       IMX_PINCTRL_PIN(MX6Sx_PAD_RESERVE0),
+       IMX_PINCTRL_PIN(MX6Sx_PAD_RESERVE1),
+       IMX_PINCTRL_PIN(MX6Sx_PAD_RESERVE2),
+       IMX_PINCTRL_PIN(MX6Sx_PAD_RESERVE3),
+       IMX_PINCTRL_PIN(MX6Sx_PAD_RESERVE4),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO00),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO01),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO02),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO03),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO04),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO05),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO06),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO07),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO08),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO09),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO10),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO11),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO12),
+       IMX_PINCTRL_PIN(MX6SX_PAD_GPIO1_IO13),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA00),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA01),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA02),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA03),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA04),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA05),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA06),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_DATA07),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_HSYNC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_MCLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_PIXCLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_CSI_VSYNC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_COL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_CRS),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_MDC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_MDIO),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_RX_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET1_TX_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET2_COL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET2_CRS),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET2_RX_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_ENET2_TX_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_COL0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_COL1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_COL2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_COL3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_COL4),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_ROW0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_ROW1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_ROW2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_ROW3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_KEY_ROW4),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA00),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA01),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA02),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA03),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA04),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA05),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA06),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA07),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA08),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA09),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA10),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA11),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA12),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA13),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA14),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA15),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA16),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA17),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA18),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA19),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA20),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA21),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA22),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_DATA23),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_ENABLE),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_HSYNC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_RESET),
+       IMX_PINCTRL_PIN(MX6SX_PAD_LCD1_VSYNC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_ALE),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_CE0_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_CE1_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_CLE),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA00),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA01),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA02),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA03),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA04),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA05),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA06),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_DATA07),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_RE_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_READY_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_WE_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_NAND_WP_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_DQS),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_SCLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_SS0_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1A_SS1_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_DQS),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_SCLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_SS0_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_QSPI1B_SS1_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RD0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RD1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RD2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RD3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RX_CTL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_RXC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TD0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TD1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TD2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TD3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TX_CTL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII1_TXC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RD0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RD1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RD2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RD3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RX_CTL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_RXC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TD0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TD1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TD2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TD3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TX_CTL),
+       IMX_PINCTRL_PIN(MX6SX_PAD_RGMII2_TXC),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_CMD),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD1_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_CMD),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD2_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_CMD),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA4),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA5),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA6),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD3_DATA7),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_CLK),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_CMD),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA0),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA1),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA2),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA3),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA4),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA5),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA6),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_DATA7),
+       IMX_PINCTRL_PIN(MX6SX_PAD_SD4_RESET_B),
+       IMX_PINCTRL_PIN(MX6SX_PAD_USB_H_DATA),
+       IMX_PINCTRL_PIN(MX6SX_PAD_USB_H_STROBE),
+};
+
+static struct imx_pinctrl_soc_info imx6sx_pinctrl_info = {
+       .pins = imx6sx_pinctrl_pads,
+       .npins = ARRAY_SIZE(imx6sx_pinctrl_pads),
+};
+
+static struct of_device_id imx6sx_pinctrl_of_match[] = {
+       { .compatible = "fsl,imx6sx-iomuxc", },
+       { /* sentinel */ }
+};
+
+static int imx6sx_pinctrl_probe(struct platform_device *pdev)
+{
+       return imx_pinctrl_probe(pdev, &imx6sx_pinctrl_info);
+}
+
+static struct platform_driver imx6sx_pinctrl_driver = {
+       .driver = {
+               .name = "imx6sx-pinctrl",
+               .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(imx6sx_pinctrl_of_match),
+       },
+       .probe = imx6sx_pinctrl_probe,
+       .remove = imx_pinctrl_remove,
+};
+
+static int __init imx6sx_pinctrl_init(void)
+{
+       return platform_driver_register(&imx6sx_pinctrl_driver);
+}
+arch_initcall(imx6sx_pinctrl_init);
+
+static void __exit imx6sx_pinctrl_exit(void)
+{
+       platform_driver_unregister(&imx6sx_pinctrl_driver);
+}
+module_exit(imx6sx_pinctrl_exit);
+
+MODULE_AUTHOR("Anson Huang <Anson.Huang@freescale.com>");
+MODULE_DESCRIPTION("Freescale imx6sx pinctrl driver");
+MODULE_LICENSE("GPL v2");