LinuxLists.cc - [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

2022-04-07 19:43:37

Subject: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

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

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +-
arch/arm/boot/dts/at91-q5xr5.dts | 2 +-
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 2 +-
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +-
arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +-
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +-
arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +-
arch/arm/boot/dts/at91-vinco.dts | 2 +-
arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
index c1c8650dafce..3542ad8a243e 100644
--- a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
+++ b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
@@ -44,7 +44,7 @@ &spi0 {
status = "okay";

/* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */
- spi-flash@0 {
+ flash@0 {
compatible = "mxicy,mx25u4035", "jedec,spi-nor";
spi-max-frequency = <33000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91-q5xr5.dts b/arch/arm/boot/dts/at91-q5xr5.dts
index 47a00062f01f..9cf60b6f695c 100644
--- a/arch/arm/boot/dts/at91-q5xr5.dts
+++ b/arch/arm/boot/dts/at91-q5xr5.dts
@@ -125,7 +125,7 @@ &spi0 {
cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;
status = "okay";

- m25p80@0 {
+ flash@0 {
compatible = "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
index 21c86171e462..ba621783acdb 100644
--- a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
@@ -214,7 +214,7 @@ &qspi1 {
pinctrl-0 = <&pinctrl_qspi1_default>;
status = "disabled";

- qspi1_flash: spi_flash@0 {
+ qspi1_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
index c145c4e5ef58..5e8755f22784 100644
--- a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
@@ -191,7 +191,7 @@ &pwm0 {
&qspi1 {
status = "okay";

- qspi1_flash: spi_flash@0 {
+ qspi1_flash: flash@0 {
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index 9bf2ec0ba3e2..cdfe891f9a9e 100644
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -137,7 +137,7 @@ spi0: spi@f8000000 {
pinctrl-0 = <&pinctrl_spi0_default>;
status = "okay";

- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
reg = <0>;
spi-max-frequency = <50000000>;
diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
index 710cb72bda5a..fd1086f52b40 100644
--- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
@@ -49,7 +49,7 @@ spi0: spi@f8010000 {
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
status = "okay";

- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index fe432b6b7e95..7017f626f362 100644
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -65,7 +65,7 @@ ssc0: ssc@f8008000 {
spi0: spi@f8010000 {
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
status = "okay";
- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91-vinco.dts b/arch/arm/boot/dts/at91-vinco.dts
index a51a3372afa1..ebeaa6ab500e 100644
--- a/arch/arm/boot/dts/at91-vinco.dts
+++ b/arch/arm/boot/dts/at91-vinco.dts
@@ -59,7 +59,7 @@ slot@0 {
spi0: spi@f8010000 {
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
status = "okay";
- m25p80@0 {
+ flash@0 {
compatible = "n25q32b", "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 2bc4e6e0a923..c905d7bfc771 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -119,7 +119,7 @@ pinctrl_usb1_vbus_sense: usb1_vbus_sense {
spi0: spi@f0000000 {
status = "okay";
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 6d1264de6060..5f4eaa618ab4 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -125,7 +125,7 @@ &spi0 {
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
status = "disabled"; /* conflicts with mmc1 */

- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index a499de8a7a64..3652c9e24124 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -26,7 +26,7 @@ slot@0 {
spi0: spi@f0004000 {
dmas = <0>, <0>; /* Do not use DMA for spi0 */

- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
diff --git a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
index fa9e5e2a745d..5d9e97fecf83 100644
--- a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
@@ -25,7 +25,7 @@ slot@0 {
spi0: spi@f0004000 {
dmas = <0>, <0>; /* Do not use DMA for spi0 */

- m25p80@0 {
+ flash@0 {
compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>;
reg = <0>;
--
2.32.0

2022-04-07 20:38:21

by Krzysztof Kozlowski

[permalink] [raw]

Subject: [PATCH 2/2] arm64: dts: microchip: align SPI NOR node name with dtschema

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

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/microchip/sparx5_nand.dtsi | 2 +-
arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 4 ++--
arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi | 4 ++--
arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/microchip/sparx5_nand.dtsi b/arch/arm64/boot/dts/microchip/sparx5_nand.dtsi
index 03f107e427d7..ce0747fd6444 100644
--- a/arch/arm64/boot/dts/microchip/sparx5_nand.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_nand.dtsi
@@ -19,7 +19,7 @@ spi@e {
#address-cells = <1>;
#size-cells = <0>;
reg = <14>; /* CS14 */
- spi-flash@6 {
+ flash@6 {
compatible = "spi-nand";
pinctrl-0 = <&cs14_pins>;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb125.dts b/arch/arm64/boot/dts/microchip/sparx5_pcb125.dts
index 9baa085d7861..dbf8c1d48a02 100644
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb125.dts
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb125.dts
@@ -47,7 +47,7 @@ spi@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; /* CS0 */
- spi-flash@9 {
+ flash@9 {
compatible = "jedec,spi-nor";
spi-max-frequency = <8000000>;
reg = <0x9>; /* SPI */
@@ -59,7 +59,7 @@ spi@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>; /* CS1 */
- spi-flash@9 {
+ flash@9 {
compatible = "spi-nand";
pinctrl-0 = <&cs1_pins>;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
index 33faf1f3264f..699256f1b9d8 100644
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
@@ -274,7 +274,7 @@ gpio@1 {

&spi0 {
status = "okay";
- spi-flash@0 {
+ flash@0 {
compatible = "jedec,spi-nor";
spi-max-frequency = <8000000>;
reg = <0>;
@@ -289,7 +289,7 @@ spi@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; /* CS0 */
- spi-flash@9 {
+ flash@9 {
compatible = "jedec,spi-nor";
spi-max-frequency = <8000000>;
reg = <0x9>; /* SPI */
diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
index ef96e6d8c6b3..d10a9172b529 100644
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
@@ -89,7 +89,7 @@ i2cmux_s32: i2cmux-3 {

&spi0 {
status = "okay";
- spi-flash@0 {
+ flash@0 {
compatible = "jedec,spi-nor";
spi-max-frequency = <8000000>;
reg = <0>;
@@ -104,7 +104,7 @@ spi@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; /* CS0 */
- spi-flash@9 {
+ flash@9 {
compatible = "jedec,spi-nor";
spi-max-frequency = <8000000>;
reg = <0x9>; /* SPI */
--
2.32.0

2022-04-12 22:13:19

by Tudor Ambarus

[permalink] [raw]

Subject: Re: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

On 4/7/22 17:32, Krzysztof Kozlowski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The node names should be generic and SPI NOR dtschema expects "flash".
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Reviewed-by: Tudor Ambarus <[email protected]>

> ---
> arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +-
> arch/arm/boot/dts/at91-q5xr5.dts | 2 +-
> arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 2 +-
> arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +-
> arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +-
> arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +-
> arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +-
> arch/arm/boot/dts/at91-vinco.dts | 2 +-
> arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
> arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
> arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
> arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +-
> 12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
> index c1c8650dafce..3542ad8a243e 100644
> --- a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
> +++ b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
> @@ -44,7 +44,7 @@ &spi0 {
> status = "okay";
>
> /* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */
> - spi-flash@0 {
> + flash@0 {
> compatible = "mxicy,mx25u4035", "jedec,spi-nor";
> spi-max-frequency = <33000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91-q5xr5.dts b/arch/arm/boot/dts/at91-q5xr5.dts
> index 47a00062f01f..9cf60b6f695c 100644
> --- a/arch/arm/boot/dts/at91-q5xr5.dts
> +++ b/arch/arm/boot/dts/at91-q5xr5.dts
> @@ -125,7 +125,7 @@ &spi0 {
> cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;
> status = "okay";
>
> - m25p80@0 {
> + flash@0 {
> compatible = "jedec,spi-nor";
> spi-max-frequency = <20000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
> index 21c86171e462..ba621783acdb 100644
> --- a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
> +++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
> @@ -214,7 +214,7 @@ &qspi1 {
> pinctrl-0 = <&pinctrl_qspi1_default>;
> status = "disabled";
>
> - qspi1_flash: spi_flash@0 {
> + qspi1_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "jedec,spi-nor";
> diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
> index c145c4e5ef58..5e8755f22784 100644
> --- a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
> +++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
> @@ -191,7 +191,7 @@ &pwm0 {
> &qspi1 {
> status = "okay";
>
> - qspi1_flash: spi_flash@0 {
> + qspi1_flash: flash@0 {
> status = "okay";
> };
> };
> diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> index 9bf2ec0ba3e2..cdfe891f9a9e 100644
> --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> @@ -137,7 +137,7 @@ spi0: spi@f8000000 {
> pinctrl-0 = <&pinctrl_spi0_default>;
> status = "okay";
>
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> reg = <0>;
> spi-max-frequency = <50000000>;
> diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
> index 710cb72bda5a..fd1086f52b40 100644
> --- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
> +++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
> @@ -49,7 +49,7 @@ spi0: spi@f8010000 {
> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
> status = "okay";
>
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
> index fe432b6b7e95..7017f626f362 100644
> --- a/arch/arm/boot/dts/at91-sama5d4ek.dts
> +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
> @@ -65,7 +65,7 @@ ssc0: ssc@f8008000 {
> spi0: spi@f8010000 {
> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
> status = "okay";
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91-vinco.dts b/arch/arm/boot/dts/at91-vinco.dts
> index a51a3372afa1..ebeaa6ab500e 100644
> --- a/arch/arm/boot/dts/at91-vinco.dts
> +++ b/arch/arm/boot/dts/at91-vinco.dts
> @@ -59,7 +59,7 @@ slot@0 {
> spi0: spi@f8010000 {
> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
> status = "okay";
> - m25p80@0 {
> + flash@0 {
> compatible = "n25q32b", "jedec,spi-nor";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
> index 2bc4e6e0a923..c905d7bfc771 100644
> --- a/arch/arm/boot/dts/at91sam9n12ek.dts
> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts
> @@ -119,7 +119,7 @@ pinctrl_usb1_vbus_sense: usb1_vbus_sense {
> spi0: spi@f0000000 {
> status = "okay";
> cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
> index 6d1264de6060..5f4eaa618ab4 100644
> --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
> @@ -125,7 +125,7 @@ &spi0 {
> cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
> status = "disabled"; /* conflicts with mmc1 */
>
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index a499de8a7a64..3652c9e24124 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -26,7 +26,7 @@ slot@0 {
> spi0: spi@f0004000 {
> dmas = <0>, <0>; /* Do not use DMA for spi0 */
>
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
> index fa9e5e2a745d..5d9e97fecf83 100644
> --- a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
> @@ -25,7 +25,7 @@ slot@0 {
> spi0: spi@f0004000 {
> dmas = <0>, <0>; /* Do not use DMA for spi0 */
>
> - m25p80@0 {
> + flash@0 {
> compatible = "atmel,at25df321a";
> spi-max-frequency = <50000000>;
> reg = <0>;
> --
> 2.32.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

2022-04-12 22:55:29

by Tudor Ambarus

[permalink] [raw]

Subject: Re: [PATCH 2/2] arm64: dts: microchip: align SPI NOR node name with dtschema

2022-04-12 23:01:31

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

On 12/04/2022 12:41, [email protected] wrote:
>>>
>
> I've just noticed that there are other node names that can be fixed,
> if you feel like resubmitting:
> arch/arm/boot/dts/at91rm9200ek.dts: mtd_dataflash@0 {
> arch/arm/boot/dts/at91rm9200ek.dts: nor_flash@10000000 {
> arch/arm/boot/dts/at91sam9260ek.dts: mtd_dataflash@1 {
> arch/arm/boot/dts/at91sam9261ek.dts: mtd_dataflash@0 {
> arch/arm/boot/dts/at91sam9263ek.dts: mtd_dataflash@0 {
> arch/arm/boot/dts/at91sam9g20ek_common.dtsi: mtd_dataflash@1 {
> arch/arm/boot/dts/at91sam9m10g45ek.dts: mtd_dataflash@0 {
> arch/arm/boot/dts/at91sam9rlek.dts: mtd_dataflash@0 {

These are not the same bindings, but I can fix them as well (separate
patch I guess?).

Best regards,
Krzysztof

2022-04-12 23:07:00

by Tudor Ambarus

[permalink] [raw]

Subject: Re: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

On 4/12/22 13:32, Tudor Ambarus wrote:
> On 4/7/22 17:32, Krzysztof Kozlowski wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> The node names should be generic and SPI NOR dtschema expects "flash".
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> Reviewed-by: Tudor Ambarus <[email protected]>
>
>> ---
>> arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +-
>> arch/arm/boot/dts/at91-q5xr5.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 2 +-
>> arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +-
>> arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +-
>> arch/arm/boot/dts/at91-vinco.dts | 2 +-
>> arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
>> arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
>> arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
>> arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +-
>> 12 files changed, 12 insertions(+), 12 deletions(-)
>>

I've just noticed that there are other node names that can be fixed,
if you feel like resubmitting:
arch/arm/boot/dts/at91rm9200ek.dts: mtd_dataflash@0 {
arch/arm/boot/dts/at91rm9200ek.dts: nor_flash@10000000 {
arch/arm/boot/dts/at91sam9260ek.dts: mtd_dataflash@1 {
arch/arm/boot/dts/at91sam9261ek.dts: mtd_dataflash@0 {
arch/arm/boot/dts/at91sam9263ek.dts: mtd_dataflash@0 {
arch/arm/boot/dts/at91sam9g20ek_common.dtsi: mtd_dataflash@1 {
arch/arm/boot/dts/at91sam9m10g45ek.dts: mtd_dataflash@0 {
arch/arm/boot/dts/at91sam9rlek.dts: mtd_dataflash@0 {

2022-04-13 15:22:14

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

On 13/04/2022 11:21, Nicolas Ferre wrote:
> On 12/04/2022 at 12:32, Tudor Ambarus - M18064 wrote:
>> On 4/7/22 17:32, Krzysztof Kozlowski wrote:
>>> The node names should be generic and SPI NOR dtschema expects "flash".
>>>
>>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>>
>> Reviewed-by: Tudor Ambarus <[email protected]>
>
> Acked-by: Nicolas Ferre <[email protected]>
>
> I think that without this patch, errors are generated while checking DT,
> so I would put this patch in my "fixes" branch for 5.18: tell me if you
> disagree.

These are schema warnings, so except our checking tools, no real
user-visible issue. Fixes are ok, though.

Best regards,
Krzysztof

2022-04-14 14:34:02

by Nicolas Ferre

[permalink] [raw]

Subject: Re: [PATCH 1/2] ARM: dts: at91: align SPI NOR node name with dtschema

On 12/04/2022 at 12:32, Tudor Ambarus - M18064 wrote:
> On 4/7/22 17:32, Krzysztof Kozlowski wrote:
>> The node names should be generic and SPI NOR dtschema expects "flash".
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> Reviewed-by: Tudor Ambarus <[email protected]>

Acked-by: Nicolas Ferre <[email protected]>

I think that without this patch, errors are generated while checking DT,
so I would put this patch in my "fixes" branch for 5.18: tell me if you
disagree.

Best regards,
Nicolas

>
>> ---
>> arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +-
>> arch/arm/boot/dts/at91-q5xr5.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 2 +-
>> arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +-
>> arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +-
>> arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +-
>> arch/arm/boot/dts/at91-vinco.dts | 2 +-
>> arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
>> arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
>> arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
>> arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +-
>> 12 files changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
>> index c1c8650dafce..3542ad8a243e 100644
>> --- a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
>> +++ b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
>> @@ -44,7 +44,7 @@ &spi0 {
>> status = "okay";
>>
>> /* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */
>> - spi-flash@0 {
>> + flash@0 {
>> compatible = "mxicy,mx25u4035", "jedec,spi-nor";
>> spi-max-frequency = <33000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91-q5xr5.dts b/arch/arm/boot/dts/at91-q5xr5.dts
>> index 47a00062f01f..9cf60b6f695c 100644
>> --- a/arch/arm/boot/dts/at91-q5xr5.dts
>> +++ b/arch/arm/boot/dts/at91-q5xr5.dts
>> @@ -125,7 +125,7 @@ &spi0 {
>> cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;
>> status = "okay";
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "jedec,spi-nor";
>> spi-max-frequency = <20000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
>> index 21c86171e462..ba621783acdb 100644
>> --- a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
>> +++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
>> @@ -214,7 +214,7 @@ &qspi1 {
>> pinctrl-0 = <&pinctrl_qspi1_default>;
>> status = "disabled";
>>
>> - qspi1_flash: spi_flash@0 {
>> + qspi1_flash: flash@0 {
>> #address-cells = <1>;
>> #size-cells = <1>;
>> compatible = "jedec,spi-nor";
>> diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
>> index c145c4e5ef58..5e8755f22784 100644
>> --- a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
>> +++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
>> @@ -191,7 +191,7 @@ &pwm0 {
>> &qspi1 {
>> status = "okay";
>>
>> - qspi1_flash: spi_flash@0 {
>> + qspi1_flash: flash@0 {
>> status = "okay";
>> };
>> };
>> diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
>> index 9bf2ec0ba3e2..cdfe891f9a9e 100644
>> --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
>> +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
>> @@ -137,7 +137,7 @@ spi0: spi@f8000000 {
>> pinctrl-0 = <&pinctrl_spi0_default>;
>> status = "okay";
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> reg = <0>;
>> spi-max-frequency = <50000000>;
>> diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
>> index 710cb72bda5a..fd1086f52b40 100644
>> --- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
>> +++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
>> @@ -49,7 +49,7 @@ spi0: spi@f8010000 {
>> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
>> status = "okay";
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
>> index fe432b6b7e95..7017f626f362 100644
>> --- a/arch/arm/boot/dts/at91-sama5d4ek.dts
>> +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
>> @@ -65,7 +65,7 @@ ssc0: ssc@f8008000 {
>> spi0: spi@f8010000 {
>> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
>> status = "okay";
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91-vinco.dts b/arch/arm/boot/dts/at91-vinco.dts
>> index a51a3372afa1..ebeaa6ab500e 100644
>> --- a/arch/arm/boot/dts/at91-vinco.dts
>> +++ b/arch/arm/boot/dts/at91-vinco.dts
>> @@ -59,7 +59,7 @@ slot@0 {
>> spi0: spi@f8010000 {
>> cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
>> status = "okay";
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "n25q32b", "jedec,spi-nor";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
>> index 2bc4e6e0a923..c905d7bfc771 100644
>> --- a/arch/arm/boot/dts/at91sam9n12ek.dts
>> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts
>> @@ -119,7 +119,7 @@ pinctrl_usb1_vbus_sense: usb1_vbus_sense {
>> spi0: spi@f0000000 {
>> status = "okay";
>> cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
>> index 6d1264de6060..5f4eaa618ab4 100644
>> --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
>> +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
>> @@ -125,7 +125,7 @@ &spi0 {
>> cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
>> status = "disabled"; /* conflicts with mmc1 */
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
>> index a499de8a7a64..3652c9e24124 100644
>> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
>> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
>> @@ -26,7 +26,7 @@ slot@0 {
>> spi0: spi@f0004000 {
>> dmas = <0>, <0>; /* Do not use DMA for spi0 */
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> diff --git a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
>> index fa9e5e2a745d..5d9e97fecf83 100644
>> --- a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
>> +++ b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
>> @@ -25,7 +25,7 @@ slot@0 {
>> spi0: spi@f0004000 {
>> dmas = <0>, <0>; /* Do not use DMA for spi0 */
>>
>> - m25p80@0 {
>> + flash@0 {
>> compatible = "atmel,at25df321a";
>> spi-max-frequency = <50000000>;
>> reg = <0>;
>> --
>> 2.32.0
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> [email protected]
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

--
Nicolas Ferre

2022-04-21 13:47:04

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: (subset) [PATCH 2/2] arm64: dts: microchip: align SPI NOR node name with dtschema

On Thu, 7 Apr 2022 16:32:23 +0200, Krzysztof Kozlowski wrote:
> The node names should be generic and SPI NOR dtschema expects "flash".
>
>

Looks like no one wants to take this, so let me take care of it.

Applied, thanks!

[2/2] arm64: dts: microchip: align SPI NOR node name with dtschema
commit: b5ff234ffa602bea7f7409dea427596fbe72561c

Best regards,
--
Krzysztof Kozlowski <[email protected]>