Commit e1ff91f9 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Linus Walleij
Browse files

pinctrl: mediatek: Fix EINT pins input debounce time configuration 



The External Interrupt Controller (EINTC) on all of the supported
MediaTek SoCs does support input debouncing, but not all of them
index the debounce time values (DBNC_SETTING registers) the same way.

Before this change, in some cases, as an example, requesting a debounce
time of 16 milliseconds would mistakenly set the relative DBNC_SETTING
register to 0x2, resulting in a way shorter debounce time of 500uS.

To fix the aforementioned issue, define three different debounce_time
arrays, reflecting the correct register index for each value and for
each register index variant, and make sure that each SoC pinctrl
driver uses the right one.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20221111094106.18486-1-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 91d5c506

drivers/pinctrl/mediatek/mtk-eint.c

+26 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define MTK_EINT_EDGE_SENSITIVE           0

#define MTK_EINT_LEVEL_SENSITIVE          1

#define MTK_EINT_DBNC_SET_DBNC_BITS	  4

#define MTK_EINT_DBNC_MAX		  16

#define MTK_EINT_DBNC_RST_BIT		  (0x1 << 1)

#define MTK_EINT_DBNC_SET_EN		  (0x1 << 0)
@@ -48,6 +49,18 @@ static const struct mtk_eint_regs mtk_generic_eint_regs = { 
	.dbnc_clr  = 0x700,

};



const unsigned int debounce_time_mt2701[] = {

	500, 1000, 16000, 32000, 64000, 128000, 256000, 0

};



const unsigned int debounce_time_mt6765[] = {

	125, 250, 500, 1000, 16000, 32000, 64000, 128000, 256000, 512000, 0

};



const unsigned int debounce_time_mt6795[] = {

	500, 1000, 16000, 32000, 64000, 128000, 256000, 512000, 0

};



static void __iomem *mtk_eint_get_offset(struct mtk_eint *eint,

					 unsigned int eint_num,

					 unsigned int offset)
@@ -404,10 +417,11 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, 
	int virq, eint_offset;

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

		     dbnc;

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

						     64000, 128000, 256000};

	struct irq_data *d;



	if (!eint->hw->db_time)

		return -EOPNOTSUPP;



	virq = irq_find_mapping(eint->domain, eint_num);

	eint_offset = (eint_num % 4) * 8;

	d = irq_get_irq_data(virq);
@@ -418,9 +432,9 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, 
	if (!mtk_eint_can_en_debounce(eint, eint_num))

		return -EINVAL;



	dbnc = ARRAY_SIZE(debounce_time);

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

		if (debounce <= debounce_time[i]) {

	dbnc = eint->num_db_time;

	for (i = 0; i < eint->num_db_time; i++) {

		if (debounce <= eint->hw->db_time[i]) {

			dbnc = i;

			break;

		}
@@ -494,6 +508,13 @@ int mtk_eint_do_init(struct mtk_eint *eint) 
	if (!eint->domain)

		return -ENOMEM;



	if (eint->hw->db_time) {

		for (i = 0; i < MTK_EINT_DBNC_MAX; i++)

			if (eint->hw->db_time[i] == 0)

				break;

		eint->num_db_time = i;

	}



	mtk_eint_hw_init(eint);

	for (i = 0; i < eint->hw->ap_num; i++) {

		int virq = irq_create_mapping(eint->domain, i);

drivers/pinctrl/mediatek/mtk-eint.h

+6 −0
Original line number Diff line number Diff line
@@ -37,8 +37,13 @@ struct mtk_eint_hw { 
	u8		ports;

	unsigned int	ap_num;

	unsigned int	db_cnt;

	const unsigned int *db_time;

};



extern const unsigned int debounce_time_mt2701[];

extern const unsigned int debounce_time_mt6765[];

extern const unsigned int debounce_time_mt6795[];



struct mtk_eint;



struct mtk_eint_xt {
@@ -62,6 +67,7 @@ struct mtk_eint { 
	/* Used to fit into various EINT device */

	const struct mtk_eint_hw *hw;

	const struct mtk_eint_regs *regs;

	u16 num_db_time;



	/* Used to fit into various pinctrl device */

	void *pctl;

drivers/pinctrl/mediatek/pinctrl-mt2701.c

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { 
		.ports     = 6,

		.ap_num    = 169,

		.db_cnt    = 16,

		.db_time   = debounce_time_mt2701,

	},

};

drivers/pinctrl/mediatek/pinctrl-mt2712.c

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { 
		.ports     = 8,

		.ap_num    = 229,

		.db_cnt    = 40,

		.db_time   = debounce_time_mt2701,

	},

};

drivers/pinctrl/mediatek/pinctrl-mt6765.c

+1 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,7 @@ static const struct mtk_eint_hw mt6765_eint_hw = { 
	.ports     = 6,

	.ap_num    = 160,

	.db_cnt    = 13,

	.db_time   = debounce_time_mt6765,

};



static const struct mtk_pin_soc mt6765_data = {