c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
From 060c1950037e4c54ca4d8186a8f46269e35db901 Mon Sep 17 00:00:00 2001
|
|
From: FUKAUMI Naoki <naoki@radxa.com>
|
|
Date: Fri, 21 Jun 2024 07:44:35 +0900
|
|
Subject: [PATCH] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
|
|
|
|
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 v3:
|
|
- fix syntax error in rk3566-radxa-zero-3e.dts
|
|
Changes in v2:
|
|
- microSD is mmc0 instead of mmc1 for ZERO 3E
|
|
|
|
Link: https://lore.kernel.org/r/20240620224435.2752-1-naoki@radxa.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
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(-)
|
|
|
|
--- 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";
|
|
};
|
|
--- 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;
|
|
};
|
|
};
|
|
|
|
--- 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;
|
|
};
|
|
|