[PATCH v2025.09.y 16/58] mmc: resolve conflict between MMC_CAP_NONREMOVABLE and MMC_CAP_1_8V_DDR
Ahmad Fatoum
a.fatoum at pengutronix.de
Fri Mar 13 06:25:00 PDT 2026
From: zhengxiaojun <zheng.xiaojun at foxmail.com>
Resolve conflict between MMC_CAP_NONREMOVABLE and MMC_CAP_1_8V_DDR.
(cherry picked from commit cf4a68050d630d63723280c50b207217577b6ef0)
Fixes: a382be0b4f ("mci: add option to detect non-removable cards during startup")
Signed-off-by: zhengxiaojun <zheng.xiaojun at foxmail.com>
Link: https://lore.barebox.org/tencent_C5E0959753A838615BF48C3792E12BC74A08@qq.com
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
include/mci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/mci.h b/include/mci.h
index 3db33f914236..50214aaae7bb 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -58,7 +58,7 @@
#define MMC_CAP_1_2V_DDR (1 << 9) /* Host supports eMMC DDR 1.2V */
#define MMC_CAP_DDR (MMC_CAP_3_3V_DDR | MMC_CAP_1_8V_DDR | \
MMC_CAP_1_2V_DDR)
-#define MMC_CAP_NONREMOVABLE (1 << 8) /* Nonremovable e.g. eMMC */
+#define MMC_CAP_NONREMOVABLE (1 << 10) /* Nonremovable e.g. eMMC */
#define MMC_CAP_UHS_SDR12 (1 << 16) /* Host supports UHS SDR12 mode */
#define MMC_CAP_UHS_SDR25 (1 << 17) /* Host supports UHS SDR25 mode */
#define MMC_CAP_UHS_SDR50 (1 << 18) /* Host supports UHS SDR50 mode */
--
2.47.3
More information about the barebox
mailing list