diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
| commit | cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed (patch) | |
| tree | a56d5024a453bb323039f7c481ac17738269e24f /drivers/pinctrl/freescale/pinctrl-imx25.c | |
| parent | 047e6646579c2853afba0111f573796daf4fd485 (diff) | |
| parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
| download | talos-op-linux-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.tar.gz talos-op-linux-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.zip | |
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/freescale/pinctrl-imx25.c')
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-imx25.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-imx25.c b/drivers/pinctrl/freescale/pinctrl-imx25.c index faf635654312..293ed4381cc0 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx25.c +++ b/drivers/pinctrl/freescale/pinctrl-imx25.c @@ -26,7 +26,8 @@ #include "pinctrl-imx.h" enum imx25_pads { - MX25_PAD_RESERVE0 = 1, + MX25_PAD_RESERVE0 = 0, + MX25_PAD_RESERVE1 = 1, MX25_PAD_A10 = 2, MX25_PAD_A13 = 3, MX25_PAD_A14 = 4, @@ -169,6 +170,7 @@ enum imx25_pads { /* Pad names for the pinmux subsystem */ static const struct pinctrl_pin_desc imx25_pinctrl_pads[] = { IMX_PINCTRL_PIN(MX25_PAD_RESERVE0), + IMX_PINCTRL_PIN(MX25_PAD_RESERVE1), IMX_PINCTRL_PIN(MX25_PAD_A10), IMX_PINCTRL_PIN(MX25_PAD_A13), IMX_PINCTRL_PIN(MX25_PAD_A14), |
