diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 17:38:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 17:38:38 +0100 |
commit | 42a62da0ae660e71c280bd8b287b994c1af1352c (patch) | |
tree | f0c091088e98037f9cf86c62c64b335ab1aeb3fa /drivers/pinctrl/mediatek/mtk-eint.h | |
parent | tty: n_gsm: Delete unneeded semicolon (diff) | |
parent | Linux 6.1-rc6 (diff) | |
download | linux-42a62da0ae660e71c280bd8b287b994c1af1352c.tar.xz linux-42a62da0ae660e71c280bd8b287b994c1af1352c.zip |
Merge 6.1-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/mediatek/mtk-eint.h')
-rw-r--r-- | drivers/pinctrl/mediatek/mtk-eint.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pinctrl/mediatek/mtk-eint.h b/drivers/pinctrl/mediatek/mtk-eint.h index 48468d0fae68..6139b16cd225 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.h +++ b/drivers/pinctrl/mediatek/mtk-eint.h @@ -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; |