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/pinctrl-mt6779.c | |
| 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/pinctrl-mt6779.c')
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mt6779.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6779.c b/drivers/pinctrl/mediatek/pinctrl-mt6779.c index 4ddf8bda6827..62d4f5ad6737 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt6779.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt6779.c @@ -737,6 +737,7 @@ static const struct mtk_eint_hw mt6779_eint_hw = { .ports = 6, .ap_num = 195, .db_cnt = 13, + .db_time = debounce_time_mt2701, }; static const struct mtk_pin_soc mt6779_data = { |