sunxi: rebase sun50i-h5-nanopi-r1s-h5.dts onto 5.15
authorPetr Štetiar <ynezz@true.cz>
Mon, 28 Mar 2022 12:19:46 +0000 (14:19 +0200)
committerPetr Štetiar <ynezz@true.cz>
Tue, 29 Mar 2022 10:02:50 +0000 (12:02 +0200)
So the patch can be applied on top of 5.15 kernel.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
target/linux/sunxi/patches-5.15/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch

index 4a429c746e6e7cb764bf32391ee239fc47881d8a..8670d06109b285c137229f7b4edc8589dd431c0d 100644 (file)
@@ -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";