Skip to contentSkip to conversation

mci: imx-esdhc: resolve conflicting flags

PATCH Applied Alexander Kurz 2 participants 2 messages Mar 15, 2019 – Mar 18, 2019 Arm i.MX and Layerscape

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore

Alexander Kurz

author
#0 lore raw

PATCH 1/1 mci: imx-esdhc: resolve conflicting flags

From: Alexander Kurz <[email protected]>

With commit 3354adee3920 ("mci: imx-esdhc: Add bigendian register access support") and commit 15b64fd520c2 ("mci: imx-esdhc: Add layerscape support") two ESDHC_FLAGs got assigned to already existing values. This conflict made the imx6sl usdhc appear to be big endian.
Resolve this conflict by assign the new flags to the next vacant values.

Signed-off-by Alexander Kurz <[email protected]>
---
 drivers/mci/imx-esdhc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/mci/imx-esdhc.c +5 -4
index cedfb3db4..e34a0c95b 100644
@@ -67,10 +67,6 @@
 #define ESDHC_FLAG_STD_TUNING		BIT(5)
 /* The IP has SDHCI_CAPABILITIES_1 register */
 #define ESDHC_FLAG_HAVE_CAP1		BIT(6)
-/* Need to access registers in bigendian mode */
-#define ESDHC_FLAG_BIGENDIAN		BIT(7)
-/* Enable cache snooping */
-#define ESDHC_FLAG_CACHE_SNOOPING	BIT(8)
 
 /*
  * The IP has errata ERR004536

@@ -83,6 +79,11 @@
 /* The IP supports HS400 mode */
 #define ESDHC_FLAG_HS400		BIT(9)
 
+/* Need to access registers in bigendian mode */
+#define ESDHC_FLAG_BIGENDIAN            BIT(10)
+/* Enable cache snooping */
+#define ESDHC_FLAG_CACHE_SNOOPING       BIT(11)
+
 struct esdhc_soc_data {
 	u32 flags;
 	const char *clkidx;
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer Applied
#1 lore raw
Quoted 8 lines · Alexander Kurz

From: Alexander Kurz <[email protected]>

With commit 3354adee3920 ("mci: imx-esdhc: Add bigendian register access support") and commit 15b64fd520c2 ("mci: imx-esdhc: Add layerscape support") two ESDHC_FLAGs got assigned to already existing values. This conflict made the imx6sl usdhc appear to be big endian.
Resolve this conflict by assign the new flags to the next vacant values.

Quoted 4 lines
Signed-off-by Alexander Kurz <[email protected]>
---
 drivers/mci/imx-esdhc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Applied to master, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox