pinctrl: baytrail: Rectify debounce support (part 2)
The commit04ff5a095d
("pinctrl: baytrail: Rectify debounce support") almost fixes the logic of debuonce but missed couple of things, i.e. typo in mask when disabling debounce and lack of enabling it back. This patch addresses above issues. Reported-by: Jean Delvare <jdelvare@suse.de> Fixes:04ff5a095d
("pinctrl: baytrail: Rectify debounce support") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jean Delvare <jdelvare@suse.de> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Родитель
19b26d92df
Коммит
827e1579e1
|
@ -1243,10 +1243,12 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev,
|
||||||
debounce = readl(db_reg);
|
debounce = readl(db_reg);
|
||||||
debounce &= ~BYT_DEBOUNCE_PULSE_MASK;
|
debounce &= ~BYT_DEBOUNCE_PULSE_MASK;
|
||||||
|
|
||||||
|
if (arg)
|
||||||
|
conf |= BYT_DEBOUNCE_EN;
|
||||||
|
else
|
||||||
|
conf &= ~BYT_DEBOUNCE_EN;
|
||||||
|
|
||||||
switch (arg) {
|
switch (arg) {
|
||||||
case 0:
|
|
||||||
conf &= BYT_DEBOUNCE_EN;
|
|
||||||
break;
|
|
||||||
case 375:
|
case 375:
|
||||||
debounce |= BYT_DEBOUNCE_PULSE_375US;
|
debounce |= BYT_DEBOUNCE_PULSE_375US;
|
||||||
break;
|
break;
|
||||||
|
@ -1269,7 +1271,9 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev,
|
||||||
debounce |= BYT_DEBOUNCE_PULSE_24MS;
|
debounce |= BYT_DEBOUNCE_PULSE_24MS;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
if (arg)
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче