Skip to contentSkip to conversation

sunxi: f1c100s: Drop no-MMC hack

PATCH In review Andre Przywara 2 participants 2 messages Jan 5, 2023 – Jan 14, 2023

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

PATCH 1/1 sunxi: f1c100s: Drop no-MMC hack

When support for the Allwinner F1C100s SoC was originally introduced, its DT lacked any MMC nodes, which upset our sunxi-u-boot.dtsi overlay, when it tried to add an alias to the SD card. To quickly fix this back then, we guarded that alias with a preprocessor macro.

Now the F1C100s family has gained MMC nodes, so we don't need the special treatment anymore. Just remove this guard.

---
 arch/arm/dts/sunxi-u-boot.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/dts/sunxi-u-boot.dtsi +0 -2
index 2028d5b6a90..e959eb2a405 100644
@@ -12,9 +12,7 @@
 
 / {
 	aliases {
-#ifndef CONFIG_MACH_SUNIV
 		mmc0 = &mmc0;
-#endif
 #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2
 		mmc1 = &mmc2;
 #endif
Signature · 1 line
2.35.5
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Andre Przywara

When support for the Allwinner F1C100s SoC was originally introduced, its DT lacked any MMC nodes, which upset our sunxi-u-boot.dtsi overlay, when it tried to add an alias to the SD card. To quickly fix this back then, we guarded that alias with a preprocessor macro.

Quoted 7 lines

Now the F1C100s family has gained MMC nodes, so we don't need the special treatment anymore. Just remove this guard.

---
 arch/arm/dts/sunxi-u-boot.dtsi | 2 --
 1 file changed, 2 deletions(-)