pinctrl: mediatek: common: add quirk for broken set/clr modes
Subsystems (4)
PATCH 1/2 pinctrl: mediatek: common: add quirk for broken set/clr modes
On MT8365, the SET/CLR of the mode is broken and some pin modes won't be set correctly. Add a quirk for such SoCs, so that instead of using the SET/CLR register use the main R/W register
to read/update/write the modes.
--- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 46 ++++++++++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 3 ++ 2 files changed, 33 insertions(+), 16 deletions(-)
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +30 -16
@@ -330,23 +330,37 @@ static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl,return -EINVAL ; } - bit =BIT (pin & pctl->devdata->mode_mask); -if (enable) - reg_pullen =SET_ADDR (mtk_get_port (pctl, pin) + - pctl->devdata->pullen_offset, pctl); -else - reg_pullen =CLR_ADDR (mtk_get_port (pctl, pin) + - pctl->devdata->pullen_offset, pctl); - -if (isup) - reg_pullsel =SET_ADDR (mtk_get_port (pctl, pin) + - pctl->devdata->pullsel_offset, pctl); -else - reg_pullsel =CLR_ADDR (mtk_get_port (pctl, pin) + - pctl->devdata->pullsel_offset, pctl); +if (pctl->devdata->quirks &MTK_PINCTRL_MODE_SET_CLR_BROKEN ) { + bit = pin & pctl->devdata->mode_mask; + reg_pullen =mtk_get_port (pctl, pin) + + pctl->devdata->pullen_offset; + reg_pullsel =mtk_get_port (pctl, pin) + + pctl->devdata->pullsel_offset; + +regmap_update_bits (mtk_get_regmap (pctl, pin), reg_pullen, +BIT (bit), enable << bit); +regmap_update_bits (mtk_get_regmap (pctl, pin), reg_pullsel, +BIT (bit), isup << bit); + }else { + bit =BIT (pin & pctl->devdata->mode_mask); +if (enable) + reg_pullen =SET_ADDR (mtk_get_port (pctl, pin) + + pctl->devdata->pullen_offset, pctl); +else + reg_pullen =CLR_ADDR (mtk_get_port (pctl, pin) + + pctl->devdata->pullen_offset, pctl); + +if (isup) + reg_pullsel =SET_ADDR (mtk_get_port (pctl, pin) + + pctl->devdata->pullsel_offset, pctl); +else + 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), reg_pullen, bit); -regmap_write (mtk_get_regmap (pctl, pin), reg_pullsel, bit);return 0 ; }
drivers/pinctrl/mediatek/pinctrl-mtk-common.h +3 -0
@@ -22,6 +22,8 @@#define MTK_PINCTRL_NOT_SUPPORT (0xffff) +#define MTK_PINCTRL_MODE_SET_CLR_BROKEN BIT(0) +struct mtk_desc_function {const char *name;unsigned char muxval;
@@ -271,6 +273,7 @@ struct mtk_pinctrl_devdata {unsigned int mode_mask;unsigned int mode_per_reg;unsigned int mode_shf; +unsigned long quirks; };struct mtk_pinctrl {
Signature · 7 lines
2.36.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 2/2 pinctrl: mediatek: mt8365: use MTK_PINCTRL_MODE_SET_CLR_BROKEN quirk
On MT8365, the GPIO64 modes cannot be set using the SET/CLR register. Use the MTK_PINCTRL_MODE_SET_CLR_BROKEN quirk to workaround it.
--- drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/mediatek/pinctrl-mt8365.c +1 -0
@@ -454,6 +454,7 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = { .ap_num = 160, .db_cnt = 160, }, + .quirks = MTK_PINCTRL_MODE_SET_CLR_BROKEN, }; static const struct of_device_id mt8365_pctrl_match[] = {
Signature · 7 lines
2.36.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
AngeloGioacchino Del Regno
maintainerIl 30/05/22 14:34, Fabien Parent ha scritto:
Quoted 16 lines
On MT8365, the SET/CLR of the mode is broken and some pin modes won't be set correctly. Add a quirk for such SoCs, so that instead of using the SET/CLR register use the main R/W register
to read/update/write the modes.Signed-off-by Fabien Parent <[email protected]>--- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 46 ++++++++++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 3 ++ 2 files changed, 33 insertions(+), 16 deletions(-)drivers/pinctrl/mediatek/pinctrl-mtk-common.c +0
-0
drivers/pinctrl/mediatek/pinctrl-mtk-common.c static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl, · line 332
Quoted 3 lines
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +0
-0@@ -330,23 +330,37 @@ static int mtk_pconf_set_pull_select(struct mtk_pinctrl *pctl,return -EINVAL ; }
That's not the right way of doing that, unless there are other SoCs that are actually affected by this issue (and besides, any *new* pinctrl driver should be using pinctrl-mtk-common-v2, which accounts for this quirk already).
Since MT8365 seems to be the only SoC that is affected by this issue, there's a spec_pull_set() callback that you can use and you can indeed define your own function in mt8365-pinctrl.c instead... but this, only if I got it right (and I think I did, but please recheck!):
In this function, the call to spec_pull_set assigns 'arg' if 'enable == true', else, MTK_PUPD_SET_R1R0_00...
...for "generic pull config", as stated in a comment in this function, 'arg' will always be either 0 or 1, so you will get passed either:
- 1, if pull-enable; or
- MTK_PUPD_SET_R1R0_00 (100) if pull-disable.
Though, if I got the '1' part wrong, it's still doable because you care only about one value in your case, so, if you get a MTK_PUPD_SET_R1R0_00, this means that you have to do pull-disable.
The other args are passed as they are, so that's golden.
Regards,
Angelo
Quoted 6 lines · Fabien Parent
On MT8365, the SET/CLR of the mode is broken and some pin modes won't be set correctly. Add a quirk for such SoCs, so that instead of using the SET/CLR register use the main R/W register
to read/update/write the modes.Signed-off-by Fabien Parent <[email protected]>
What is the state of this patch set? I see changes are requested by Angelo, are they being addressed?
Yours,
Linus Walleij
Hi Linus,
Quoted 11 lines · Linus Walleij
Quoted 6 lines · Fabien Parent
On MT8365, the SET/CLR of the mode is broken and some pin modes won't be set correctly. Add a quirk for such SoCs, so that instead of using the SET/CLR register use the main R/W register
to read/update/write the modes.Signed-off-by Fabien Parent <[email protected]>What is the state of this patch set? I see changes are requested by Angelo, are they being addressed?
I will probably pick up these patches and work on the comments, but I am currently a bit busy on another project as well so it takes some time, sorry.
Best,
Markus