| Message ID | 20240619232734.1126-1-naoki@radxa.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W | expand |
Hi, Am Donnerstag, 20. Juni 2024, 01:27:34 CEST schrieb FUKAUMI Naoki: > align with other Radxa products. > > - mmc0 is eMMC > - mmc1 is microSD > so yes we can still change the mmc aliases as the zero will only become part of 6.11 But mmc aliases should start at 0 and not contain holes. So if you care much about the ordering, move the alias block out of the zero-3.dtsi and introduce separate blocks for each board. In zero-3w: aliases { mmc0 = &sdmmc0; }; In zero-3w: aliases { mmc0 = &sdhci; mmc1 = &sdmmc0; mmc2 = &sdmmc1; }; Alternatively, leave the aliases as they are now Heiko > Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E") > Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> > --- > arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +- > arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi > index 623d5939d194..85d76d535338 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi > @@ -7,7 +7,7 @@ > > / { > aliases { > - mmc0 = &sdmmc0; > + mmc1 = &sdmmc0; > }; > > chosen { > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts > index 9bf4f464915f..188147c4b78b 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts > @@ -9,7 +9,7 @@ / { > compatible = "radxa,zero-3w", "rockchip,rk3566"; > > aliases { > - mmc1 = &sdhci; > + mmc0 = &sdhci; > mmc2 = &sdmmc1; > }; > >
Hi, On 6/21/24 05:35, Heiko Stübner wrote: > Hi, > > Am Donnerstag, 20. Juni 2024, 01:27:34 CEST schrieb FUKAUMI Naoki: >> align with other Radxa products. >> >> - mmc0 is eMMC >> - mmc1 is microSD >> > > so yes we can still change the mmc aliases as the zero will only become part of 6.11 > But mmc aliases should start at 0 and not contain holes. > > So if you care much about the ordering, move the alias block out of the zero-3.dtsi > and introduce separate blocks for each board. > > > In zero-3w: > aliases { > mmc0 = &sdmmc0; > }; > > In zero-3w: > aliases { > mmc0 = &sdhci; > mmc1 = &sdmmc0; > mmc2 = &sdmmc1; > }; okay, I'll send v2. thank you for your comment. Best regards, -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. > Alternatively, leave the aliases as they are now > Heiko > >> Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E") >> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> >> --- >> arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +- >> arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi >> index 623d5939d194..85d76d535338 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi >> @@ -7,7 +7,7 @@ >> >> / { >> aliases { >> - mmc0 = &sdmmc0; >> + mmc1 = &sdmmc0; >> }; >> >> chosen { >> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts >> index 9bf4f464915f..188147c4b78b 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts >> +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts >> @@ -9,7 +9,7 @@ / { >> compatible = "radxa,zero-3w", "rockchip,rk3566"; >> >> aliases { >> - mmc1 = &sdhci; >> + mmc0 = &sdhci; >> mmc2 = &sdmmc1; >> }; >> >> > > > > >
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi index 623d5939d194..85d76d535338 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi @@ -7,7 +7,7 @@ / { aliases { - mmc0 = &sdmmc0; + mmc1 = &sdmmc0; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts index 9bf4f464915f..188147c4b78b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts @@ -9,7 +9,7 @@ / { compatible = "radxa,zero-3w", "rockchip,rk3566"; aliases { - mmc1 = &sdhci; + mmc0 = &sdhci; mmc2 = &sdmmc1; };
align with other Radxa products. - mmc0 is eMMC - mmc1 is microSD Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E") Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> --- arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)