Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fedbb92 authored by Yingjoe Chen's avatar Yingjoe Chen Committed by Linus Walleij
Browse files

pinctrl: mediatek: correct debounce time unit in mtk_gpio_set_debounce 



The debounce time unit for gpio_chip.set_debounce is us but
mtk_gpio_set_debounce regard it as ms.
Fix this by correct debounce time array dbnc_arr so it can find correct
debounce setting. Debounce time for first debounce setting is 500us,
correct this as well.

While I'm at it, also change the debounce time array name to
"debounce_time" for readability.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarYingjoe Chen <yingjoe.chen@mediatek.com>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Acked-by: default avatarHongzhou Yang <hongzhou.yang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6dd22a11

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+5 −4
Original line number Diff line number Diff line
@@ -1004,7 +1004,8 @@ static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset, 
	struct mtk_pinctrl *pctl = dev_get_drvdata(chip->parent);

	int eint_num, virq, eint_offset;

	unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask, dbnc;

	static const unsigned int dbnc_arr[] = {0 , 1, 16, 32, 64, 128, 256};

	static const unsigned int debounce_time[] = {500, 1000, 16000, 32000, 64000,

						128000, 256000};

	const struct mtk_desc_pin *pin;

	struct irq_data *d;
@@ -1022,9 +1023,9 @@ static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset, 
	if (!mtk_eint_can_en_debounce(pctl, eint_num))

		return -ENOSYS;



	dbnc = ARRAY_SIZE(dbnc_arr);

	for (i = 0; i < ARRAY_SIZE(dbnc_arr); i++) {

		if (debounce <= dbnc_arr[i]) {

	dbnc = ARRAY_SIZE(debounce_time);

	for (i = 0; i < ARRAY_SIZE(debounce_time); i++) {

		if (debounce <= debounce_time[i]) {

			dbnc = i;

			break;

		}