Skip to contentSkip to conversation

arm64: dts: allwinner: beelink-gs1: Update LED power node

PATCH In review Clément Péron 2 participants 4 messages Oct 11, 2020 – Oct 19, 2020

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

PATCH v2 1/1 arm64: dts: allwinner: beelink-gs1: Update LED power node

Beelink GS1 LED trigger a warning when running dtbs_check.

Update the node with a valid pattern property.

Also add the function and the color of the LED and drop the label which is deprecated.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +4 -2
index 3f7ceeb1a767..a364cb4e5b3f 100644
@@ -7,6 +7,7 @@
 #include "sun50i-h6-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	model = "Beelink GS1";
@@ -43,8 +44,9 @@ ext_osc32k: ext_osc32k_clk {
 	leds {
 		compatible = "gpio-leds";
 
-		power {
-			label = "beelink:white:power";
+		led-0 {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_WHITE>;
 			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
 			default-state = "on";
 		};
Signature · 1 line
2.25.1
#1 lore raw

Hi!

Quoted 26 lines · Clément Péron

Beelink GS1 LED trigger a warning when running dtbs_check.

Update the node with a valid pattern property.

Also add the function and the color of the LED and drop the label which is deprecated.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +1 -0
index 3f7ceeb1a767..a364cb4e5b3f 100644
@@ -7,6 +7,7 @@
 #include "sun50i-h6-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	model = "Beelink GS1";
@@ -43,8 +44,9 @@ ext_osc32k: ext_osc32k_clk {
 	leds {

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts ext_osc32k: ext_osc32k_clk { · line 52

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +3 -2
 		compatible = "gpio-leds";
 
-		power {
-			label = "beelink:white:power";
+		led-0 {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_WHITE>;
 			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
 			default-state = "on";
 		};

Doesn't that also change the sysfs file that LED is exposed to the userspace with?

Maxime

#2 lore raw

HI Maxime,

Quoted 32 lines · Maxime Ripard

Hi!

Quoted 28 lines · Clément Péron

Beelink GS1 LED trigger a warning when running dtbs_check.

Update the node with a valid pattern property.

Also add the function and the color of the LED and drop the label which is deprecated.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +1 -0
index 3f7ceeb1a767..a364cb4e5b3f 100644
@@ -7,6 +7,7 @@
 #include "sun50i-h6-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
      model = "Beelink GS1";
@@ -43,8 +44,9 @@ ext_osc32k: ext_osc32k_clk {
      leds {
              compatible = "gpio-leds";
 
Quoted 10 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts ext_osc32k: ext_osc32k_clk { · line 52

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +3 -2
-             power {
-                     label = "beelink:white:power";
+             led-0 {
+                     function = LED_FUNCTION_POWER;
+                     color = <LED_COLOR_ID_WHITE>;
                      gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                      default-state = "on";
              };

Doesn't that also change the sysfs file that LED is exposed to the userspace with?

Indeed the previous led sysfs:
/sys/class/leds/beelink:white:power/
is now
/sys/class/leds/white:power/

Do you want me to keep the label property to avoid this sysfs change ?

Regards,
Clement

Quoted 2 lines

Maxime

#3 lore raw
Quoted 46 lines · Clément Péron

HI Maxime,

Quoted 32 lines · Maxime Ripard

Hi!

Quoted 28 lines · Clément Péron

Beelink GS1 LED trigger a warning when running dtbs_check.

Update the node with a valid pattern property.

Also add the function and the color of the LED and drop the label which is deprecated.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +1 -0
index 3f7ceeb1a767..a364cb4e5b3f 100644
@@ -7,6 +7,7 @@
 #include "sun50i-h6-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
      model = "Beelink GS1";
@@ -43,8 +44,9 @@ ext_osc32k: ext_osc32k_clk {
      leds {
              compatible = "gpio-leds";
 
Quoted 10 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts ext_osc32k: ext_osc32k_clk { · line 52

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +3 -2
-             power {
-                     label = "beelink:white:power";
+             led-0 {
+                     function = LED_FUNCTION_POWER;
+                     color = <LED_COLOR_ID_WHITE>;
                      gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                      default-state = "on";
              };

Doesn't that also change the sysfs file that LED is exposed to the userspace with?

Quoted 6 lines

Indeed the previous led sysfs:
/sys/class/leds/beelink:white:power/
is now
/sys/class/leds/white:power/

Do you want me to keep the label property to avoid this sysfs change ?

I don't know, the documentation seems to indicate that we should use one or the other, but I'm not sure if both makes sense or not. I guess we should ask Pavel or Rob?

Maxime