d56344414b
Latest U-Boot broke boot from eMMC on ODROID-C2. Revert the offending device tree change to make the system boot again.
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 26e152c0929702a9dfca4a8967601b59de77a57d Mon Sep 17 00:00:00 2001
|
|
Message-Id: <26e152c0929702a9dfca4a8967601b59de77a57d.1609421746.git.stefan@agner.ch>
|
|
In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
|
References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
|
From: Neil Armstrong <narmstrong@baylibre.com>
|
|
Date: Mon, 14 Dec 2020 19:39:07 +0100
|
|
Subject: [PATCH 4/4] 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")
|
|
Reported-by: Anton Arapov <arapov@gmail.com>
|
|
Reported-by: Otto Meier <gf435@gmx.net>
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
(cherry picked from commit 5ccd5d2cc98224108ae9fb09593a862c9caa5e80)
|
|
---
|
|
drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
|
|
index d4539b02d8..5065b62436 100644
|
|
--- a/drivers/pinctrl/meson/pinctrl-meson.c
|
|
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
|
|
@@ -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, ®, &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.30.0
|
|
|