Skip to contentSkip to conversation

arm64: dts: rockchip: r4s: system status LEDs changed to flashing light

PATCH New Xiaobo Tian 1 participant 2 messages Jul 5, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: dts: rockchip: r4s: system status LEDs changed to flashing light

There are 4 LEDs on the motherboard, except for the power lamp, which are LED-0 STATUS, LED-1 LAN, LED-2 WAN.
The LED-0 is repeatedly defined and therefore removed and inherited the heartbeat status LED-0 using dtsi.

---
 .../boot/dts/rockchip/rk3399-nanopi-r4s.dts   | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +15 -30
index fa5809887643..a0f928990fdd 100644
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * FriendlyElec NanoPC-T4 board device tree source
- *
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
  * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
  * (http://www.friendlyarm.com)
  *
+ * Copyright (c) 2016 Arm Ltd.
  * Copyright (c) 2018 Collabora Ltd.
  *
  * Copyright (c) 2020 Jensen Huang <[email protected]>
  * Copyright (c) 2020 Marty Jones <[email protected]>
+ * Copyright (C) 2020 Xiaobo Tian <[email protected]>
  * Copyright (c) 2021 Tianling Shen <[email protected]>
  */
 
@@ -21,28 +22,6 @@ / {
 
 	/delete-node/ display-subsystem;
 
-	gpio-leds {
-		pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
-
-		/delete-node/ led-0;
-
-		lan_led: led-lan {
-			gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
-			label = "green:lan";
-		};
-
-		sys_led: led-sys {
-			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
-			label = "red:sys";
-			default-state = "on";
-		};
-
-		wan_led: led-wan {
-			gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
-			label = "green:wan";
-		};
-	};
-
 	gpio-keys {
 		pinctrl-0 = <&reset_button_pin>;
 
@@ -72,6 +51,18 @@ &i2c4 {
 	status = "disabled";
 };
 
+&leds {
+	lan_led: led-1 {
+		gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+		label = "green:lan";
+	};
+
+	wan_led: led-2 {
+		gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+		label = "green:wan";
+	};
+};
+
 &pcie0 {
 	max-link-speed = <1>;
 	num-lanes = <1>;
@@ -80,16 +71,10 @@ &pcie0 {
 
 &pinctrl {
 	gpio-leds {
-		/delete-node/ status-led-pin;
-
 		lan_led_pin: lan-led-pin {
 			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
-		sys_led_pin: sys-led-pin {
-			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
 		wan_led_pin: wan-led-pin {
 			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
Signature · 7 lines
2.32.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 2/2 arm64: dts: rockchip: r4s: remove the vcc3v3 use vcc5v0 wrong supply voltage

Vcc3v3 wrongly used Vcc5v0 for power supply. After testing and removing this misconfiguration, the temperature of the motherboard has decreased, and it works normally without any other problems

---
 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 4 ----
 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +0 -4
index a0f928990fdd..899c6a0fc6a1 100644
@@ -112,7 +112,3 @@ &uart0 {
 &usbdrd_dwc3_0 {
 	dr_mode = "host";
 };
-
-&vcc3v3_sys {
-	vin-supply = <&vcc5v0_sys>;
-};
Signature · 7 lines
2.32.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip