From d418fa80b4cfa790c3b01affa5ef812e8c4a0ca2 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: Wed, 14 Sep 2022 01:42:46 +0800
Subject: [PATCH] rockchip:fix r5s led not bright and add nvme driver (#10108)

* rockchip:modify the correct name of the led

* rockchip:r5s nvme driver enabled by default
---
 .../arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts      | 6 +++---
 target/linux/rockchip/image/armv8.mk                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/rockchip/files-5.15/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/target/linux/rockchip/files-5.15/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
index d26f5a826..3643d589a 100644
--- a/target/linux/rockchip/files-5.15/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+++ b/target/linux/rockchip/files-5.15/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
@@ -41,12 +41,12 @@
 
 		lan1_led: led-0 {
 			gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
-			label = "lan1_led";
+			label = "green:lan1";
 		};
 
 		lan2_led: led-1 {
 			gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;
-			label = "lan2_led";
+			label = "green:lan2";
 		};
 
 		sys_led: led-2 {
@@ -56,7 +56,7 @@
 
 		wan_led: led-3 {
 			gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-			label = "wan_led";
+			label = "green:wan";
 		};
 	};
 
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 518995898..865bef3c0 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -97,7 +97,7 @@ define Device/friendlyarm_nanopi-r5s
   SOC := rk3568
   UBOOT_DEVICE_NAME := nanopi-r5s-rk3568
   IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata
-  DEVICE_PACKAGES := kmod-r8125
+  DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r5s