From b030e9103a2d1ef2fb746778fcfd0597167dec92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=B7=E9=AB=85=E5=A4=B4?=
 <74764072+DHDAXCW@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:05:50 +0800
Subject: [PATCH] uboot-rockchip:fix r4se uboot sd card not bootable (#10117)

* uboot-rockchip:fix r4se uboot sd card not bootable

this will cause uboot to fail to load the sd card at startup, and uboot can recognize emmc

* rockchip:fix r4se system loading prompt led

* add the previous one

* fix
---
 ...hip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch | 5 ++++-
 .../arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts  | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
index 696ca4218..ca6f80958 100644
--- a/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
+++ b/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
@@ -10,7 +10,7 @@
  	rk3399-puma-haikou.dtb \
 --- /dev/null
 +++ b/arch/arm/dts/rk3399-nanopi-r4se.dts
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,32 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * FriendlyElec NanoPC-T4 board device tree source
@@ -40,6 +40,9 @@
 +	non-removable;
 +	status = "okay";
 +};
++&sdmmc {
++ pinctrl-0 = <&sdmmc_cd>;
++};
 --- /dev/null
 +++ b/configs/nanopi-r4se-rk3399_defconfig
 @@ -0,0 +1,65 @@
diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts
index e80f2d1da..10ce0604d 100644
--- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts
+++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4se.dts
@@ -19,6 +19,13 @@
 	model = "FriendlyElec NanoPi R4SE";
 	compatible = "friendlyarm,nanopi-r4se", "rockchip,rk3399";
 
+	aliases {
+		led-boot = &sys_led;
+		led-failsafe = &sys_led;
+		led-running = &sys_led;
+		led-upgrade = &sys_led;
+	};
+	
 	/delete-node/ display-subsystem;
 
 	gpio-leds {
@@ -33,7 +40,7 @@
 
 		sys_led: led-sys {
 			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
-			label = "red:power";
+			label = "red:sys";
 			default-state = "on";
 		};