2022-04-07 20:32:12

by Krzysztof Kozlowski

Subject: [PATCH 1/2] ARM: dts: keystone: 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/keystone-k2e-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2g-ice.dts | 2 +-
arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
index 66fec5f5d081..8f49883a675e 100644
--- a/arch/arm/boot/dts/keystone-k2e-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
@@ -137,7 +137,7 @@ partition@180000 {
};

&spi0 {
- nor_flash: n25q128a11@0 {
+ nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts
index d800f26b6275..88be868cf71e 100644
--- a/arch/arm/boot/dts/keystone-k2g-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2g-evm.dts
@@ -392,7 +392,7 @@ &qspi {
pinctrl-0 = <&qspi_pins>;
cdns,rclk-en;

- flash0: m25p80@0 {
+ flash0: flash@0 {
compatible = "s25fl512s", "jedec,spi-nor";
reg = <0>;
spi-tx-bus-width = <1>;
diff --git a/arch/arm/boot/dts/keystone-k2g-ice.dts b/arch/arm/boot/dts/keystone-k2g-ice.dts
index 2a2d38cf0fff..bd84d7f0f2fe 100644
--- a/arch/arm/boot/dts/keystone-k2g-ice.dts
+++ b/arch/arm/boot/dts/keystone-k2g-ice.dts
@@ -325,7 +325,7 @@ &qspi {
cdns,rclk-en;
status = "okay";

- flash0: m25p80@0 {
+ flash0: flash@0 {
compatible = "s25fl256s1", "jedec,spi-nor";
reg = <0>;
spi-tx-bus-width = <1>;
diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
index ad4e22afe133..f968af0bfad3 100644
--- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
@@ -161,7 +161,7 @@ dtt@50 {
};

&spi0 {
- nor_flash: n25q128a11@0 {
+ nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
index e200533d26a4..32619b3c5804 100644
--- a/arch/arm/boot/dts/keystone-k2l-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
@@ -110,7 +110,7 @@ partition@180000 {
};

&spi0 {
- nor_flash: n25q128a11@0 {
+ nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
--
2.32.0

2022-04-07 21:03:33

by Krzysztof Kozlowski

Subject: [PATCH 2/2] ARM: dts: keystone: fix case in SPI NOR node compatible

Vendor prefix in compatible should be lower-case.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
index 8f49883a675e..9e507293a8d7 100644
--- a/arch/arm/boot/dts/keystone-k2e-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
@@ -140,7 +140,7 @@ &spi0 {
nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "Micron,n25q128a11";
+ compatible = "micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
index f968af0bfad3..1a1a49c19a19 100644
--- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
@@ -164,7 +164,7 @@ &spi0 {
nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "Micron,n25q128a11";
+ compatible = "micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
index 32619b3c5804..06d55b89170d 100644
--- a/arch/arm/boot/dts/keystone-k2l-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
@@ -113,7 +113,7 @@ &spi0 {
nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "Micron,n25q128a11";
+ compatible = "micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
--
2.32.0

2022-04-08 11:49:07

by Grygorii Strashko

Subject: Re: [PATCH 2/2] ARM: dts: keystone: fix case in SPI NOR node compatible

On 07/04/2022 17:31, Krzysztof Kozlowski wrote:
> Vendor prefix in compatible should be lower-case.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
> index 8f49883a675e..9e507293a8d7 100644
> --- a/arch/arm/boot/dts/keystone-k2e-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
> @@ -140,7 +140,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> index f968af0bfad3..1a1a49c19a19 100644
> --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> @@ -164,7 +164,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
> index 32619b3c5804..06d55b89170d 100644
> --- a/arch/arm/boot/dts/keystone-k2l-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
> @@ -113,7 +113,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;

Thanks you.
Reviewed-by: Grygorii Strashko <[email protected]>

--
Best regards,
Grygorii, Ukraine

2022-04-08 15:43:55

by Grygorii Strashko

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

On 07/04/2022 17:31, Krzysztof Kozlowski wrote:
> The node names should be generic and SPI NOR dtschema expects "flash".
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2g-ice.dts | 2 +-
> arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
> index 66fec5f5d081..8f49883a675e 100644
> --- a/arch/arm/boot/dts/keystone-k2e-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
> @@ -137,7 +137,7 @@ partition@180000 {
> };
>
> &spi0 {
> - nor_flash: n25q128a11@0 {
> + nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "Micron,n25q128a11";
> diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts
> index d800f26b6275..88be868cf71e 100644
> --- a/arch/arm/boot/dts/keystone-k2g-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts
> @@ -392,7 +392,7 @@ &qspi {
> pinctrl-0 = <&qspi_pins>;
> cdns,rclk-en;
>
> - flash0: m25p80@0 {
> + flash0: flash@0 {
> compatible = "s25fl512s", "jedec,spi-nor";
> reg = <0>;
> spi-tx-bus-width = <1>;
> diff --git a/arch/arm/boot/dts/keystone-k2g-ice.dts b/arch/arm/boot/dts/keystone-k2g-ice.dts
> index 2a2d38cf0fff..bd84d7f0f2fe 100644
> --- a/arch/arm/boot/dts/keystone-k2g-ice.dts
> +++ b/arch/arm/boot/dts/keystone-k2g-ice.dts
> @@ -325,7 +325,7 @@ &qspi {
> cdns,rclk-en;
> status = "okay";
>
> - flash0: m25p80@0 {
> + flash0: flash@0 {
> compatible = "s25fl256s1", "jedec,spi-nor";
> reg = <0>;
> spi-tx-bus-width = <1>;
> diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> index ad4e22afe133..f968af0bfad3 100644
> --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> @@ -161,7 +161,7 @@ dtt@50 {
> };
>
> &spi0 {
> - nor_flash: n25q128a11@0 {
> + nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "Micron,n25q128a11";
> diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
> index e200533d26a4..32619b3c5804 100644
> --- a/arch/arm/boot/dts/keystone-k2l-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
> @@ -110,7 +110,7 @@ partition@180000 {
> };
>
> &spi0 {
> - nor_flash: n25q128a11@0 {
> + nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "Micron,n25q128a11";

Thank you
Reviewed-by: Grygorii Strashko <[email protected]>


--
Best regards,
Grygorii, Ukraine

2022-04-16 00:27:29

by Nishanth Menon

Subject: Re: [PATCH 2/2] ARM: dts: keystone: fix case in SPI NOR node compatible

On 16:31-20220407, Krzysztof Kozlowski wrote:
> Vendor prefix in compatible should be lower-case.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +-
> arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
> index 8f49883a675e..9e507293a8d7 100644
> --- a/arch/arm/boot/dts/keystone-k2e-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
> @@ -140,7 +140,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> index f968af0bfad3..1a1a49c19a19 100644
> --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
> @@ -164,7 +164,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;
> diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
> index 32619b3c5804..06d55b89170d 100644
> --- a/arch/arm/boot/dts/keystone-k2l-evm.dts
> +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
> @@ -113,7 +113,7 @@ &spi0 {
> nor_flash: flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "Micron,n25q128a11";
> + compatible = "micron,n25q128a11";
> spi-max-frequency = <54000000>;
> m25p,fast-read;
> reg = <0>;


I have no idea how this works. There is no documentation for the
compatible, So I am guessing adding it to Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
is appropriate prior to replacing with "micron,n25q128a11", "jedec,spi-nor";

$ git grep micron,n25q128a11 .
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
arch/arm/boot/dts/keystone-k2e-evm.dts: compatible = "micron,n25q128a11";
arch/arm/boot/dts/keystone-k2hk-evm.dts: compatible = "micron,n25q128a11";
arch/arm/boot/dts/keystone-k2l-evm.dts: compatible = "micron,n25q128a11";
arch/powerpc/boot/dts/fsl/t1024qds.dts: compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
arch/powerpc/boot/dts/fsl/t104xqds.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
arch/powerpc/boot/dts/fsl/t208xqds.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */


--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D

2022-04-17 23:03:09

by Krzysztof Kozlowski

Subject: Re: [PATCH 2/2] ARM: dts: keystone: fix case in SPI NOR node compatible

On 15/04/2022 20:54, Nishanth Menon wrote:
>
> I have no idea how this works. There is no documentation for the
> compatible, So I am guessing adding it to Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
> is appropriate prior to replacing with "micron,n25q128a11", "jedec,spi-nor";

Compatible is documented in jedec,spi-nor.yaml (through pattern),
although it should be followed by "jedec,spi-nor", according to schema.
I did not fix that missing compatible fallback, because I did not want
to break any setup (I cannot test it), but adding the fallback seems
harmless/safe.
>
> $ git grep micron,n25q128a11 .
> arch/arm/boot/dts/imx6qdl-aristainetos.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
> arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
> arch/arm/boot/dts/keystone-k2e-evm.dts: compatible = "micron,n25q128a11";
> arch/arm/boot/dts/keystone-k2hk-evm.dts: compatible = "micron,n25q128a11";
> arch/arm/boot/dts/keystone-k2l-evm.dts: compatible = "micron,n25q128a11";
> arch/powerpc/boot/dts/fsl/t1024qds.dts: compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
> arch/powerpc/boot/dts/fsl/t104xqds.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor";
> arch/powerpc/boot/dts/fsl/t208xqds.dtsi: compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
>
>


Best regards,
Krzysztof