* [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
@ 2024-06-19 23:27 FUKAUMI Naoki
2024-06-20 20:35 ` Heiko Stübner
0 siblings, 1 reply; 4+ messages in thread
From: FUKAUMI Naoki @ 2024-06-19 23:27 UTC (permalink / raw)
To: heiko; +Cc: jonas, devicetree, linux-rockchip, FUKAUMI Naoki
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(-)
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;
};
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
2024-06-19 23:27 [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W FUKAUMI Naoki
@ 2024-06-20 20:35 ` Heiko Stübner
2024-06-20 20:58 ` FUKAUMI Naoki
0 siblings, 1 reply; 4+ messages in thread
From: Heiko Stübner @ 2024-06-20 20:35 UTC (permalink / raw)
To: FUKAUMI Naoki; +Cc: jonas, devicetree, linux-rockchip, FUKAUMI Naoki
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;
> };
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
2024-06-20 20:35 ` Heiko Stübner
@ 2024-06-20 20:58 ` FUKAUMI Naoki
0 siblings, 0 replies; 4+ messages in thread
From: FUKAUMI Naoki @ 2024-06-20 20:58 UTC (permalink / raw)
To: Heiko Stübner; +Cc: jonas, devicetree, linux-rockchip
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;
>> };
>>
>>
>
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
@ 2024-06-20 21:14 FUKAUMI Naoki
0 siblings, 0 replies; 4+ messages in thread
From: FUKAUMI Naoki @ 2024-06-20 21:14 UTC (permalink / raw)
To: heiko; +Cc: jonas, devicetree, linux-rockchip, FUKAUMI Naoki
align with other Radxa products.
- mmc0 is eMMC
- mmc1 is microSD
for ZERO 3E, there is no eMMC, but aliases should start at 0, so mmc0
is microSD as exception.
Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E")
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Changes in v2:
- microSD is mmc0 instead of mmc1 for ZERO 3E
---
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 4 ----
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 3 ++-
3 files changed, 3 insertions(+), 5 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..081be841b286 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi
@@ -6,10 +6,6 @@
#include "rk3566.dtsi"
/ {
- aliases {
- mmc0 = &sdmmc0;
- };
-
chosen {
stdout-path = "serial2:1500000n8";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts
index e166d66990b9..95af8210a08f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts
@@ -10,6 +10,7 @@ / {
aliases {
ethernet0 = &gmac1;
+ mmc0 = $sdmmc0;
};
};
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..f92475c59deb 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,8 @@ / {
compatible = "radxa,zero-3w", "rockchip,rk3566";
aliases {
- mmc1 = &sdhci;
+ mmc0 = &sdhci;
+ mmc1 = &sdmmc0;
mmc2 = &sdmmc1;
};
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-20 21:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-19 23:27 [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W FUKAUMI Naoki
2024-06-20 20:35 ` Heiko Stübner
2024-06-20 20:58 ` FUKAUMI Naoki
-- strict thread matches above, loose matches on Subject: below --
2024-06-20 21:14 FUKAUMI Naoki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).