| Message ID | 20210722063015.421923-3-icenowy@sipeed.com |
|---|---|
| State | Accepted |
| Commit | 03510bf62149d8cbdc39564dcd4a3195f6d8d79e |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | Add support for Allwinner R329 | expand |
On Thu, 22 Jul 2021 14:30:04 +0800 Icenowy Zheng <icenowy@sipeed.com> wrote: > Some Allwinner SoCs (e.g. R329) doesn't have a MMC2 controller at all, > and on boards that we do not utilize MMC2, the alias for it is just > useless. > > Only include the alias when we specify CONFIG_MMC_SUNXI_EXTRA_SLOT to 2. > > Signed-off-by: Icenowy Zheng <icenowy@sipeed.com> Meh, not a friend of #ifdefs everywhere, but ideally we get rid of this one day anyway, and it's in U-Boot DT "overlay" only, so: Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > arch/arm/dts/sunxi-u-boot.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi > index 4a6ed3a7dd..b7244c1112 100644 > --- a/arch/arm/dts/sunxi-u-boot.dtsi > +++ b/arch/arm/dts/sunxi-u-boot.dtsi > @@ -13,7 +13,9 @@ > / { > aliases { > mmc0 = &mmc0; > +#if CONFIG_MMC_SUNXI_EXTRA_SLOT == 2 > mmc1 = &mmc2; > +#endif > }; > > binman: binman {
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 4a6ed3a7dd..b7244c1112 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -13,7 +13,9 @@ / { aliases { mmc0 = &mmc0; +#if CONFIG_MMC_SUNXI_EXTRA_SLOT == 2 mmc1 = &mmc2; +#endif }; binman: binman {
Some Allwinner SoCs (e.g. R329) doesn't have a MMC2 controller at all, and on boards that we do not utilize MMC2, the alias for it is just useless. Only include the alias when we specify CONFIG_MMC_SUNXI_EXTRA_SLOT to 2. Signed-off-by: Icenowy Zheng <icenowy@sipeed.com> --- arch/arm/dts/sunxi-u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+)