[PATCH v3 8/9] pinctrl: mediatek: mt6397: Add support for MT6392 variant
From: Luca Leonardo Scorcia <hidden>
Date: 2026-03-17 18:46:54
Also in:
linux-devicetree, linux-gpio, linux-input, linux-mediatek, linux-pm, lkml
Subsystem:
pin control subsystem, pin controller - mediatek, the rest · Maintainers:
Linus Walleij, Sean Wang, Linus Torvalds
Add support for the MT6392 pinctrl device, which is very similar to MT6397 with a handful of different property values and its own pins definition. Update the MT6397 driver to retrieve device data from the match table and use it for driver init. Signed-off-by: Luca Leonardo Scorcia <redacted> --- drivers/pinctrl/mediatek/pinctrl-mt6397.c | 37 ++++++++++- drivers/pinctrl/mediatek/pinctrl-mtk-mt6392.h | 64 +++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6392.h
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6397.c b/drivers/pinctrl/mediatek/pinctrl-mt6397.c
index 03d0f65d7bcc..8ba02e70595c 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt6397.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6397.c@@ -12,10 +12,32 @@ #include <linux/mfd/mt6397/core.h> #include "pinctrl-mtk-common.h" +#include "pinctrl-mtk-mt6392.h" #include "pinctrl-mtk-mt6397.h" #define MT6397_PIN_REG_BASE 0xc000 +static const struct mtk_pinctrl_devdata mt6392_pinctrl_data = { + .pins = mtk_pins_mt6392, + .npins = ARRAY_SIZE(mtk_pins_mt6392), + .dir_offset = (MT6397_PIN_REG_BASE + 0x000), + .ies_offset = MTK_PINCTRL_NOT_SUPPORT, + .smt_offset = MTK_PINCTRL_NOT_SUPPORT, + .pullen_offset = (MT6397_PIN_REG_BASE + 0x020), + .pullsel_offset = (MT6397_PIN_REG_BASE + 0x040), + .dout_offset = (MT6397_PIN_REG_BASE + 0x080), + .din_offset = (MT6397_PIN_REG_BASE + 0x0a0), + .pinmux_offset = (MT6397_PIN_REG_BASE + 0x0c0), + .type1_start = 7, + .type1_end = 7, + .port_shf = 3, + .port_mask = 0x3, + .port_align = 2, + .mode_mask = 0xf, + .mode_per_reg = 5, + .mode_shf = 4, +}; + static const struct mtk_pinctrl_devdata mt6397_pinctrl_data = { .pins = mtk_pins_mt6397, .npins = ARRAY_SIZE(mtk_pins_mt6397),
@@ -40,13 +62,24 @@ static const struct mtk_pinctrl_devdata mt6397_pinctrl_data = { static int mt6397_pinctrl_probe(struct platform_device *pdev) { struct mt6397_chip *mt6397; + const struct mtk_pinctrl_devdata *data; + + data = device_get_match_data(&pdev->dev); + if (!data) + return -ENOENT; mt6397 = dev_get_drvdata(pdev->dev.parent); - return mtk_pctrl_init(pdev, &mt6397_pinctrl_data, mt6397->regmap); + return mtk_pctrl_init(pdev, data, mt6397->regmap); } static const struct of_device_id mt6397_pctrl_match[] = { - { .compatible = "mediatek,mt6397-pinctrl", }, + { + .compatible = "mediatek,mt6392-pinctrl", + .data = &mt6392_pinctrl_data + }, { + .compatible = "mediatek,mt6397-pinctrl", + .data = &mt6397_pinctrl_data + }, { } };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6392.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6392.h
new file mode 100644
index 000000000000..e7241af28fdb
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6392.h@@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PINCTRL_MTK_MT6392_H +#define __PINCTRL_MTK_MT6392_H + +#include <linux/pinctrl/pinctrl.h> +#include "pinctrl-mtk-common.h" + +static const struct mtk_desc_pin mtk_pins_mt6392[] = { + MTK_PIN(PINCTRL_PIN(0, "INT"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO0"), + MTK_FUNCTION(1, "INT"), + MTK_FUNCTION(5, "TEST_CK2"), + MTK_FUNCTION(6, "TEST_IN1"), + MTK_FUNCTION(7, "TEST_OUT1") + ), + MTK_PIN(PINCTRL_PIN(1, "SRCLKEN"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO1"), + MTK_FUNCTION(1, "SRCLKEN"), + MTK_FUNCTION(5, "TEST_CK0"), + MTK_FUNCTION(6, "TEST_IN2"), + MTK_FUNCTION(7, "TEST_OUT2") + ), + MTK_PIN(PINCTRL_PIN(2, "RTC_32K1V8"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO2"), + MTK_FUNCTION(1, "RTC_32K1V8"), + MTK_FUNCTION(5, "TEST_CK1"), + MTK_FUNCTION(6, "TEST_IN3"), + MTK_FUNCTION(7, "TEST_OUT3") + ), + MTK_PIN(PINCTRL_PIN(3, "SPI_CLK"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO3"), + MTK_FUNCTION(1, "SPI_CLK") + ), + MTK_PIN(PINCTRL_PIN(4, "SPI_CSN"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO4"), + MTK_FUNCTION(1, "SPI_CSN") + ), + MTK_PIN(PINCTRL_PIN(5, "SPI_MOSI"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO5"), + MTK_FUNCTION(1, "SPI_MOSI") + ), + MTK_PIN(PINCTRL_PIN(6, "SPI_MISO"), + NULL, "mt6392", + MTK_EINT_FUNCTION(NO_EINT_SUPPORT, NO_EINT_SUPPORT), + MTK_FUNCTION(0, "GPIO6"), + MTK_FUNCTION(1, "SPI_MISO"), + MTK_FUNCTION(6, "TEST_IN4"), + MTK_FUNCTION(7, "TEST_OUT4") + ), +}; + +#endif /* __PINCTRL_MTK_MT6392_H */
--
2.43.0