summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@blala.de>2019-03-15 22:31:39 +0000
committerSascha Hauer <s.hauer@pengutronix.de>2019-03-18 09:50:20 +0100
commitf593354773b9a113840643a658d850c9cd4d1dc9 (patch)
treed8a5d10693bae0b2c323f32d2883c4bc04835d53 /drivers
parent5f16ab6836282b496b4b09460c24aa0594aaf121 (diff)
downloadbarebox-f593354773b9a113840643a658d850c9cd4d1dc9.tar.gz
mci: imx-esdhc: resolve conflicting flags
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 <akurz@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mci/imx-esdhc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index cedfb3d..2fa0974 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -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;