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

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.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 91d5c506
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define MTK_EINT_EDGE_SENSITIVE 0 #define MTK_EINT_EDGE_SENSITIVE 0
#define MTK_EINT_LEVEL_SENSITIVE 1 #define MTK_EINT_LEVEL_SENSITIVE 1
#define MTK_EINT_DBNC_SET_DBNC_BITS 4 #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_RST_BIT (0x1 << 1)
#define MTK_EINT_DBNC_SET_EN (0x1 << 0) #define MTK_EINT_DBNC_SET_EN (0x1 << 0)
...@@ -48,6 +49,18 @@ static const struct mtk_eint_regs mtk_generic_eint_regs = { ...@@ -48,6 +49,18 @@ static const struct mtk_eint_regs mtk_generic_eint_regs = {
.dbnc_clr = 0x700, .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, static void __iomem *mtk_eint_get_offset(struct mtk_eint *eint,
unsigned int eint_num, unsigned int eint_num,
unsigned int offset) unsigned int offset)
...@@ -404,10 +417,11 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, ...@@ -404,10 +417,11 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num,
int virq, eint_offset; int virq, eint_offset;
unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask, unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask,
dbnc; dbnc;
static const unsigned int debounce_time[] = {500, 1000, 16000, 32000,
64000, 128000, 256000};
struct irq_data *d; struct irq_data *d;
if (!eint->hw->db_time)
return -EOPNOTSUPP;
virq = irq_find_mapping(eint->domain, eint_num); virq = irq_find_mapping(eint->domain, eint_num);
eint_offset = (eint_num % 4) * 8; eint_offset = (eint_num % 4) * 8;
d = irq_get_irq_data(virq); d = irq_get_irq_data(virq);
...@@ -418,9 +432,9 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, ...@@ -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)) if (!mtk_eint_can_en_debounce(eint, eint_num))
return -EINVAL; return -EINVAL;
dbnc = ARRAY_SIZE(debounce_time); dbnc = eint->num_db_time;
for (i = 0; i < ARRAY_SIZE(debounce_time); i++) { for (i = 0; i < eint->num_db_time; i++) {
if (debounce <= debounce_time[i]) { if (debounce <= eint->hw->db_time[i]) {
dbnc = i; dbnc = i;
break; break;
} }
...@@ -494,6 +508,13 @@ int mtk_eint_do_init(struct mtk_eint *eint) ...@@ -494,6 +508,13 @@ int mtk_eint_do_init(struct mtk_eint *eint)
if (!eint->domain) if (!eint->domain)
return -ENOMEM; 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); mtk_eint_hw_init(eint);
for (i = 0; i < eint->hw->ap_num; i++) { for (i = 0; i < eint->hw->ap_num; i++) {
int virq = irq_create_mapping(eint->domain, i); int virq = irq_create_mapping(eint->domain, i);
......
...@@ -37,8 +37,13 @@ struct mtk_eint_hw { ...@@ -37,8 +37,13 @@ struct mtk_eint_hw {
u8 ports; u8 ports;
unsigned int ap_num; unsigned int ap_num;
unsigned int db_cnt; 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;
struct mtk_eint_xt { struct mtk_eint_xt {
...@@ -62,6 +67,7 @@ struct mtk_eint { ...@@ -62,6 +67,7 @@ struct mtk_eint {
/* Used to fit into various EINT device */ /* Used to fit into various EINT device */
const struct mtk_eint_hw *hw; const struct mtk_eint_hw *hw;
const struct mtk_eint_regs *regs; const struct mtk_eint_regs *regs;
u16 num_db_time;
/* Used to fit into various pinctrl device */ /* Used to fit into various pinctrl device */
void *pctl; void *pctl;
......
...@@ -518,6 +518,7 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { ...@@ -518,6 +518,7 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 169, .ap_num = 169,
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt2701,
}, },
}; };
......
...@@ -567,6 +567,7 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { ...@@ -567,6 +567,7 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = {
.ports = 8, .ports = 8,
.ap_num = 229, .ap_num = 229,
.db_cnt = 40, .db_cnt = 40,
.db_time = debounce_time_mt2701,
}, },
}; };
......
...@@ -1062,6 +1062,7 @@ static const struct mtk_eint_hw mt6765_eint_hw = { ...@@ -1062,6 +1062,7 @@ static const struct mtk_eint_hw mt6765_eint_hw = {
.ports = 6, .ports = 6,
.ap_num = 160, .ap_num = 160,
.db_cnt = 13, .db_cnt = 13,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt6765_data = { static const struct mtk_pin_soc mt6765_data = {
......
...@@ -737,6 +737,7 @@ static const struct mtk_eint_hw mt6779_eint_hw = { ...@@ -737,6 +737,7 @@ static const struct mtk_eint_hw mt6779_eint_hw = {
.ports = 6, .ports = 6,
.ap_num = 195, .ap_num = 195,
.db_cnt = 13, .db_cnt = 13,
.db_time = debounce_time_mt2701,
}; };
static const struct mtk_pin_soc mt6779_data = { static const struct mtk_pin_soc mt6779_data = {
......
...@@ -475,6 +475,7 @@ static const struct mtk_eint_hw mt6795_eint_hw = { ...@@ -475,6 +475,7 @@ static const struct mtk_eint_hw mt6795_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = 224, .ap_num = 224,
.db_cnt = 32, .db_cnt = 32,
.db_time = debounce_time_mt6795,
}; };
static const unsigned int mt6795_pull_type[] = { static const unsigned int mt6795_pull_type[] = {
......
...@@ -846,6 +846,7 @@ static const struct mtk_eint_hw mt7622_eint_hw = { ...@@ -846,6 +846,7 @@ static const struct mtk_eint_hw mt7622_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = ARRAY_SIZE(mt7622_pins), .ap_num = ARRAY_SIZE(mt7622_pins),
.db_cnt = 20, .db_cnt = 20,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt7622_data = { static const struct mtk_pin_soc mt7622_data = {
......
...@@ -1369,6 +1369,7 @@ static const struct mtk_eint_hw mt7623_eint_hw = { ...@@ -1369,6 +1369,7 @@ static const struct mtk_eint_hw mt7623_eint_hw = {
.ports = 6, .ports = 6,
.ap_num = 169, .ap_num = 169,
.db_cnt = 20, .db_cnt = 20,
.db_time = debounce_time_mt2701,
}; };
static struct mtk_pin_soc mt7623_data = { static struct mtk_pin_soc mt7623_data = {
......
...@@ -402,6 +402,7 @@ static const struct mtk_eint_hw mt7629_eint_hw = { ...@@ -402,6 +402,7 @@ static const struct mtk_eint_hw mt7629_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = ARRAY_SIZE(mt7629_pins), .ap_num = ARRAY_SIZE(mt7629_pins),
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt2701,
}; };
static struct mtk_pin_soc mt7629_data = { static struct mtk_pin_soc mt7629_data = {
......
...@@ -826,6 +826,7 @@ static const struct mtk_eint_hw mt7986a_eint_hw = { ...@@ -826,6 +826,7 @@ static const struct mtk_eint_hw mt7986a_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = ARRAY_SIZE(mt7986a_pins), .ap_num = ARRAY_SIZE(mt7986a_pins),
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_eint_hw mt7986b_eint_hw = { static const struct mtk_eint_hw mt7986b_eint_hw = {
...@@ -833,6 +834,7 @@ static const struct mtk_eint_hw mt7986b_eint_hw = { ...@@ -833,6 +834,7 @@ static const struct mtk_eint_hw mt7986b_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = ARRAY_SIZE(mt7986b_pins), .ap_num = ARRAY_SIZE(mt7986b_pins),
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt6765,
}; };
static struct mtk_pin_soc mt7986a_data = { static struct mtk_pin_soc mt7986a_data = {
......
...@@ -286,6 +286,7 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = { ...@@ -286,6 +286,7 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 143, .ap_num = 143,
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt2701,
}, },
}; };
......
...@@ -315,6 +315,7 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = { ...@@ -315,6 +315,7 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 192, .ap_num = 192,
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt2701,
}, },
}; };
......
...@@ -319,6 +319,7 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = { ...@@ -319,6 +319,7 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 169, .ap_num = 169,
.db_cnt = 64, .db_cnt = 64,
.db_time = debounce_time_mt6795,
}, },
}; };
......
...@@ -327,6 +327,7 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = { ...@@ -327,6 +327,7 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 224, .ap_num = 224,
.db_cnt = 16, .db_cnt = 16,
.db_time = debounce_time_mt2701,
}, },
}; };
......
...@@ -545,6 +545,7 @@ static const struct mtk_eint_hw mt8183_eint_hw = { ...@@ -545,6 +545,7 @@ static const struct mtk_eint_hw mt8183_eint_hw = {
.ports = 6, .ports = 6,
.ap_num = 212, .ap_num = 212,
.db_cnt = 13, .db_cnt = 13,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt8183_data = { static const struct mtk_pin_soc mt8183_data = {
......
...@@ -1222,6 +1222,7 @@ static const struct mtk_eint_hw mt8186_eint_hw = { ...@@ -1222,6 +1222,7 @@ static const struct mtk_eint_hw mt8186_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = 217, .ap_num = 217,
.db_cnt = 32, .db_cnt = 32,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt8186_data = { static const struct mtk_pin_soc mt8186_data = {
......
...@@ -1625,6 +1625,7 @@ static const struct mtk_eint_hw mt8188_eint_hw = { ...@@ -1625,6 +1625,7 @@ static const struct mtk_eint_hw mt8188_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = 225, .ap_num = 225,
.db_cnt = 32, .db_cnt = 32,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt8188_data = { static const struct mtk_pin_soc mt8188_data = {
......
...@@ -1371,6 +1371,7 @@ static const struct mtk_eint_hw mt8192_eint_hw = { ...@@ -1371,6 +1371,7 @@ static const struct mtk_eint_hw mt8192_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = 224, .ap_num = 224,
.db_cnt = 32, .db_cnt = 32,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_reg_calc mt8192_reg_cals[PINCTRL_PIN_REG_MAX] = { static const struct mtk_pin_reg_calc mt8192_reg_cals[PINCTRL_PIN_REG_MAX] = {
......
...@@ -935,6 +935,7 @@ static const struct mtk_eint_hw mt8195_eint_hw = { ...@@ -935,6 +935,7 @@ static const struct mtk_eint_hw mt8195_eint_hw = {
.ports = 7, .ports = 7,
.ap_num = 225, .ap_num = 225,
.db_cnt = 32, .db_cnt = 32,
.db_time = debounce_time_mt6765,
}; };
static const struct mtk_pin_soc mt8195_data = { static const struct mtk_pin_soc mt8195_data = {
......
...@@ -453,6 +453,7 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = { ...@@ -453,6 +453,7 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = {
.ports = 5, .ports = 5,
.ap_num = 160, .ap_num = 160,
.db_cnt = 160, .db_cnt = 160,
.db_time = debounce_time_mt6765,
}, },
}; };
......
...@@ -319,6 +319,7 @@ static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = { ...@@ -319,6 +319,7 @@ static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = {
.ports = 6, .ports = 6,
.ap_num = 169, .ap_num = 169,
.db_cnt = 64, .db_cnt = 64,
.db_time = debounce_time_mt6795,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment