summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/imx-iomux-v3.c
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2016-05-26 21:02:59 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2016-05-31 08:23:45 +0200
commit3f374304ad8bf2c8289ba699676ffee755b67866 (patch)
tree31bec737ad050f89c506eb159c2ff11ad3a3bc0d /drivers/pinctrl/imx-iomux-v3.c
parentfd5f9fc3ab78ea0d74d99791661ab87163b29126 (diff)
downloadbarebox-3f374304ad8bf2c8289ba699676ffee755b67866.tar.gz
pinctrl: iomux-v3: Cleaning SION patch before applying
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pinctrl/imx-iomux-v3.c')
-rw-r--r--drivers/pinctrl/imx-iomux-v3.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index 66443b7..92fac18 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -132,8 +132,10 @@ static int imx_iomux_v3_set_state(struct pinctrl_device *pdev, struct device_nod
u32 input_val = be32_to_cpu(*list++);
u32 conf_val = be32_to_cpu(*list++);
- if (conf_val & IMX_PAD_SION)
+ if (conf_val & IMX_PAD_SION) {
mux_val |= IOMUXC_CONFIG_SION;
+ conf_val &= ~IMX_PAD_SION;
+ }
if (conf_val & IMX_DT_NO_PAD_CTL)
conf_reg = 0;