[PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo

Subsystems: pin control subsystem, pin controller - mediatek, the rest

STALE1861d

3 messages, 2 authors, 2021-07-01 · open the first message on its own page

[PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo

From: Hsin-Yi Wang <hidden>
Date: 2021-07-01 06:54:48 

Some pin doesn't support PUPD register, if it fails and fallbacks with
bias_set_combo case, it will call mtk_pinconf_bias_set_pupd_r1_r0() to
modify the PUPD pin again.

Since the general bias set are either PU/PD or PULLSEL/PULLEN, try
bias_set or bias_set_rev1 for this fallback case.

Fixes: 81bd1579b43e ("pinctrl: mediatek: Fix fallback call path")
Signed-off-by: Hsin-Yi Wang <redacted>
---
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 5b3b048725cc8..0cdff487836fa 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -926,9 +926,12 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
 			if (err)
 				return err;
 		} else if (hw->soc->bias_set_combo) {
-			err = hw->soc->bias_set_combo(hw, desc, pullup, arg);
-			if (err)
-				return err;
+			err = mtk_pinconf_bias_set_rev1(hw, desc, pullup);
+			if (err) {
+				err = mtk_pinconf_bias_set(hw, desc, pullup);
+				if (err)
+					return err;
+			}
 		} else {
 			return -ENOTSUPP;
 		}
-- 
2.32.0.93.g670b81a890-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo

From: Chen-Yu Tsai <wenst@chromium.org>
Date: 2021-07-01 07:21:27 

On Thu, Jul 1, 2021 at 2:55 PM Hsin-Yi Wang [off-list ref] wrote:
quoted hunk
Some pin doesn't support PUPD register, if it fails and fallbacks with
bias_set_combo case, it will call mtk_pinconf_bias_set_pupd_r1_r0() to
modify the PUPD pin again.

Since the general bias set are either PU/PD or PULLSEL/PULLEN, try
bias_set or bias_set_rev1 for this fallback case.

Fixes: 81bd1579b43e ("pinctrl: mediatek: Fix fallback call path")
Signed-off-by: Hsin-Yi Wang <redacted>
---
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 5b3b048725cc8..0cdff487836fa 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -926,9 +926,12 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
                        if (err)
                                return err;
                } else if (hw->soc->bias_set_combo) {
-                       err = hw->soc->bias_set_combo(hw, desc, pullup, arg);
-                       if (err)
-                               return err;
+                       err = mtk_pinconf_bias_set_rev1(hw, desc, pullup);
+                       if (err) {
+                               err = mtk_pinconf_bias_set(hw, desc, pullup);
+                               if (err)
+                                       return err;
You don't need to nest this. If mtk_pinconf_bias_set_rev1() succeeds,
err would be 0 and the following if blocks would all be skipped. So:

err = mtk_pinconf_bias_set_rev1();
if (err)
        err = mtk_pinconf_bias_set();
if (err)
        return err;

Moreover, maybe you should rework the test for hw->soc->bias_set_combo,
as it is no longer relevant to the code within the if block?


ChenYu

+                       }
                } else {
                        return -ENOTSUPP;
                }
--
2.32.0.93.g670b81a890-goog


_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo

From: Hsin-Yi Wang <hidden>
Date: 2021-07-01 08:17:24 

On Thu, Jul 1, 2021 at 3:21 PM Chen-Yu Tsai [off-list ref] wrote:
On Thu, Jul 1, 2021 at 2:55 PM Hsin-Yi Wang [off-list ref] wrote:
quoted
Some pin doesn't support PUPD register, if it fails and fallbacks with
bias_set_combo case, it will call mtk_pinconf_bias_set_pupd_r1_r0() to
modify the PUPD pin again.

Since the general bias set are either PU/PD or PULLSEL/PULLEN, try
bias_set or bias_set_rev1 for this fallback case.

Fixes: 81bd1579b43e ("pinctrl: mediatek: Fix fallback call path")
Signed-off-by: Hsin-Yi Wang <redacted>
---
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 5b3b048725cc8..0cdff487836fa 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -926,9 +926,12 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
                        if (err)
                                return err;
                } else if (hw->soc->bias_set_combo) {
-                       err = hw->soc->bias_set_combo(hw, desc, pullup, arg);
-                       if (err)
-                               return err;
+                       err = mtk_pinconf_bias_set_rev1(hw, desc, pullup);
+                       if (err) {
+                               err = mtk_pinconf_bias_set(hw, desc, pullup);
+                               if (err)
+                                       return err;
You don't need to nest this. If mtk_pinconf_bias_set_rev1() succeeds,
err would be 0 and the following if blocks would all be skipped. So:

err = mtk_pinconf_bias_set_rev1();
if (err)
        err = mtk_pinconf_bias_set();
if (err)
        return err;

Moreover, maybe you should rework the test for hw->soc->bias_set_combo,
as it is no longer relevant to the code within the if block?
Thanks for the comments. It's addressed in v2.

We can try PU/PD and PULLSEL/PULLEN even for pins that don't support
them (eg. mt6797). They will return -ENOTSUPP in
mtk_hw_pin_field_lookup() so won't break current testing logic.

ChenYu
quoted
+                       }
                } else {
                        return -ENOTSUPP;
                }
--
2.32.0.93.g670b81a890-goog


_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help