From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 28 Mar 2022 12:19:46 +0000 (+0200)
Subject: sunxi: rebase sun50i-h5-nanopi-r1s-h5.dts onto 5.15
X-Git-Tag: v23.05.0-rc1~3767
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c80088b40772fef15b5b1b173b1a3df0d49d2b77;p=openwrt%2Fstaging%2Fhauke.git

sunxi: rebase sun50i-h5-nanopi-r1s-h5.dts onto 5.15

So the patch can be applied on top of 5.15 kernel.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/sunxi/patches-5.15/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch b/target/linux/sunxi/patches-5.15/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
index 4a429c746e..8670d06109 100644
--- a/target/linux/sunxi/patches-5.15/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
+++ b/target/linux/sunxi/patches-5.15/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
@@ -12,7 +12,7 @@ Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
 
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
-@@ -22,6 +22,11 @@
+@@ -23,6 +23,11 @@
  		ethernet0 = &emac;
  		ethernet1 = &rtl8189etv;
  		serial0 = &uart0;
@@ -24,12 +24,12 @@ Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
  	};
  
  	chosen {
-@@ -31,7 +36,7 @@
- 	leds {
- 		compatible = "gpio-leds";
+@@ -38,7 +43,7 @@
+ 			gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>;
+ 		};
  
--		sys {
-+		led_sys: sys {
- 			label = "nanopi:red:sys";
+-		led-1 {
++		led_sys: led-1 {
+ 			function = LED_FUNCTION_STATUS;
+ 			color = <LED_COLOR_ID_RED>;
  			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
- 			linux,default-trigger = "heartbeat";