Skip to contentSkip to conversation

pinctrl: meson: fix bit manipulation of pin bias configuration

PATCH New Neil Armstrong 3 participants 4 messages Dec 14, 2020 – Dec 15, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: meson: fix bit manipulation of pin bias configuration

This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.

Fixes c4c726c26b ("pinctrl: meson: add pinconf support")

---
Hi Anton, Otto,

This should fix eMMC booting on Odroid-C2, could you have a quick try to confirm ?

Thanks,
Neil

 drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/meson/pinctrl-meson.c +2 -2
index d4539b02d8..5065b62436 100644
@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
 	}
 
 	/* othewise, enable the bias and select level */
-	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
+	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
 	ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
 	if (ret)
 		return ret;
 
 	clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
-			param == PIN_CONFIG_BIAS_PULL_UP);
+			(param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
 
 	return 0;
 }
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 pinctrl: meson: fix bit manipulation of pin bias configuration

Hi Neil,

I tested it and it does fix the issue. I am able to boot from eMMC.

Thanks a lot!
Anton

Quoted 41 lines · Neil Armstrong

This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.

Fixes c4c726c26b ("pinctrl: meson: add pinconf support")

---
Hi Anton, Otto,

This should fix eMMC booting on Odroid-C2, could you have a quick try to confirm ?

Thanks,
Neil

 drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/meson/pinctrl-meson.c +2 -3
index d4539b02d8..5065b62436 100644
@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
        }
 
        /* othewise, enable the bias and select level */
-       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
+       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
        ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
        if (ret)
                return ret;
 
        clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
-                       param == PIN_CONFIG_BIAS_PULL_UP);
+                       (param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
 
        return 0;
 }
--

2.25.1

#2 lore raw

PATCH 1/1 pinctrl: meson: fix bit manipulation of pin bias configuration

Quoted 44 lines · Anton Arapov

Hi Neil,

I tested it and it does fix the issue. I am able to boot from eMMC.

Thanks a lot!
Anton

Quoted 36 lines · Neil Armstrong

This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.

Fixes c4c726c26b ("pinctrl: meson: add pinconf support")

---
Hi Anton, Otto,

This should fix eMMC booting on Odroid-C2, could you have a quick try to confirm ?

Thanks,
Neil

 drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/meson/pinctrl-meson.c +2 -2
index d4539b02d8..5065b62436 100644
@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
        }
 
        /* othewise, enable the bias and select level */
-       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
+       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
        ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
        if (ret)
                return ret;
 
        clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
-                       param == PIN_CONFIG_BIAS_PULL_UP);
+                       (param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
 
Quoted 5 lines
Quoted 5 lines
drivers/pinctrl/meson/pinctrl-meson.c +0 -1
        return 0;
 }
--

2.25.1

Thanks for testing !

Applied to u-boot-amlogic

Neil

#3 lore raw

PATCH 1/1 pinctrl: meson: fix bit manipulation of pin bias configuration

Hi,

I tested it also with newest U-boot DMI: Hardkernel Co., Ltd. ODROID-C2/ODROID-C2, BIOS 2021.01-rc3-00134-gf40825e18e-dirty 12/15/2020

and it definitly fixes the emmc boot issue.

Am 15.12.20 um 08:52 schrieb Neil Armstrong:

Quoted 51 lines · Anton Arapov
Quoted 43 lines

Hi Neil,

I tested it and it does fix the issue. I am able to boot from eMMC.

Thanks a lot!
Anton

Quoted 35 lines · Neil Armstrong

This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.

Fixes c4c726c26b ("pinctrl: meson: add pinconf support")

---
Hi Anton, Otto,

This should fix eMMC booting on Odroid-C2, could you have a quick try to confirm ?

Thanks,
Neil

  drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/meson/pinctrl-meson.c +2 -2
index d4539b02d8..5065b62436 100644
@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
         }
 
         /* othewise, enable the bias and select level */
-       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
+       clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
         ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
         if (ret)
                 return ret;
 
         clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
-                       param == PIN_CONFIG_BIAS_PULL_UP);
+                       (param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
 
Quoted 5 lines
Quoted 5 lines
drivers/pinctrl/meson/pinctrl-meson.c +0 -1
         return 0;
  }
--

2.25.1

Thanks for testing !

Quoted 4 lines

Applied to u-boot-amlogic

Neil

Thank you very much for this correct fix.

Best regards
Otto