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

Commit c8dba02e authored by Boris Brezillon's avatar Boris Brezillon Committed by Linus Walleij
Browse files

pinctrl: at91: fix sam9x5 debounce/deglitch functions 



Replace at91_mux_get_deglitch with at91_mux_pio3_get_deglitch when using
sam9x5 (pio3) IP.
at91_mux_get_deglitch only test the activation of the "Input Filter" which
may be overloaded by the activation of the "Input Filter Slow Clock" to use
the input filter as a debounce filter instead of a deglitch filter.

Fix at91_mux_pio3_get_debounce to test the activation of the Input Filter
before testing the activation of the debounce filter (Input Filter Slow
Clock depends on Input Filter).

Fix at91_mux_pio3_set_debounce function to avoid disabling the deglitch
filter ("Input Filter") when debounce filter is disabled.

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 77966ad7

drivers/pinctrl/pinctrl-at91.c

+13 −5
Original line number Diff line number Diff line
@@ -417,6 +417,14 @@ static void at91_mux_set_deglitch(void __iomem *pio, unsigned mask, bool is_on) 
	__raw_writel(mask, pio + (is_on ? PIO_IFER : PIO_IFDR));

}



static bool at91_mux_pio3_get_deglitch(void __iomem *pio, unsigned pin)

{

	if ((__raw_readl(pio + PIO_IFSR) >> pin) & 0x1)

		return !((__raw_readl(pio + PIO_IFSCSR) >> pin) & 0x1);



	return false;

}



static void at91_mux_pio3_set_deglitch(void __iomem *pio, unsigned mask, bool is_on)

{

	if (is_on)
@@ -428,7 +436,8 @@ static bool at91_mux_pio3_get_debounce(void __iomem *pio, unsigned pin, u32 *div 
{

	*div = __raw_readl(pio + PIO_SCDR);



	return (__raw_readl(pio + PIO_IFSCSR) >> pin) & 0x1;

	return ((__raw_readl(pio + PIO_IFSR) >> pin) & 0x1) &&

	       ((__raw_readl(pio + PIO_IFSCSR) >> pin) & 0x1);

}



static void at91_mux_pio3_set_debounce(void __iomem *pio, unsigned mask,
@@ -438,9 +447,8 @@ static void at91_mux_pio3_set_debounce(void __iomem *pio, unsigned mask, 
		__raw_writel(mask, pio + PIO_IFSCER);

		__raw_writel(div & PIO_SCDR_DIV, pio + PIO_SCDR);

		__raw_writel(mask, pio + PIO_IFER);

	} else {

		__raw_writel(mask, pio + PIO_IFDR);

	}

	} else

		__raw_writel(mask, pio + PIO_IFSCDR);

}



static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
@@ -478,7 +486,7 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = { 
	.mux_B_periph	= at91_mux_pio3_set_B_periph,

	.mux_C_periph	= at91_mux_pio3_set_C_periph,

	.mux_D_periph	= at91_mux_pio3_set_D_periph,

	.get_deglitch	= at91_mux_get_deglitch,

	.get_deglitch	= at91_mux_pio3_get_deglitch,

	.set_deglitch	= at91_mux_pio3_set_deglitch,

	.get_debounce	= at91_mux_pio3_get_debounce,

	.set_debounce	= at91_mux_pio3_set_debounce,