86e3c31bcc
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/23139 Signed-off-by: Nick Hainke <vincent@systemli.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From b7cd1115456d312f8c5e60c80fdc35fd35ea6eab Mon Sep 17 00:00:00 2001
|
|
From: Tianling Shen <cnsztl@gmail.com>
|
|
Date: Wed, 23 Oct 2024 03:35:30 +0800
|
|
Subject: [PATCH] arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S
|
|
|
|
Typically any non-removable storage (emmc) is listed before removable
|
|
storage (sd-card) options. Also U-Boot will try to override and use
|
|
mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards.
|
|
|
|
Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
|
|
Suggested-by: Jonas Karlman <jonas@kwiboo.se>
|
|
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
|
|
Link: https://lore.kernel.org/r/20241022193537.1117919-6-cnsztl@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
|
|
@@ -22,8 +22,8 @@
|
|
|
|
aliases {
|
|
ethernet0 = &gmac1;
|
|
- mmc0 = &sdmmc0;
|
|
- mmc1 = &sdhci;
|
|
+ mmc0 = &sdhci;
|
|
+ mmc1 = &sdmmc0;
|
|
};
|
|
|
|
chosen: chosen {
|