aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-lpc18xx.c
diff options
context:
space:
mode:
authorJoachim Eastwood <manabian@gmail.com>2015-07-15 00:25:26 +0200
committerLinus Walleij <linus.walleij@linaro.org>2015-07-20 11:01:53 +0200
commit681ccdcc756f17f847beba5ac4cd3d03e0949489 (patch)
treebf32102adc81a659180e7605bcb0dfa391546440 /drivers/pinctrl/pinctrl-lpc18xx.c
parentSubject: pinctrl: imx1-core: Fix debug output in .pin_config_set callback (diff)
downloadlinux-dev-681ccdcc756f17f847beba5ac4cd3d03e0949489.tar.xz
linux-dev-681ccdcc756f17f847beba5ac4cd3d03e0949489.zip
pinctrl: lpc18xx: fix schmitt trigger setup
The param_val variable is what determines if schmitt trigger is enabled on a pin or not. A typo here mean that schmitt trigger was always enabled for standard and i2c pins. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-lpc18xx.c')
-rw-r--r--drivers/pinctrl/pinctrl-lpc18xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
index ef0b697639a7..347c763a6a78 100644
--- a/drivers/pinctrl/pinctrl-lpc18xx.c
+++ b/drivers/pinctrl/pinctrl-lpc18xx.c
@@ -823,7 +823,7 @@ static int lpc18xx_pconf_set_i2c0(struct pinctrl_dev *pctldev,
break;
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
- if (param)
+ if (param_val)
*reg &= ~(LPC18XX_SCU_I2C0_ZIF << shift);
else
*reg |= (LPC18XX_SCU_I2C0_ZIF << shift);
@@ -876,7 +876,7 @@ static int lpc18xx_pconf_set_pin(struct pinctrl_dev *pctldev,
break;
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
- if (param)
+ if (param_val)
*reg &= ~LPC18XX_SCU_PIN_ZIF;
else
*reg |= LPC18XX_SCU_PIN_ZIF;