pinctrl: mediatek: common-v1: introduce per-function multibase control
Subsystems (4)
PATCH 1/1 pinctrl: mediatek: common-v1: introduce per-function multibase control
The current common-v1 framework implicitly assumes that certain register operations might span across multiple base addresses. This logic is currently hardcoded in mtk_get_regmap, where any pin falling within the [type1_start, type1_end) range is redirected to regmap2.
This approach is suboptimal for two reasons:
1. It forces all SoCs except MT8135 to define dummy type1_start/end values (set to the last pin number + 1) to avoid unintended regmap switching, which is non-intuitive and cluttering the SoC data.
2. It assumes most register types (DRV, IES, SMT, etc.) follow the same splitting rule, even though hardware design might only require it for specific functional registers.
Refactor the framework by introducing explicit '[func]_multibase' flags for each register category in struct mtk_pinctrl_devdata. This allows each SoC to explicitly declare which operations require multiple bases.
For MT8135, which is currently the only multipre regmap user, enable needed multibase flags to keep existing behavior.
For other SoCs, multibase flags will default to false, removing the need for fragile range-based workarounds and making the regmap selection logic more robust and explicit. Also, delete type1_start and type1_end, which are no longer needed by this refactor, from struct mtk_pinctrl_devdata.
--- drivers/pinctrl/mediatek/pinctrl-mt2701.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt2712.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt6397.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8127.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8135.c | 8 +++ drivers/pinctrl/mediatek/pinctrl-mt8167.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8173.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8516.c | 2 - drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 62 ++++++++++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 9 +++ 11 files changed, 57 insertions(+), 38 deletions(-)
drivers/pinctrl/mediatek/pinctrl-mt2701.c +0 -2
@@ -504,8 +504,6 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { .dout_offset = 0x0500, .din_offset = 0x0630, .pinmux_offset = 0x0760, - .type1_start = 280, - .type1_end = 280, .port_shf = 4, .port_mask = 0x1f, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt2712.c +0 -2
@@ -553,8 +553,6 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { .dout_offset = 0x0300, .din_offset = 0x0400, .pinmux_offset = 0x0500, - .type1_start = 210, - .type1_end = 210, .port_shf = 4, .port_mask = 0xf, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt6397.c +0 -2
@@ -27,8 +27,6 @@ static const struct mtk_pinctrl_devdata mt6397_pinctrl_data = { .dout_offset = (MT6397_PIN_REG_BASE + 0x080), .din_offset = (MT6397_PIN_REG_BASE + 0x0a0), .pinmux_offset = (MT6397_PIN_REG_BASE + 0x0c0), - .type1_start = 41, - .type1_end = 41, .port_shf = 3, .port_mask = 0x3, .port_align = 2,
drivers/pinctrl/mediatek/pinctrl-mt8127.c +0 -2
@@ -272,8 +272,6 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = { .dout_offset = 0x0400, .din_offset = 0x0500, .pinmux_offset = 0x0600, - .type1_start = 143, - .type1_end = 143, .port_shf = 4, .port_mask = 0xf, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt8135.c +8 -0
@@ -292,15 +292,23 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = { .n_grp_cls = ARRAY_SIZE(mt8135_drv_grp), .pin_drv_grp = mt8135_pin_drv, .n_pin_drv_grps = ARRAY_SIZE(mt8135_pin_drv), + .drv_multibase = true, .spec_pull_set = spec_pull_set, .dir_offset = 0x0000, + .dir_multibase = true, .ies_offset = 0x0100, + .ies_multibase = true, .pullen_offset = 0x0200, + .pullen_multibase = true, .smt_offset = 0x0300, + .smt_multibase = true, .pullsel_offset = 0x0400, + .pullsel_multibase = true, .dout_offset = 0x0800, + .dout_multibase = true, .din_offset = 0x0A00, .pinmux_offset = 0x0C00, + .pinmux_multibase = true, .type1_start = 34, .type1_end = 149, .port_shf = 4,
drivers/pinctrl/mediatek/pinctrl-mt8167.c +0 -2
@@ -305,8 +305,6 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = { .dout_offset = 0x0100, .din_offset = 0x0200, .pinmux_offset = 0x0300, - .type1_start = 125, - .type1_end = 125, .port_shf = 4, .port_mask = 0xf, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt8173.c +0 -2
@@ -313,8 +313,6 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = { .dout_offset = 0x0400, .din_offset = 0x0500, .pinmux_offset = 0x0600, - .type1_start = 135, - .type1_end = 135, .port_shf = 4, .port_mask = 0xf, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt8365.c +0 -2
@@ -457,8 +457,6 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = { .pullen_offset = 0x0860, .pullsel_offset = 0x0900, .drv_offset = 0x0710, - .type1_start = 145, - .type1_end = 145, .port_shf = 4, .port_mask = 0x1f, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mt8516.c +0 -2
@@ -305,8 +305,6 @@ static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = { .dout_offset = 0x0100, .din_offset = 0x0200, .pinmux_offset = 0x0300, - .type1_start = 125, - .type1_end = 125, .port_shf = 4, .port_mask = 0xf, .port_align = 4,
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +40 -22
154 lines not on this page · raw message
drivers/pinctrl/mediatek/pinctrl-mtk-common.h +9 -0
@@ -277,6 +277,15 @@ struct mtk_pinctrl_devdata {unsigned int mode_mask;unsigned int mode_per_reg;unsigned int mode_shf; +bool dir_multibase; +bool ies_multibase; +bool smt_multibase; +bool pullen_multibase; +bool pullsel_multibase; +bool drv_multibase; +bool dout_multibase; +bool din_multibase; +bool pinmux_multibase; };struct mtk_pinctrl {
Signature · 1 line
2.52.0
AngeloGioacchino Del Regno
maintainerIl 11/01/26 10:28, Akari Tsuyukusa ha scritto:
Quoted 17 lines
The current common-v1 framework implicitly assumes that certain register operations might span across multiple base addresses. This logic is currently hardcoded in
mtk_get_regmap, where any pin falling within the [type1_start,type1_end) range is redirected to regmap2.This approach is suboptimal for two reasons:
1. It forces all SoCs except MT8135 to define dummy type1_start/end values (set to the last pin number + 1) to avoid unintended regmap switching, which is non-intuitive and cluttering the SoC data.
2. It assumes most register types (DRV, IES, SMT, etc.) follow the same splitting rule, even though hardware design might only require it for specific functional registers.Refactor the framework by introducing explicit '[func]_multibase' flags for each register category in struct
mtk_pinctrl_devdata. This allows each SoC to explicitly declare which operations require multiple bases.
Quoted 8 lines
For MT8135, which is currently the only multipre regmap user, enable needed multibase flags to keep existing behavior.
For other SoCs, multibase flags will default to false, removing the need for fragile range-based workarounds and making the regmap selection logic more robust and explicit. Also, delete
type1_startandtype1_end, which are no longer needed by this refactor, from structmtk_pinctrl_devdata.
Thanks for the patch!
What you're saying here makes a lot of sense, but there's one big question for you.
Have you considered migrating those pinctrl drivers to use a PIN_FIELD_BASE() like it's being done for all other(/newer) MediaTek SoCs?
Why would this not be applicable for those old ones?
P.S.: Check mt8188, mt8195, mt8196, etc.
Cheers,
Angelo
Quoted 339 lines
Signed-off-by Akari Tsuyukusa <[email protected]>--- drivers/pinctrl/mediatek/pinctrl-mt2701.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt2712.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt6397.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8127.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8135.c | 8 +++ drivers/pinctrl/mediatek/pinctrl-mt8167.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8173.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 - drivers/pinctrl/mediatek/pinctrl-mt8516.c | 2 - drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 62 ++++++++++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 9 +++ 11 files changed, 57 insertions(+), 38 deletions(-)drivers/pinctrl/mediatek/pinctrl-mt2701.c +0
-2@@ -504,8 +504,6 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { .dout_offset = 0x0500, .din_offset = 0x0630, .pinmux_offset = 0x0760, - .type1_start = 280, - .type1_end = 280, .port_shf = 4, .port_mask = 0x1f, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt2712.c +0
-2@@ -553,8 +553,6 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { .dout_offset = 0x0300, .din_offset = 0x0400, .pinmux_offset = 0x0500, - .type1_start = 210, - .type1_end = 210, .port_shf = 4, .port_mask = 0xf, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt6397.c +0
-2@@ -27,8 +27,6 @@ static const struct mtk_pinctrl_devdata mt6397_pinctrl_data = { .dout_offset = (MT6397_PIN_REG_BASE + 0x080), .din_offset = (MT6397_PIN_REG_BASE + 0x0a0), .pinmux_offset = (MT6397_PIN_REG_BASE + 0x0c0), - .type1_start = 41, - .type1_end = 41, .port_shf = 3, .port_mask = 0x3, .port_align = 2,drivers/pinctrl/mediatek/pinctrl-mt8127.c +0
-2@@ -272,8 +272,6 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = { .dout_offset = 0x0400, .din_offset = 0x0500, .pinmux_offset = 0x0600, - .type1_start = 143, - .type1_end = 143, .port_shf = 4, .port_mask = 0xf, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt8135.c +8
-0@@ -292,15 +292,23 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = { .n_grp_cls = ARRAY_SIZE(mt8135_drv_grp), .pin_drv_grp = mt8135_pin_drv, .n_pin_drv_grps = ARRAY_SIZE(mt8135_pin_drv), + .drv_multibase = true, .spec_pull_set = spec_pull_set, .dir_offset = 0x0000, + .dir_multibase = true, .ies_offset = 0x0100, + .ies_multibase = true, .pullen_offset = 0x0200, + .pullen_multibase = true, .smt_offset = 0x0300, + .smt_multibase = true, .pullsel_offset = 0x0400, + .pullsel_multibase = true, .dout_offset = 0x0800, + .dout_multibase = true, .din_offset = 0x0A00, .pinmux_offset = 0x0C00, + .pinmux_multibase = true, .type1_start = 34, .type1_end = 149, .port_shf = 4,drivers/pinctrl/mediatek/pinctrl-mt8167.c +0
-2@@ -305,8 +305,6 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = { .dout_offset = 0x0100, .din_offset = 0x0200, .pinmux_offset = 0x0300, - .type1_start = 125, - .type1_end = 125, .port_shf = 4, .port_mask = 0xf, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt8173.c +0
-2@@ -313,8 +313,6 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = { .dout_offset = 0x0400, .din_offset = 0x0500, .pinmux_offset = 0x0600, - .type1_start = 135, - .type1_end = 135, .port_shf = 4, .port_mask = 0xf, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt8365.c +0
-2@@ -457,8 +457,6 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = { .pullen_offset = 0x0860, .pullsel_offset = 0x0900, .drv_offset = 0x0710, - .type1_start = 145, - .type1_end = 145, .port_shf = 4, .port_mask = 0x1f, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mt8516.c +0
-2@@ -305,8 +305,6 @@ static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = { .dout_offset = 0x0100, .din_offset = 0x0200, .pinmux_offset = 0x0300, - .type1_start = 125, - .type1_end = 125, .port_shf = 4, .port_mask = 0xf, .port_align = 4,drivers/pinctrl/mediatek/pinctrl-mtk-common.c +40
-22@@ -42,14 +42,15 @@ static const char * const mtk_gpio_functions[] = { };/* -* There are two base address for pull related configuration -* in mt8135, and different GPIO pins use different base address. -* When pin number greater than type1_start and less than type1_end, -* should use the second base address. +* Some chips (e.g., mt8135) have multiple base addresses for pin configuration. +* When multibase is true and the pin number falls within the specified range +* [type1_start, type1_end), the second base address should be used. */ static struct regmap *mtk_get_regmap (struct mtk_pinctrl *pctl, -unsigned long pin) +unsigned long pin,bool multibase) { +if (!multibase) +return pctl->regmap1;if (pin >= pctl->devdata->type1_start && pin < pctl->devdata->type1_end)return pctl->regmap2;return pctl->regmap1;@@ -82,7 +83,8 @@ static int mtk_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,else reg_addr =SET_ADDR (reg_addr, pctl); -regmap_write (mtk_get_regmap (pctl, offset), reg_addr, bit); +regmap_write (mtk_get_regmap (pctl, offset, pctl->devdata->dir_multibase), + reg_addr, bit);return 0 ; }@@ -100,7 +102,8 @@ static int mtk_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)else reg_addr =CLR_ADDR (reg_addr, pctl); -return regmap_write (mtk_get_regmap (pctl, offset), reg_addr, bit); +return regmap_write (mtk_get_regmap (pctl, offset, pctl->devdata->dout_multibase), + reg_addr, bit); } static int mtk_pconf_set_ies_smt(struct mtk_pinctrl *pctl, unsigned pin,@@ -108,6 +111,7 @@ static int mtk_pconf_set_ies_smt(struct mtk_pinctrl *pctl, unsigned pin, {unsigned int reg_addr, offset;unsigned int bit; +bool multibase;/** * Due to some soc are not support ies/smt config, add this special @@ -123,12 +127,18 @@ static int mtk_pconf_set_ies_smt(struct mtk_pinctrl *pctl, unsigned pin, arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)return -EINVAL ; +if (arg ==PIN_CONFIG_INPUT_ENABLE ) + multibase = pctl->devdata->ies_multibase; +else + multibase = pctl->devdata->smt_multibase; +/* * Due to some pins are irregular, their input enable and smt * control register are discontinuous, so we need this special handle. */ if (pctl->devdata->spec_ies_smt_set) { -return pctl->devdata->spec_ies_smt_set (mtk_get_regmap (pctl, pin), +return pctl->devdata->spec_ies_smt_set ( +mtk_get_regmap (pctl, pin, multibase), pctl->devdata, pin, value, arg); }@@ -144,7 +154,7 @@ static int mtk_pconf_set_ies_smt(struct mtk_pinctrl *pctl, unsigned pin,else reg_addr =CLR_ADDR (mtk_get_port (pctl, pin) + offset, pctl); -regmap_write (mtk_get_regmap (pctl, pin), reg_addr, bit); +regmap_write (mtk_get_regmap (pctl, pin, multibase), reg_addr, bit);return 0 ; }@@ -229,7 +239,8 @@ static int mtk_pconf_set_driving(struct mtk_pinctrl *pctl, shift = pin_drv->bit + drv_grp->low_bit; mask <<= shift; val <<= shift; -return regmap_update_bits (mtk_get_regmap (pctl, pin), +return regmap_update_bits ( +mtk_get_regmap (pctl, pin, pctl->devdata->drv_multibase), pin_drv->offset, mask, val); }@@ -314,9 +325,9 @@ static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl,* the parameter should be "MTK_PUPD_SET_R1R0_00". */ r1r0 = enable ? arg :MTK_PUPD_SET_R1R0_00 ; - ret = pctl->devdata->spec_pull_set (mtk_get_regmap (pctl, pin), - pctl->devdata, pin, isup, - r1r0); + ret = pctl->devdata->spec_pull_set ( +mtk_get_regmap (pctl, pin, pctl->devdata->pullsel_multibase), + pctl->devdata, pin, isup, r1r0);if (!ret)return 0 ; }@@ -334,7 +345,8 @@ static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl, pctl->devdata->pullen_offset; reg_pullsel =mtk_get_port (pctl, pin) + pctl->devdata->pullsel_offset; - ret = pctl->devdata->mt8365_set_clr_mode (mtk_get_regmap (pctl, pin), +/* MT8365 do not use multibase. */ + ret = pctl->devdata->mt8365_set_clr_mode (pctl->regmap1, bit, reg_pullen, reg_pullsel, enable, isup);if (ret)@@ -358,8 +370,10 @@ static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl, reg_pullsel =CLR_ADDR (mtk_get_port (pctl, pin) + pctl->devdata->pullsel_offset, pctl); -regmap_write (mtk_get_regmap (pctl, pin), reg_pullen, bit); -regmap_write (mtk_get_regmap (pctl, pin), reg_pullsel, bit); +regmap_write (mtk_get_regmap (pctl, pin, pctl->devdata->pullen_multibase), + reg_pullen, bit); +regmap_write (mtk_get_regmap (pctl, pin, pctl->devdata->pullsel_multibase), + reg_pullsel, bit);return 0 ; }@@ -710,8 +724,9 @@ static int mtk_pmx_set_mode(struct pinctrl_dev *pctldev,struct mtk_pinctrl *pctl =pinctrl_dev_get_drvdata (pctldev);if (pctl->devdata->spec_pinmux_set) - pctl->devdata->spec_pinmux_set (mtk_get_regmap (pctl, pin), - pin, mode); + pctl->devdata->spec_pinmux_set ( +mtk_get_regmap (pctl, pin, pctl->devdata->pinmux_multibase), + pin, mode); reg_addr = ((pin / pctl->devdata->mode_per_reg) << pctl->devdata->port_shf) + pctl->devdata->pinmux_offset;@@ -720,8 +735,9 @@ static int mtk_pmx_set_mode(struct pinctrl_dev *pctldev, bit = pin % pctl->devdata->mode_per_reg; mask <<= (GPIO_MODE_BITS * bit); val = (mode << (GPIO_MODE_BITS * bit)); -return regmap_update_bits (mtk_get_regmap (pctl, pin), - reg_addr, mask, val); +return regmap_update_bits ( +mtk_get_regmap (pctl, pin, pctl->devdata->pinmux_multibase), + reg_addr, mask, val); } static const struct mtk_desc_pin *@@ -832,7 +848,8 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset)if (pctl->devdata->spec_dir_set) pctl->devdata->spec_dir_set (®_addr, offset); -regmap_read (pctl->regmap1, reg_addr, &read_val); +regmap_read (mtk_get_regmap (pctl, offset, pctl->devdata->dir_multibase), + reg_addr, &read_val);if (read_val & bit)return GPIO_LINE_DIRECTION_OUT ;@@ -850,7 +867,8 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned offset) pctl->devdata->din_offset; bit =BIT (offset & pctl->devdata->mode_mask); -regmap_read (pctl->regmap1, reg_addr, &read_val); +regmap_read (mtk_get_regmap (pctl, offset, pctl->devdata->din_multibase), + reg_addr, &read_val);return !!(read_val & bit); }drivers/pinctrl/mediatek/pinctrl-mtk-common.h +9
-0@@ -277,6 +277,15 @@ struct mtk_pinctrl_devdata {unsigned int mode_mask;unsigned int mode_per_reg;unsigned int mode_shf; +bool dir_multibase; +bool ies_multibase; +bool smt_multibase; +bool pullen_multibase; +bool pullsel_multibase; +bool drv_multibase; +bool dout_multibase; +bool din_multibase; +bool pinmux_multibase; };struct mtk_pinctrl {
Signature · 6 lines
AngeloGioacchino Del Regno Senior Software Engineer Collabora Ltd. Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, UK Registered in England & Wales, no. 5513718
Quoted 7 lines · AngeloGioacchino Del Regno
Thanks for the patch!
What you're saying here makes a lot of sense, but there's one big question for you.Have you considered migrating those pinctrl drivers to use a
PIN_FIELD_BASE()like it's being done for all other(/newer) MediaTek SoCs?Why would this not be applicable for those old ones?
Hi Angelo,
Thanks for your review and sorry for the too late response.
I am developing the pinctrl driver for MT6589 and initially based it on the MT8135 driver, because those two SoCs are very similar. However, I realized that the hard-coded multi-base settings in v1 are not compatible with MT6589, which led me to create this patch.
After looking at v2, it seems likely compatible with MT6589 as well, so I will proceed with my development based on v2.
Also, this patch has two flaws:
- It hard-codes the behavior of mt8365_set_clr_mode, which would cause issues if there are other SoCs similar to MT8365.
- spec_ies_smt_set expects the IES and SMT registers to be on the same base; if an SoC does not follow this, additional handling will be required.
Please ignore this patch for now.
Best regards,
Akari