| Message ID | 20230105020908.19534-1-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 3baa0fbe6b196f93e0528b94be8d5ccee5cfc9ff |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | sunxi: f1c100s: Drop no-MMC hack | expand |
On 1/4/23 20:09, Andre Przywara wrote: > 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. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arch/arm/dts/sunxi-u-boot.dtsi | 2 -- > 1 file changed, 2 deletions(-) Reviewed-by: Samuel Holland <samuel@sholland.org>
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 2028d5b6a90..e959eb2a405 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -12,9 +12,7 @@ / { aliases { -#ifndef CONFIG_MACH_SUNIV mmc0 = &mmc0; -#endif #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif
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. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/dts/sunxi-u-boot.dtsi | 2 -- 1 file changed, 2 deletions(-)