[PATCH] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[PATCH] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Michal Suchanek]

Without "jedec,spi-nor" compatible the flash memory cannot be probed by
u-boot.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index f19ed981da9d..d114bbc5f441 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -169,7 +169,7 @@ &spi0 {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+		compatible = "mxicy,mx25l1606e", "winbond,w25q128", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 	};
-- 
2.35.3

Re: [PATCH] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Andre Przywara]

On Thu,  7 Jul 2022 18:38:55 +0200
Michal Suchanek <msuchanek@suse.de> wrote:

Hi,

> Without "jedec,spi-nor" compatible the flash memory cannot be probed by
> u-boot.
> 
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
>  arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> index f19ed981da9d..d114bbc5f441 100644
> --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> @@ -169,7 +169,7 @@ &spi0 {
>  	flash@0 {
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> -		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
> +		compatible = "mxicy,mx25l1606e", "winbond,w25q128", "jedec,spi-nor";

Naming three compatible strings violates the binding:
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dtb: flash@0: compatible: 'oneOf' conditional failed, one must be fixed:
        ['mxicy,mx25l1606e', 'winbond,w25q128', 'jedec,spi-nor'] is too long
        'mxicy,mx25l1606e' is not one of ['issi,is25lp016d', 'micron,mt25qu02g', 'mxicy,mx25r1635f', 'mxicy,mx25u6435f', 'mxicy,mx25v8035f', 'spansion,s25sl12801', 'spansion,s25fs512s']
        'jedec,spi-nor' was expected
        From schema: Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

Not entirely sure why it didn't scream before, actually, because to me it
looks like ending in jedec,spi-nor is mandatory.
Anyway, IIUC the Macronix chip was the one shipped with the (later)
boards, so we should use just that and "jedec,spi-nor".
The actual vendor would be detected at runtime anyway.

Cheers,
Andre

>  		reg = <0>;
>  		spi-max-frequency = <40000000>;
>  	};

[PATCH v2] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Michal Suchanek]

Without "jedec,spi-nor" compatible the flash memory cannot be probed by
u-boot. The macronix part is what is shipped on the boards that come
with a flash chip.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index f19ed981da9d..3706216ffb40 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -169,7 +169,7 @@ &spi0 {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 	};
-- 
2.35.3

Re: [PATCH v2] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Jernej Škrabec]

Hi Michal,

Dne četrtek, 07. julij 2022 ob 19:07:20 CEST je Michal Suchanek napisal(a):
> Without "jedec,spi-nor" compatible the flash memory cannot be probed by
> u-boot. The macronix part is what is shipped on the boards that come
> with a flash chip.
> 
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>

Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Next time, please add changelog below --- line.

Best regards,
Jernej

Re: [PATCH v2] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Samuel Holland]

Hi Michal,

The subject prefix should start with "ARM: dts:" (e.g. "ARM: dts: sunxi:").
Generally it is a good idea to look at the log of the file and follow the
pattern you see there.

On 7/7/22 12:07 PM, Michal Suchanek wrote:
> Without "jedec,spi-nor" compatible the flash memory cannot be probed by
> u-boot. The macronix part is what is shipped on the boards that come
> with a flash chip.
> 

Fixes: 45857ae95478 ("ARM: dts: orange-pi-zero: add node for SPI NOR")

Regards,
Samuel

> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
>  arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> index f19ed981da9d..3706216ffb40 100644
> --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> @@ -169,7 +169,7 @@ &spi0 {
>  	flash@0 {
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> -		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
> +		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
>  		reg = <0>;
>  		spi-max-frequency = <40000000>;
>  	};
> 

Re: [PATCH v2] sunxi: dts: Fix SPI NOR campatible on Orange Pi Zero

[Jernej Škrabec]

Hi Michal,

sorry, but I was a bit too quick with giving r-b line. See comments below.

Dne petek, 08. julij 2022 ob 09:36:26 CEST je Samuel Holland napisal(a):
> Hi Michal,
> 
> The subject prefix should start with "ARM: dts:" (e.g. "ARM: dts: sunxi:").
> Generally it is a good idea to look at the log of the file and follow the
> pattern you see there.
> 
> On 7/7/22 12:07 PM, Michal Suchanek wrote:
> > Without "jedec,spi-nor" compatible the flash memory cannot be probed by
> > u-boot. The macronix part is what is shipped on the boards that come
> > with a flash chip.

Please reword this a bit. DT isn't user specific, so U-Boot should not be 
mentioned. But you can write about compatible being wrong. According to DT 
bindings, it should be manufacturer specific compatible, followed by 
"jedec,spi-nor".

Once both issues are addressed, you can keep my r-b tag and include fixes tag 
posted by Sameul.

Best regards,
Jernej

> 
> Fixes: 45857ae95478 ("ARM: dts: orange-pi-zero: add node for SPI NOR")
> 
> Regards,
> Samuel
> 
> > Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> > ---
> > 
> >  arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> > b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts index
> > f19ed981da9d..3706216ffb40 100644
> > --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> > +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
> > @@ -169,7 +169,7 @@ &spi0 {
> > 
> >  	flash@0 {
> >  	
> >  		#address-cells = <1>;
> >  		#size-cells = <1>;
> > 
> > -		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
> > +		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
> > 
> >  		reg = <0>;
> >  		spi-max-frequency = <40000000>;
> >  	
> >  	};

[PATCH v2] ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero

[Michal Suchanek]

The device tree should include generic "jedec,spi-nor" compatible, and a
manufacturer-specific one.
The macronix part is what is shipped on the boards that come with a
flash chip.

Fixes: 45857ae95478 ("ARM: dts: orange-pi-zero: add node for SPI NOR")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
v2: drop winbond compatible
v3: reword commit message
---
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index f19ed981da9d..3706216ffb40 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -169,7 +169,7 @@ &spi0 {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 	};
-- 
2.35.3

Re: [PATCH v2] ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero

[Jernej Škrabec]

Dne petek, 08. julij 2022 ob 19:45:29 CEST je Michal Suchanek napisal(a):
> The device tree should include generic "jedec,spi-nor" compatible, and a
> manufacturer-specific one.
> The macronix part is what is shipped on the boards that come with a
> flash chip.
> 
> Fixes: 45857ae95478 ("ARM: dts: orange-pi-zero: add node for SPI NOR")
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Applied, thanks!

Best regards,
Jernej