1. Patchew
  2. linux
  3. View series

[PATCH] ARM: dts: armada: align LED node names with dtschema

Krzysztof Kozlowski posted 1 patch 2 years, 9 months ago 
arch/arm/boot/dts/armada-370-dlink-dns327l.dts           | 6 +++---
arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts        | 4 ++--
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi       | 8 ++++----
arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi | 2 +-
arch/arm/boot/dts/armada-385-linksys-caiman.dts          | 4 ++--
arch/arm/boot/dts/armada-385-linksys-cobra.dts           | 4 ++--
arch/arm/boot/dts/armada-385-linksys-rango.dts           | 8 ++++----
arch/arm/boot/dts/armada-385-linksys-shelby.dts          | 4 ++--
arch/arm/boot/dts/armada-385-linksys.dtsi                | 4 ++--
arch/arm/boot/dts/armada-385-synology-ds116.dts          | 2 +-
arch/arm/boot/dts/armada-xp-linksys-mamba.dts            | 2 +-
11 files changed, 24 insertions(+), 24 deletions(-)
[PATCH] ARM: dts: armada: align LED node names with dtschema
Posted by Krzysztof Kozlowski 2 years, 9 months ago 
The node names should be generic and DT schema expects certain pattern:

  armada-370-seagate-personal-cloud.dtb: gpio-leds: 'red-sata0' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/boot/dts/armada-370-dlink-dns327l.dts           | 6 +++---
 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts        | 4 ++--
 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi       | 8 ++++----
 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi | 2 +-
 arch/arm/boot/dts/armada-385-linksys-caiman.dts          | 4 ++--
 arch/arm/boot/dts/armada-385-linksys-cobra.dts           | 4 ++--
 arch/arm/boot/dts/armada-385-linksys-rango.dts           | 8 ++++----
 arch/arm/boot/dts/armada-385-linksys-shelby.dts          | 4 ++--
 arch/arm/boot/dts/armada-385-linksys.dtsi                | 4 ++--
 arch/arm/boot/dts/armada-385-synology-ds116.dts          | 2 +-
 arch/arm/boot/dts/armada-xp-linksys-mamba.dts            | 2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
index 2008c6eaaa52..561195b749eb 100644
--- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
@@ -86,19 +86,19 @@ &sata_l_white_pin
 
 		pinctrl-names = "default";
 
-		sata-r-amber-pin {
+		led-sata-r-amber {
 			label = "dns327l:amber:sata-r";
 			gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
-		sata-l-amber-pin {
+		led-sata-l-amber {
 			label = "dns327l:amber:sata-l";
 			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
-		backup-led-pin {
+		led-backup {
 			label = "dns327l:white:usb";
 			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
index 3cf70c72c5ca..9cb69999b1db 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
@@ -72,11 +72,11 @@ regulator@4 {
 	};
 
 	gpio-leds {
-		red-sata2 {
+		led-red-sata2 {
 			label = "dart:red:sata2";
 			gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
 		};
-		red-sata3 {
+		led-red-sata3 {
 			label = "dart:red:sata3";
 			gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
 		};
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 866b8630d407..822f10734946 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -132,21 +132,21 @@ button-reset {
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		white-power {
+		led-white-power {
 			label = "dart:white:power";
 			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "timer";
 
 		};
-		red-power {
+		led-red-power {
 			label = "dart:red:power";
 			gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
 		};
-		red-sata0 {
+		led-red-sata0 {
 			label = "dart:red:sata0";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
-		red-sata1 {
+		led-red-sata1 {
 			label = "dart:red:sata1";
 			gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
 		};
diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index 702a85af2078..124a8ba279e3 100644
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -107,7 +107,7 @@ button-usb {
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		red-sata0 {
+		led-red-sata0 {
 			label = "cumulus:red:sata0";
 			gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index a03050c97084..88b2921fed55 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -62,11 +62,11 @@ wps_amber@9 {
 };
 
 &gpio_leds {
-	power {
+	led-power {
 		label = "caiman:white:power";
 	};
 
-	sata {
+	led-sata {
 		label = "caiman:white:sata";
 	};
 };
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index e3e4877a6f49..88200f930d0d 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -62,11 +62,11 @@ wps_amber@9 {
 };
 
 &gpio_leds {
-	power {
+	led-power {
 		label = "cobra:white:power";
 	};
 
-	sata {
+	led-sata {
 		label = "cobra:white:sata";
 	};
 };
diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-rango.dts
index 3c4af57ec2b9..4ab45f294de2 100644
--- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -54,22 +54,22 @@ wps_amber@9 {
 };
 
 &gpio_leds {
-	power {
+	led-power {
 		gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
 		label = "rango:white:power";
 	};
 
-	sata {
+	led-sata {
 		gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
 		label = "rango:white:sata";
 	};
 
-	wlan_2g {
+	led-wlan_2g {
 		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
 		label = "rango:white:wlan_2g";
 	};
 
-	wlan_5g {
+	led-wlan_5g {
 		gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		label = "rango:white:wlan_5g";
 	};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index 3451cd3e5dff..f1b1f22413f1 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -62,11 +62,11 @@ wps_amber@9 {
 };
 
 &gpio_leds {
-	power {
+	led-power {
 		label = "shelby:white:power";
 	};
 
-	sata {
+	led-sata {
 		label = "shelby:white:sata";
 	};
 };
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 116aca5e688f..85e8d966f6c1 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -71,12 +71,12 @@ gpio_leds: gpio-leds {
 		pinctrl-0 = <&gpio_leds_pins>;
 		pinctrl-names = "default";
 
-		power {
+		led-power {
 			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
-		sata {
+		led-sata {
 			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 			linux,default-trigger = "disk-activity";
diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts
index 2622af73c9da..ea91ff964d94 100644
--- a/arch/arm/boot/dts/armada-385-synology-ds116.dts
+++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts
@@ -149,7 +149,7 @@ gpio-leds {
 			 * sata0, and accesses to SATA disk 0 make it blink so it
 			 * doesn't need to be declared here.
 			 */
-			orange {
+			led-orange {
 				gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 				label = "ds116:orange:disk";
 				default-state = "off";
diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 622ac40dd164..dbe8dfe236fb 100644
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -195,7 +195,7 @@ gpio-leds {
 		pinctrl-0 = <&power_led_pin>;
 		pinctrl-names = "default";
 
-		power {
+		led-power {
 			label = "mamba:white:power";
 			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
-- 
2.34.1
Re: [PATCH] ARM: dts: armada: align LED node names with dtschema
Posted by Gregory CLEMENT 2 years, 9 months ago 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> writes:

> The node names should be generic and DT schema expects certain pattern:
>
>   armada-370-seagate-personal-cloud.dtb: gpio-leds: 'red-sata0' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Applied on mvebu/dt

Thanks,

Gregory
> ---
>  arch/arm/boot/dts/armada-370-dlink-dns327l.dts           | 6 +++---
>  arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts        | 4 ++--
>  arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi       | 8 ++++----
>  arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi | 2 +-
>  arch/arm/boot/dts/armada-385-linksys-caiman.dts          | 4 ++--
>  arch/arm/boot/dts/armada-385-linksys-cobra.dts           | 4 ++--
>  arch/arm/boot/dts/armada-385-linksys-rango.dts           | 8 ++++----
>  arch/arm/boot/dts/armada-385-linksys-shelby.dts          | 4 ++--
>  arch/arm/boot/dts/armada-385-linksys.dtsi                | 4 ++--
>  arch/arm/boot/dts/armada-385-synology-ds116.dts          | 2 +-
>  arch/arm/boot/dts/armada-xp-linksys-mamba.dts            | 2 +-
>  11 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
> index 2008c6eaaa52..561195b749eb 100644
> --- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
> +++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
> @@ -86,19 +86,19 @@ &sata_l_white_pin
>  
>  		pinctrl-names = "default";
>  
> -		sata-r-amber-pin {
> +		led-sata-r-amber {
>  			label = "dns327l:amber:sata-r";
>  			gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
>  			default-state = "keep";
>  		};
>  
> -		sata-l-amber-pin {
> +		led-sata-l-amber {
>  			label = "dns327l:amber:sata-l";
>  			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
>  			default-state = "keep";
>  		};
>  
> -		backup-led-pin {
> +		led-backup {
>  			label = "dns327l:white:usb";
>  			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
>  			default-state = "keep";
> diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
> index 3cf70c72c5ca..9cb69999b1db 100644
> --- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
> +++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
> @@ -72,11 +72,11 @@ regulator@4 {
>  	};
>  
>  	gpio-leds {
> -		red-sata2 {
> +		led-red-sata2 {
>  			label = "dart:red:sata2";
>  			gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
>  		};
> -		red-sata3 {
> +		led-red-sata3 {
>  			label = "dart:red:sata3";
>  			gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
>  		};
> diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
> index 866b8630d407..822f10734946 100644
> --- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
> +++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
> @@ -132,21 +132,21 @@ button-reset {
>  	gpio-leds {
>  		compatible = "gpio-leds";
>  
> -		white-power {
> +		led-white-power {
>  			label = "dart:white:power";
>  			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "timer";
>  
>  		};
> -		red-power {
> +		led-red-power {
>  			label = "dart:red:power";
>  			gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
>  		};
> -		red-sata0 {
> +		led-red-sata0 {
>  			label = "dart:red:sata0";
>  			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
>  		};
> -		red-sata1 {
> +		led-red-sata1 {
>  			label = "dart:red:sata1";
>  			gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
>  		};
> diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
> index 702a85af2078..124a8ba279e3 100644
> --- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
> +++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
> @@ -107,7 +107,7 @@ button-usb {
>  	gpio-leds {
>  		compatible = "gpio-leds";
>  
> -		red-sata0 {
> +		led-red-sata0 {
>  			label = "cumulus:red:sata0";
>  			gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
>  			default-state = "off";
> diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
> index a03050c97084..88b2921fed55 100644
> --- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
> +++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
> @@ -62,11 +62,11 @@ wps_amber@9 {
>  };
>  
>  &gpio_leds {
> -	power {
> +	led-power {
>  		label = "caiman:white:power";
>  	};
>  
> -	sata {
> +	led-sata {
>  		label = "caiman:white:sata";
>  	};
>  };
> diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
> index e3e4877a6f49..88200f930d0d 100644
> --- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
> +++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
> @@ -62,11 +62,11 @@ wps_amber@9 {
>  };
>  
>  &gpio_leds {
> -	power {
> +	led-power {
>  		label = "cobra:white:power";
>  	};
>  
> -	sata {
> +	led-sata {
>  		label = "cobra:white:sata";
>  	};
>  };
> diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-rango.dts
> index 3c4af57ec2b9..4ab45f294de2 100644
> --- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
> +++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
> @@ -54,22 +54,22 @@ wps_amber@9 {
>  };
>  
>  &gpio_leds {
> -	power {
> +	led-power {
>  		gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
>  		label = "rango:white:power";
>  	};
>  
> -	sata {
> +	led-sata {
>  		gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
>  		label = "rango:white:sata";
>  	};
>  
> -	wlan_2g {
> +	led-wlan_2g {
>  		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
>  		label = "rango:white:wlan_2g";
>  	};
>  
> -	wlan_5g {
> +	led-wlan_5g {
>  		gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
>  		label = "rango:white:wlan_5g";
>  	};
> diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
> index 3451cd3e5dff..f1b1f22413f1 100644
> --- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
> +++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
> @@ -62,11 +62,11 @@ wps_amber@9 {
>  };
>  
>  &gpio_leds {
> -	power {
> +	led-power {
>  		label = "shelby:white:power";
>  	};
>  
> -	sata {
> +	led-sata {
>  		label = "shelby:white:sata";
>  	};
>  };
> diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
> index 116aca5e688f..85e8d966f6c1 100644
> --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
> +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
> @@ -71,12 +71,12 @@ gpio_leds: gpio-leds {
>  		pinctrl-0 = <&gpio_leds_pins>;
>  		pinctrl-names = "default";
>  
> -		power {
> +		led-power {
>  			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
>  			default-state = "on";
>  		};
>  
> -		sata {
> +		led-sata {
>  			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
>  			default-state = "off";
>  			linux,default-trigger = "disk-activity";
> diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts
> index 2622af73c9da..ea91ff964d94 100644
> --- a/arch/arm/boot/dts/armada-385-synology-ds116.dts
> +++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts
> @@ -149,7 +149,7 @@ gpio-leds {
>  			 * sata0, and accesses to SATA disk 0 make it blink so it
>  			 * doesn't need to be declared here.
>  			 */
> -			orange {
> +			led-orange {
>  				gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
>  				label = "ds116:orange:disk";
>  				default-state = "off";
> diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
> index 622ac40dd164..dbe8dfe236fb 100644
> --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
> +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
> @@ -195,7 +195,7 @@ gpio-leds {
>  		pinctrl-0 = <&power_led_pin>;
>  		pinctrl-names = "default";
>  
> -		power {
> +		led-power {
>  			label = "mamba:white:power";
>  			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
>  			default-state = "on";
> -- 
> 2.34.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.