ARM: dts: align SPI NOR node name with dtschema

[PATCH] ARM: dts: align SPI NOR node name with dtschema

Posted by Krzysztof Kozlowski 4 years, 1 month ago

The node names should be generic and SPI NOR dtschema expects "flash".

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/boot/dts/da850-evm.dts                  | 2 +-
 arch/arm/boot/dts/dm8168-evm.dts                 | 2 +-
 arch/arm/boot/dts/spear1310-evb.dts              | 2 +-
 arch/arm/boot/dts/spear1340-evb.dts              | 2 +-
 arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +-
 arch/arm/boot/dts/stm32mp157c-ev1.dts            | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 87c517d65f62..e9aecac4f5b5 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -278,7 +278,7 @@ &spi1 {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi1_pins &spi1_cs0_pin>;
-	flash: m25p80@0 {
+	flash: flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/arch/arm/boot/dts/dm8168-evm.dts b/arch/arm/boot/dts/dm8168-evm.dts
index 5126e2d72ed7..778796c10af8 100644
--- a/arch/arm/boot/dts/dm8168-evm.dts
+++ b/arch/arm/boot/dts/dm8168-evm.dts
@@ -177,7 +177,7 @@ &mcspi1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mcspi1_pins>;
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "w25x32";
 		spi-max-frequency = <48000000>;
 		reg = <0>;
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index 4cbadcb41084..ddd1cf4d0554 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -379,7 +379,7 @@ stmpe_touchscreen {
 					};
 				};
 
-				m25p80@1 {
+				flash@1 {
 					compatible = "st,m25p80";
 					reg = <1>;
 					spi-max-frequency = <12000000>;
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index fd194ebeedc9..3a51a41eb5e4 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -439,7 +439,7 @@ spi0: spi@e0100000 {
 				cs-gpios = <&gpiopinctrl 80 0>, <&gpiopinctrl 24 0>,
 					   <&gpiopinctrl 85 0>;
 
-				m25p80@0 {
+				flash@0 {
 					compatible = "m25p80";
 					reg = <0>;
 					spi-max-frequency = <12000000>;
diff --git a/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi b/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
index 33ae5e0590df..ac53ee3c496b 100644
--- a/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
@@ -398,7 +398,7 @@ &qspi {
 	#size-cells = <0>;
 	status = "okay";
 
-	flash0: is25lp016d@0 {
+	flash0: flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index e222d2d2cb44..d142dd30e16b 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -262,7 +262,7 @@ &qspi {
 	#size-cells = <0>;
 	status = "okay";
 
-	flash0: mx66l51235l@0 {
+	flash0: flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-rx-bus-width = <4>;
@@ -271,7 +271,7 @@ flash0: mx66l51235l@0 {
 		#size-cells = <1>;
 	};
 
-	flash1: mx66l51235l@1 {
+	flash1: flash@1 {
 		compatible = "jedec,spi-nor";
 		reg = <1>;
 		spi-rx-bus-width = <4>;
-- 
2.32.0

Re: [PATCH] ARM: dts: align SPI NOR node name with dtschema

Posted by Alexandre TORGUE 4 years ago

Hi Krzysztof

On 4/7/22 16:30, Krzysztof Kozlowski wrote:
> The node names should be generic and SPI NOR dtschema expects "flash".
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>   arch/arm/boot/dts/da850-evm.dts                  | 2 +-
>   arch/arm/boot/dts/dm8168-evm.dts                 | 2 +-
>   arch/arm/boot/dts/spear1310-evb.dts              | 2 +-
>   arch/arm/boot/dts/spear1340-evb.dts              | 2 +-
>   arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +-
>   arch/arm/boot/dts/stm32mp157c-ev1.dts            | 4 ++--
>   6 files changed, 7 insertions(+), 7 deletions(-)

Thanks for your patch. Is it possible to split it per vendor 
(TI/STM32/SPEAR) ?

Thanks
Alex


> diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
> index 87c517d65f62..e9aecac4f5b5 100644
> --- a/arch/arm/boot/dts/da850-evm.dts
> +++ b/arch/arm/boot/dts/da850-evm.dts
> @@ -278,7 +278,7 @@ &spi1 {
>   	status = "okay";
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&spi1_pins &spi1_cs0_pin>;
> -	flash: m25p80@0 {
> +	flash: flash@0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "jedec,spi-nor";
> diff --git a/arch/arm/boot/dts/dm8168-evm.dts b/arch/arm/boot/dts/dm8168-evm.dts
> index 5126e2d72ed7..778796c10af8 100644
> --- a/arch/arm/boot/dts/dm8168-evm.dts
> +++ b/arch/arm/boot/dts/dm8168-evm.dts
> @@ -177,7 +177,7 @@ &mcspi1 {
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&mcspi1_pins>;
>   
> -	m25p80@0 {
> +	flash@0 {
>   		compatible = "w25x32";
>   		spi-max-frequency = <48000000>;
>   		reg = <0>;
> diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
> index 4cbadcb41084..ddd1cf4d0554 100644
> --- a/arch/arm/boot/dts/spear1310-evb.dts
> +++ b/arch/arm/boot/dts/spear1310-evb.dts
> @@ -379,7 +379,7 @@ stmpe_touchscreen {
>   					};
>   				};
>   
> -				m25p80@1 {
> +				flash@1 {
>   					compatible = "st,m25p80";
>   					reg = <1>;
>   					spi-max-frequency = <12000000>;
> diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
> index fd194ebeedc9..3a51a41eb5e4 100644
> --- a/arch/arm/boot/dts/spear1340-evb.dts
> +++ b/arch/arm/boot/dts/spear1340-evb.dts
> @@ -439,7 +439,7 @@ spi0: spi@e0100000 {
>   				cs-gpios = <&gpiopinctrl 80 0>, <&gpiopinctrl 24 0>,
>   					   <&gpiopinctrl 85 0>;
>   
> -				m25p80@0 {
> +				flash@0 {
>   					compatible = "m25p80";
>   					reg = <0>;
>   					spi-max-frequency = <12000000>;
> diff --git a/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi b/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
> index 33ae5e0590df..ac53ee3c496b 100644
> --- a/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
> +++ b/arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
> @@ -398,7 +398,7 @@ &qspi {
>   	#size-cells = <0>;
>   	status = "okay";
>   
> -	flash0: is25lp016d@0 {
> +	flash0: flash@0 {
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-max-frequency = <133000000>;
> diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
> index e222d2d2cb44..d142dd30e16b 100644
> --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
> +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
> @@ -262,7 +262,7 @@ &qspi {
>   	#size-cells = <0>;
>   	status = "okay";
>   
> -	flash0: mx66l51235l@0 {
> +	flash0: flash@0 {
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-rx-bus-width = <4>;
> @@ -271,7 +271,7 @@ flash0: mx66l51235l@0 {
>   		#size-cells = <1>;
>   	};
>   
> -	flash1: mx66l51235l@1 {
> +	flash1: flash@1 {
>   		compatible = "jedec,spi-nor";
>   		reg = <1>;
>   		spi-rx-bus-width = <4>;

Re: [PATCH] ARM: dts: align SPI NOR node name with dtschema

Posted by Krzysztof Kozlowski 4 years ago

On 19/04/2022 15:03, Alexandre TORGUE wrote:
> Hi Krzysztof
> 
> On 4/7/22 16:30, Krzysztof Kozlowski wrote:
>> The node names should be generic and SPI NOR dtschema expects "flash".
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
>>   arch/arm/boot/dts/da850-evm.dts                  | 2 +-
>>   arch/arm/boot/dts/dm8168-evm.dts                 | 2 +-
>>   arch/arm/boot/dts/spear1310-evb.dts              | 2 +-
>>   arch/arm/boot/dts/spear1340-evb.dts              | 2 +-
>>   arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +-
>>   arch/arm/boot/dts/stm32mp157c-ev1.dts            | 4 ++--
>>   6 files changed, 7 insertions(+), 7 deletions(-)
> 
> Thanks for your patch. Is it possible to split it per vendor 
> (TI/STM32/SPEAR) ?

This was a part of a bigger set where most of these I split. However
here split would be more churn for such simple change, so I combined them.

This was already picked up by Arnd:
https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/commit/?h=for-next&id=56147a156e7e2f50bef695efe6cc4fe8e91c40dc


Best regards,
Krzysztof

Re: [PATCH] ARM: dts: align SPI NOR node name with dtschema

Posted by Alexandre TORGUE 4 years ago

On 4/19/22 15:10, Krzysztof Kozlowski wrote:
> On 19/04/2022 15:03, Alexandre TORGUE wrote:
>> Hi Krzysztof
>>
>> On 4/7/22 16:30, Krzysztof Kozlowski wrote:
>>> The node names should be generic and SPI NOR dtschema expects "flash".
>>>
>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>> ---
>>>    arch/arm/boot/dts/da850-evm.dts                  | 2 +-
>>>    arch/arm/boot/dts/dm8168-evm.dts                 | 2 +-
>>>    arch/arm/boot/dts/spear1310-evb.dts              | 2 +-
>>>    arch/arm/boot/dts/spear1340-evb.dts              | 2 +-
>>>    arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +-
>>>    arch/arm/boot/dts/stm32mp157c-ev1.dts            | 4 ++--
>>>    6 files changed, 7 insertions(+), 7 deletions(-)
>>
>> Thanks for your patch. Is it possible to split it per vendor
>> (TI/STM32/SPEAR) ?
> 
> This was a part of a bigger set where most of these I split. However
> here split would be more churn for such simple change, so I combined them.
> 
> This was already picked up by Arnd:
> https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/commit/?h=for-next&id=56147a156e7e2f50bef695efe6cc4fe8e91c40dc

Ah Ok, I missed that Arnd took them, sorry.

Regards
Alex

> 
> 
> Best regards,
> Krzysztof

Re: [PATCH] ARM: dts: align SPI NOR node name with dtschema

Posted by Viresh Kumar 4 years, 1 month ago

On 07-04-22, 16:30, Krzysztof Kozlowski wrote:
> The node names should be generic and SPI NOR dtschema expects "flash".
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  arch/arm/boot/dts/spear1310-evb.dts              | 2 +-
>  arch/arm/boot/dts/spear1340-evb.dts              | 2 +-

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh