diff mbox series

[5/5] ARM: dts: microchip: Rename LED sub nodes name

Message ID 20240814122633.198562-6-andrei.simion@microchip.com (mailing list archive)
State New, archived
Headers show
Series Cosmetic Work for ARM/Microchip (AT91) | expand

Commit Message

Andrei Simion Aug. 14, 2024, 12:26 p.m. UTC
dtbs_check warnings:
leds: 'd[0-9]', 'ds[0-9]' do not match any of the regexes:
'(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
leds: 'red', 'green', 'blue' do not match any of regexes:
'(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Rename the led sub nodes according to devicetree
specification and leds-gpio.yaml.

Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
---
Split the bloadted patch into small patches on topics
based on comments:
https://lore.kernel.org/linux-arm-kernel/89f51615-0dee-4ab0-ab72-e3c057fee1e7@tuxon.dev/
---
 arch/arm/boot/dts/microchip/aks-cdu.dts        | 8 ++++----
 arch/arm/boot/dts/microchip/animeo_ip.dts      | 8 ++++----
 arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 +++---
 arch/arm/boot/dts/microchip/at91rm9200ek.dts   | 6 +++---
 arch/arm/boot/dts/microchip/at91sam9260ek.dts  | 4 ++--
 arch/arm/boot/dts/microchip/at91sam9261ek.dts  | 6 +++---
 arch/arm/boot/dts/microchip/at91sam9263ek.dts  | 4 ++--
 arch/arm/boot/dts/microchip/at91sam9g20ek.dts  | 4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

Comments

Krzysztof Kozlowski Aug. 14, 2024, 1:23 p.m. UTC | #1
On 14/08/2024 14:26, Andrei Simion wrote:
> dtbs_check warnings:
> leds: 'd[0-9]', 'ds[0-9]' do not match any of the regexes:
> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> leds: 'red', 'green', 'blue' do not match any of regexes:
> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> 
> Rename the led sub nodes according to devicetree
> specification and leds-gpio.yaml.
> 
> Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
> ---
> Split the bloadted patch into small patches on topics
> based on comments:
> https://lore.kernel.org/linux-arm-kernel/89f51615-0dee-4ab0-ab72-e3c057fee1e7@tuxon.dev/
> ---

Changelog / v2 is missing.

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
Alexander Dahl Aug. 15, 2024, 7:57 a.m. UTC | #2
Hello Andrei,

Am Wed, Aug 14, 2024 at 03:26:33PM +0300 schrieb Andrei Simion:
> dtbs_check warnings:
> leds: 'd[0-9]', 'ds[0-9]' do not match any of the regexes:
> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> leds: 'red', 'green', 'blue' do not match any of regexes:
> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> 
> Rename the led sub nodes according to devicetree
> specification and leds-gpio.yaml.
> 
> Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
> ---
> Split the bloadted patch into small patches on topics
> based on comments:
> https://lore.kernel.org/linux-arm-kernel/89f51615-0dee-4ab0-ab72-e3c057fee1e7@tuxon.dev/
> ---
>  arch/arm/boot/dts/microchip/aks-cdu.dts        | 8 ++++----
>  arch/arm/boot/dts/microchip/animeo_ip.dts      | 8 ++++----
>  arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 +++---
>  arch/arm/boot/dts/microchip/at91rm9200ek.dts   | 6 +++---
>  arch/arm/boot/dts/microchip/at91sam9260ek.dts  | 4 ++--
>  arch/arm/boot/dts/microchip/at91sam9261ek.dts  | 6 +++---
>  arch/arm/boot/dts/microchip/at91sam9263ek.dts  | 4 ++--
>  arch/arm/boot/dts/microchip/at91sam9g20ek.dts  | 4 ++--
>  8 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/microchip/aks-cdu.dts b/arch/arm/boot/dts/microchip/aks-cdu.dts
> index 52e166c8a365..95a0639c5579 100644
> --- a/arch/arm/boot/dts/microchip/aks-cdu.dts
> +++ b/arch/arm/boot/dts/microchip/aks-cdu.dts
> @@ -98,23 +98,23 @@ rootfs@500000 {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		red {
> +		led-red {
>  			gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "none";
>  		};
>  
> -		green {
> +		led-green {
>  			gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "none";
>  			default-state = "on";
>  		};
>  
> -		yellow {
> +		led-yellow {
>  			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "none";
>  		};
>  
> -		blue {
> +		led-blue {
>  			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "none";
>  		};

As reported with <20240730-rambling-helping-2f03f5ddee6a@thorsis.com>
already, this will probably change sysfs paths and thus might break
userspace depending on those paths.  Did you consider adding a label
to avoid this?

(Added linux-leds to Cc.)

Greets
Alex

> diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts
> index 911c8d9ee013..52ac840bcd35 100644
> --- a/arch/arm/boot/dts/microchip/animeo_ip.dts
> +++ b/arch/arm/boot/dts/microchip/animeo_ip.dts
> @@ -146,23 +146,23 @@ ohci: usb@500000 {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		power_green {
> +		led-power-green {
>  			label = "power_green";
>  			gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "heartbeat";
>  		};
>  
> -		power_red {
> +		led-power-red {
>  			label = "power_red";
>  			gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
>  		};
>  
> -		tx_green {
> +		led-tx-green {
>  			label = "tx_green";
>  			gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
>  		};
>  
> -		tx_red {
> +		led-tx-red {
>  			label = "tx_red";
>  			gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
>  		};
> diff --git a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> index b9a21f9f9a6d..da31b07d6828 100644
> --- a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> @@ -53,17 +53,17 @@ leds {
>  		pinctrl-0 = <&pinctrl_gpio_leds>;
>  		status = "okay"; /* Conflict with pwm0. */
>  
> -		red {
> +		led-red {
>  			label = "red";
>  			gpios = <&pioB 11 GPIO_ACTIVE_HIGH>;
>  		};
>  
> -		green {
> +		led-green {
>  			label = "green";
>  			gpios = <&pioB 12 GPIO_ACTIVE_HIGH>;
>  		};
>  
> -		blue {
> +		led-blue {
>  			label = "blue";
>  			gpios = <&pioB 13 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "heartbeat";
> diff --git a/arch/arm/boot/dts/microchip/at91rm9200ek.dts b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> index 3089912dd6be..641d443e6ca9 100644
> --- a/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> @@ -127,19 +127,19 @@ root@350000  {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		ds2 {
> +		led-ds2 {
>  			label = "green";
>  			gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "mmc0";
>  		};
>  
> -		ds4 {
> +		led-ds4 {
>  			label = "yellow";
>  			gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "heartbeat";
>  		};
>  
> -		ds6 {
> +		led-ds6 {
>  			label = "red";
>  			gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
>  		};
> diff --git a/arch/arm/boot/dts/microchip/at91sam9260ek.dts b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> index ed259e2cb853..4933971d0585 100644
> --- a/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> @@ -174,13 +174,13 @@ eeprom@50 {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		ds1 {
> +		led-ds1 {
>  			label = "ds1";
>  			gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "heartbeat";
>  		};
>  
> -		ds5 {
> +		led-ds5 {
>  			label = "ds5";
>  			gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
>  		};
> diff --git a/arch/arm/boot/dts/microchip/at91sam9261ek.dts b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> index 4d9269cc5f32..9c44177db714 100644
> --- a/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> @@ -192,19 +192,19 @@ watchdog@fffffd40 {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		ds8 {
> +		led-ds8 {
>  			label = "ds8";
>  			gpios = <&pioA 13 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "none";
>  		};
>  
> -		ds7 {
> +		led-ds7 {
>  			label = "ds7";
>  			gpios = <&pioA 14 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "nand-disk";
>  		};
>  
> -		ds1 {
> +		led-ds1 {
>  			label = "ds1";
>  			gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "heartbeat";
> diff --git a/arch/arm/boot/dts/microchip/at91sam9263ek.dts b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> index a8ea36db4c04..cf5434f9449d 100644
> --- a/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> @@ -219,13 +219,13 @@ &pioA 21 GPIO_ACTIVE_HIGH
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		d3 {
> +		led-d3 {
>  			label = "d3";
>  			gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "heartbeat";
>  		};
>  
> -		d2 {
> +		led-d2 {
>  			label = "d2";
>  			gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
>  			linux,default-trigger = "nand-disk";
> diff --git a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> index 6de7a7cd3c07..1e62fd371ddb 100644
> --- a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> +++ b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> @@ -14,13 +14,13 @@ / {
>  	leds {
>  		compatible = "gpio-leds";
>  
> -		ds1 {
> +		led-ds1 {
>  			label = "ds1";
>  			gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "heartbeat";
>  		};
>  
> -		ds5 {
> +		led-ds5 {
>  			label = "ds5";
>  			gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
>  		};
> -- 
> 2.34.1
> 
>
Andrei Simion Aug. 16, 2024, 8:52 a.m. UTC | #3
Hello Alex,

On 15.08.2024 10:57, Alexander Dahl wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Hello Andrei,
>> Am Wed, Aug 14, 2024 at 03:26:33PM +0300 schrieb Andrei Simion:
>> dtbs_check warnings:
>> leds: 'd[0-9]', 'ds[0-9]' do not match any of the regexes:
>> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
>> leds: 'red', 'green', 'blue' do not match any of regexes:
>> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
>>
>> Rename the led sub nodes according to devicetree
>> specification and leds-gpio.yaml.
>>
>> Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
>> ---
>> Split the bloadted patch into small patches on topics
>> based on comments:
>> https://lore.kernel.org/linux-arm-kernel/89f51615-0dee-4ab0-ab72-e3c057fee1e7@tuxon.dev/
>> ---
>>  arch/arm/boot/dts/microchip/aks-cdu.dts        | 8 ++++----
>>  arch/arm/boot/dts/microchip/animeo_ip.dts      | 8 ++++----
>>  arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 +++---
>>  arch/arm/boot/dts/microchip/at91rm9200ek.dts   | 6 +++---
>>  arch/arm/boot/dts/microchip/at91sam9260ek.dts  | 4 ++--
>>  arch/arm/boot/dts/microchip/at91sam9261ek.dts  | 6 +++---
>>  arch/arm/boot/dts/microchip/at91sam9263ek.dts  | 4 ++--
>>  arch/arm/boot/dts/microchip/at91sam9g20ek.dts  | 4 ++--
>>  8 files changed, 23 insertions(+), 23 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/microchip/aks-cdu.dts b/arch/arm/boot/dts/microchip/aks-cdu.dts
>> index 52e166c8a365..95a0639c5579 100644
>> --- a/arch/arm/boot/dts/microchip/aks-cdu.dts
>> +++ b/arch/arm/boot/dts/microchip/aks-cdu.dts
>> @@ -98,23 +98,23 @@ rootfs@500000 {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             red {
>> +             led-red {
>>                       gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "none";
>>               };
>>
>> -             green {
>> +             led-green {
>>                       gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "none";
>>                       default-state = "on";
>>               };
>>
>> -             yellow {
>> +             led-yellow {
>>                       gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "none";
>>               };
>>
>> -             blue {
>> +             led-blue {
>>                       gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "none";
>>               };
> 
> As reported with <20240730-rambling-helping-2f03f5ddee6a@thorsis.com>
> already, this will probably change sysfs paths and thus might break
> userspace depending on those paths.  Did you consider adding a label
> to avoid this?
> 
> (Added linux-leds to Cc.)
> 

https://elixir.bootlin.com/linux/v6.11-rc3/source/Documentation/devicetree/bindings/leds/common.yaml#L54
Based on the information provided above: "If omitted, the label is 
taken from the node name (excluding the unit address)." and "This 
property is deprecated"
So, in your opinion what should I do? use function and color?
My patch reason is to rename the label to avoid the warnings.

Best Regards,
Andrei Simion

> Greets
> Alex
> 
>> diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts
>> index 911c8d9ee013..52ac840bcd35 100644
>> --- a/arch/arm/boot/dts/microchip/animeo_ip.dts
>> +++ b/arch/arm/boot/dts/microchip/animeo_ip.dts
>> @@ -146,23 +146,23 @@ ohci: usb@500000 {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             power_green {
>> +             led-power-green {
>>                       label = "power_green";
>>                       gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "heartbeat";
>>               };
>>
>> -             power_red {
>> +             led-power-red {
>>                       label = "power_red";
>>                       gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
>>               };
>>
>> -             tx_green {
>> +             led-tx-green {
>>                       label = "tx_green";
>>                       gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
>>               };
>>
>> -             tx_red {
>> +             led-tx-red {
>>                       label = "tx_red";
>>                       gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
>>               };
>> diff --git a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
>> index b9a21f9f9a6d..da31b07d6828 100644
>> --- a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
>> @@ -53,17 +53,17 @@ leds {
>>               pinctrl-0 = <&pinctrl_gpio_leds>;
>>               status = "okay"; /* Conflict with pwm0. */
>>
>> -             red {
>> +             led-red {
>>                       label = "red";
>>                       gpios = <&pioB 11 GPIO_ACTIVE_HIGH>;
>>               };
>>
>> -             green {
>> +             led-green {
>>                       label = "green";
>>                       gpios = <&pioB 12 GPIO_ACTIVE_HIGH>;
>>               };
>>
>> -             blue {
>> +             led-blue {
>>                       label = "blue";
>>                       gpios = <&pioB 13 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "heartbeat";
>> diff --git a/arch/arm/boot/dts/microchip/at91rm9200ek.dts b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
>> index 3089912dd6be..641d443e6ca9 100644
>> --- a/arch/arm/boot/dts/microchip/at91rm9200ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
>> @@ -127,19 +127,19 @@ root@350000  {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             ds2 {
>> +             led-ds2 {
>>                       label = "green";
>>                       gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "mmc0";
>>               };
>>
>> -             ds4 {
>> +             led-ds4 {
>>                       label = "yellow";
>>                       gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "heartbeat";
>>               };
>>
>> -             ds6 {
>> +             led-ds6 {
>>                       label = "red";
>>                       gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
>>               };
>> diff --git a/arch/arm/boot/dts/microchip/at91sam9260ek.dts b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
>> index ed259e2cb853..4933971d0585 100644
>> --- a/arch/arm/boot/dts/microchip/at91sam9260ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
>> @@ -174,13 +174,13 @@ eeprom@50 {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             ds1 {
>> +             led-ds1 {
>>                       label = "ds1";
>>                       gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "heartbeat";
>>               };
>>
>> -             ds5 {
>> +             led-ds5 {
>>                       label = "ds5";
>>                       gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
>>               };
>> diff --git a/arch/arm/boot/dts/microchip/at91sam9261ek.dts b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
>> index 4d9269cc5f32..9c44177db714 100644
>> --- a/arch/arm/boot/dts/microchip/at91sam9261ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
>> @@ -192,19 +192,19 @@ watchdog@fffffd40 {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             ds8 {
>> +             led-ds8 {
>>                       label = "ds8";
>>                       gpios = <&pioA 13 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "none";
>>               };
>>
>> -             ds7 {
>> +             led-ds7 {
>>                       label = "ds7";
>>                       gpios = <&pioA 14 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "nand-disk";
>>               };
>>
>> -             ds1 {
>> +             led-ds1 {
>>                       label = "ds1";
>>                       gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "heartbeat";
>> diff --git a/arch/arm/boot/dts/microchip/at91sam9263ek.dts b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
>> index a8ea36db4c04..cf5434f9449d 100644
>> --- a/arch/arm/boot/dts/microchip/at91sam9263ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
>> @@ -219,13 +219,13 @@ &pioA 21 GPIO_ACTIVE_HIGH
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             d3 {
>> +             led-d3 {
>>                       label = "d3";
>>                       gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "heartbeat";
>>               };
>>
>> -             d2 {
>> +             led-d2 {
>>                       label = "d2";
>>                       gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
>>                       linux,default-trigger = "nand-disk";
>> diff --git a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
>> index 6de7a7cd3c07..1e62fd371ddb 100644
>> --- a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
>> +++ b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
>> @@ -14,13 +14,13 @@ / {
>>       leds {
>>               compatible = "gpio-leds";
>>
>> -             ds1 {
>> +             led-ds1 {
>>                       label = "ds1";
>>                       gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
>>                       linux,default-trigger = "heartbeat";
>>               };
>>
>> -             ds5 {
>> +             led-ds5 {
>>                       label = "ds5";
>>                       gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
>>               };
>> --
>> 2.34.1
>>
>>
Alexander Dahl Aug. 16, 2024, 9:06 a.m. UTC | #4
Hello Andrei,

Am Fri, Aug 16, 2024 at 08:52:14AM +0000 schrieb Andrei.Simion@microchip.com:
> Hello Alex,
> 
> On 15.08.2024 10:57, Alexander Dahl wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> > 
> > Hello Andrei,
> >> Am Wed, Aug 14, 2024 at 03:26:33PM +0300 schrieb Andrei Simion:
> >> dtbs_check warnings:
> >> leds: 'd[0-9]', 'ds[0-9]' do not match any of the regexes:
> >> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> >> leds: 'red', 'green', 'blue' do not match any of regexes:
> >> '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
> >>
> >> Rename the led sub nodes according to devicetree
> >> specification and leds-gpio.yaml.
> >>
> >> Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
> >> ---
> >> Split the bloadted patch into small patches on topics
> >> based on comments:
> >> https://lore.kernel.org/linux-arm-kernel/89f51615-0dee-4ab0-ab72-e3c057fee1e7@tuxon.dev/
> >> ---
> >>  arch/arm/boot/dts/microchip/aks-cdu.dts        | 8 ++++----
> >>  arch/arm/boot/dts/microchip/animeo_ip.dts      | 8 ++++----
> >>  arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 +++---
> >>  arch/arm/boot/dts/microchip/at91rm9200ek.dts   | 6 +++---
> >>  arch/arm/boot/dts/microchip/at91sam9260ek.dts  | 4 ++--
> >>  arch/arm/boot/dts/microchip/at91sam9261ek.dts  | 6 +++---
> >>  arch/arm/boot/dts/microchip/at91sam9263ek.dts  | 4 ++--
> >>  arch/arm/boot/dts/microchip/at91sam9g20ek.dts  | 4 ++--
> >>  8 files changed, 23 insertions(+), 23 deletions(-)
> >>
> >> diff --git a/arch/arm/boot/dts/microchip/aks-cdu.dts b/arch/arm/boot/dts/microchip/aks-cdu.dts
> >> index 52e166c8a365..95a0639c5579 100644
> >> --- a/arch/arm/boot/dts/microchip/aks-cdu.dts
> >> +++ b/arch/arm/boot/dts/microchip/aks-cdu.dts
> >> @@ -98,23 +98,23 @@ rootfs@500000 {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             red {
> >> +             led-red {
> >>                       gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "none";
> >>               };
> >>
> >> -             green {
> >> +             led-green {
> >>                       gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "none";
> >>                       default-state = "on";
> >>               };
> >>
> >> -             yellow {
> >> +             led-yellow {
> >>                       gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "none";
> >>               };
> >>
> >> -             blue {
> >> +             led-blue {
> >>                       gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "none";
> >>               };
> > 
> > As reported with <20240730-rambling-helping-2f03f5ddee6a@thorsis.com>
> > already, this will probably change sysfs paths and thus might break
> > userspace depending on those paths.  Did you consider adding a label
> > to avoid this?
> > 
> > (Added linux-leds to Cc.)
> > 
> 
> https://elixir.bootlin.com/linux/v6.11-rc3/source/Documentation/devicetree/bindings/leds/common.yaml#L54
> Based on the information provided above: "If omitted, the label is 
> taken from the node name (excluding the unit address)." and "This 
> property is deprecated"
> So, in your opinion what should I do? use function and color?
> My patch reason is to rename the label to avoid the warnings.

I understood the intention, and I appreciate the effort of eliminating
those warnings.  I would add the label property here and use the
previous node name as value.  The deprecation statement makes sense
when introducing new nodes with new LEDs.  In this case there's
already a somewhat deprecated name, but if that should stay stable,
then in my opinion adding the label property is the best choice.

Example, before:

  yellow {
    gpios = < ... >;
    linux,default-trigger = ...;
  };

After:

  led-yellow {
    label = "yellow";
    gpios = < ... >;
    linux,default-trigger = ...;
  };

This way the sysfs path should be /sys/class/leds/yellow before and
after, and the dts warnings be gone, right?

Greets
Alex

> 
> Best Regards,
> Andrei Simion
> 
> > Greets
> > Alex
> > 
> >> diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts
> >> index 911c8d9ee013..52ac840bcd35 100644
> >> --- a/arch/arm/boot/dts/microchip/animeo_ip.dts
> >> +++ b/arch/arm/boot/dts/microchip/animeo_ip.dts
> >> @@ -146,23 +146,23 @@ ohci: usb@500000 {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             power_green {
> >> +             led-power-green {
> >>                       label = "power_green";
> >>                       gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "heartbeat";
> >>               };
> >>
> >> -             power_red {
> >> +             led-power-red {
> >>                       label = "power_red";
> >>                       gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
> >>               };
> >>
> >> -             tx_green {
> >> +             led-tx-green {
> >>                       label = "tx_green";
> >>                       gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
> >>               };
> >>
> >> -             tx_red {
> >> +             led-tx-red {
> >>                       label = "tx_red";
> >>                       gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
> >>               };
> >> diff --git a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> >> index b9a21f9f9a6d..da31b07d6828 100644
> >> --- a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
> >> @@ -53,17 +53,17 @@ leds {
> >>               pinctrl-0 = <&pinctrl_gpio_leds>;
> >>               status = "okay"; /* Conflict with pwm0. */
> >>
> >> -             red {
> >> +             led-red {
> >>                       label = "red";
> >>                       gpios = <&pioB 11 GPIO_ACTIVE_HIGH>;
> >>               };
> >>
> >> -             green {
> >> +             led-green {
> >>                       label = "green";
> >>                       gpios = <&pioB 12 GPIO_ACTIVE_HIGH>;
> >>               };
> >>
> >> -             blue {
> >> +             led-blue {
> >>                       label = "blue";
> >>                       gpios = <&pioB 13 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "heartbeat";
> >> diff --git a/arch/arm/boot/dts/microchip/at91rm9200ek.dts b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> >> index 3089912dd6be..641d443e6ca9 100644
> >> --- a/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
> >> @@ -127,19 +127,19 @@ root@350000  {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             ds2 {
> >> +             led-ds2 {
> >>                       label = "green";
> >>                       gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "mmc0";
> >>               };
> >>
> >> -             ds4 {
> >> +             led-ds4 {
> >>                       label = "yellow";
> >>                       gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "heartbeat";
> >>               };
> >>
> >> -             ds6 {
> >> +             led-ds6 {
> >>                       label = "red";
> >>                       gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
> >>               };
> >> diff --git a/arch/arm/boot/dts/microchip/at91sam9260ek.dts b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> >> index ed259e2cb853..4933971d0585 100644
> >> --- a/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
> >> @@ -174,13 +174,13 @@ eeprom@50 {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             ds1 {
> >> +             led-ds1 {
> >>                       label = "ds1";
> >>                       gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "heartbeat";
> >>               };
> >>
> >> -             ds5 {
> >> +             led-ds5 {
> >>                       label = "ds5";
> >>                       gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
> >>               };
> >> diff --git a/arch/arm/boot/dts/microchip/at91sam9261ek.dts b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> >> index 4d9269cc5f32..9c44177db714 100644
> >> --- a/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
> >> @@ -192,19 +192,19 @@ watchdog@fffffd40 {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             ds8 {
> >> +             led-ds8 {
> >>                       label = "ds8";
> >>                       gpios = <&pioA 13 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "none";
> >>               };
> >>
> >> -             ds7 {
> >> +             led-ds7 {
> >>                       label = "ds7";
> >>                       gpios = <&pioA 14 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "nand-disk";
> >>               };
> >>
> >> -             ds1 {
> >> +             led-ds1 {
> >>                       label = "ds1";
> >>                       gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "heartbeat";
> >> diff --git a/arch/arm/boot/dts/microchip/at91sam9263ek.dts b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> >> index a8ea36db4c04..cf5434f9449d 100644
> >> --- a/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
> >> @@ -219,13 +219,13 @@ &pioA 21 GPIO_ACTIVE_HIGH
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             d3 {
> >> +             led-d3 {
> >>                       label = "d3";
> >>                       gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "heartbeat";
> >>               };
> >>
> >> -             d2 {
> >> +             led-d2 {
> >>                       label = "d2";
> >>                       gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
> >>                       linux,default-trigger = "nand-disk";
> >> diff --git a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> >> index 6de7a7cd3c07..1e62fd371ddb 100644
> >> --- a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> >> +++ b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
> >> @@ -14,13 +14,13 @@ / {
> >>       leds {
> >>               compatible = "gpio-leds";
> >>
> >> -             ds1 {
> >> +             led-ds1 {
> >>                       label = "ds1";
> >>                       gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
> >>                       linux,default-trigger = "heartbeat";
> >>               };
> >>
> >> -             ds5 {
> >> +             led-ds5 {
> >>                       label = "ds5";
> >>                       gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
> >>               };
> >> --
> >> 2.34.1
> >>
> >>
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/microchip/aks-cdu.dts b/arch/arm/boot/dts/microchip/aks-cdu.dts
index 52e166c8a365..95a0639c5579 100644
--- a/arch/arm/boot/dts/microchip/aks-cdu.dts
+++ b/arch/arm/boot/dts/microchip/aks-cdu.dts
@@ -98,23 +98,23 @@  rootfs@500000 {
 	leds {
 		compatible = "gpio-leds";
 
-		red {
+		led-red {
 			gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "none";
 		};
 
-		green {
+		led-green {
 			gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 			default-state = "on";
 		};
 
-		yellow {
+		led-yellow {
 			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 		};
 
-		blue {
+		led-blue {
 			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 		};
diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts
index 911c8d9ee013..52ac840bcd35 100644
--- a/arch/arm/boot/dts/microchip/animeo_ip.dts
+++ b/arch/arm/boot/dts/microchip/animeo_ip.dts
@@ -146,23 +146,23 @@  ohci: usb@500000 {
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led-power-green {
 			label = "power_green";
 			gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
-		power_red {
+		led-power-red {
 			label = "power_red";
 			gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
 		};
 
-		tx_green {
+		led-tx-green {
 			label = "tx_green";
 			gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
 		};
 
-		tx_red {
+		led-tx-red {
 			label = "tx_red";
 			gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
 		};
diff --git a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
index b9a21f9f9a6d..da31b07d6828 100644
--- a/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
@@ -53,17 +53,17 @@  leds {
 		pinctrl-0 = <&pinctrl_gpio_leds>;
 		status = "okay"; /* Conflict with pwm0. */
 
-		red {
+		led-red {
 			label = "red";
 			gpios = <&pioB 11 GPIO_ACTIVE_HIGH>;
 		};
 
-		green {
+		led-green {
 			label = "green";
 			gpios = <&pioB 12 GPIO_ACTIVE_HIGH>;
 		};
 
-		blue {
+		led-blue {
 			label = "blue";
 			gpios = <&pioB 13 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
diff --git a/arch/arm/boot/dts/microchip/at91rm9200ek.dts b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
index 3089912dd6be..641d443e6ca9 100644
--- a/arch/arm/boot/dts/microchip/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
@@ -127,19 +127,19 @@  root@350000  {
 	leds {
 		compatible = "gpio-leds";
 
-		ds2 {
+		led-ds2 {
 			label = "green";
 			gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "mmc0";
 		};
 
-		ds4 {
+		led-ds4 {
 			label = "yellow";
 			gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
 		};
 
-		ds6 {
+		led-ds6 {
 			label = "red";
 			gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
 		};
diff --git a/arch/arm/boot/dts/microchip/at91sam9260ek.dts b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
index ed259e2cb853..4933971d0585 100644
--- a/arch/arm/boot/dts/microchip/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
@@ -174,13 +174,13 @@  eeprom@50 {
 	leds {
 		compatible = "gpio-leds";
 
-		ds1 {
+		led-ds1 {
 			label = "ds1";
 			gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
-		ds5 {
+		led-ds5 {
 			label = "ds5";
 			gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
 		};
diff --git a/arch/arm/boot/dts/microchip/at91sam9261ek.dts b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
index 4d9269cc5f32..9c44177db714 100644
--- a/arch/arm/boot/dts/microchip/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
@@ -192,19 +192,19 @@  watchdog@fffffd40 {
 	leds {
 		compatible = "gpio-leds";
 
-		ds8 {
+		led-ds8 {
 			label = "ds8";
 			gpios = <&pioA 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 		};
 
-		ds7 {
+		led-ds7 {
 			label = "ds7";
 			gpios = <&pioA 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "nand-disk";
 		};
 
-		ds1 {
+		led-ds1 {
 			label = "ds1";
 			gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
diff --git a/arch/arm/boot/dts/microchip/at91sam9263ek.dts b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
index a8ea36db4c04..cf5434f9449d 100644
--- a/arch/arm/boot/dts/microchip/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
@@ -219,13 +219,13 @@  &pioA 21 GPIO_ACTIVE_HIGH
 	leds {
 		compatible = "gpio-leds";
 
-		d3 {
+		led-d3 {
 			label = "d3";
 			gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
-		d2 {
+		led-d2 {
 			label = "d2";
 			gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "nand-disk";
diff --git a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
index 6de7a7cd3c07..1e62fd371ddb 100644
--- a/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9g20ek.dts
@@ -14,13 +14,13 @@  / {
 	leds {
 		compatible = "gpio-leds";
 
-		ds1 {
+		led-ds1 {
 			label = "ds1";
 			gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
-		ds5 {
+		led-ds5 {
 			label = "ds5";
 			gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
 		};