[PATCH 0/5] qspi binding and DTS fixes

[PATCH 0/5] qspi binding and DTS fixes

[Florian Fainelli]

Hi all,

This patch series fixes incorrectly defined compatible strings for the
Broadcom QSPI controller which resulted in the strings not being
ordered from most to least compatible.

We will need to apply some changes to the spi-bcm-qspi.c driver in
the future to assume no revision register exist, and these patches
are a preliminary step towards that goal.

Florian Fainelli (5):
  dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
  ARM: dts: bcm: HR2: Fixed QSPI compatible string
  ARM: dts: NSP: Fixed QSPI compatible string
  ARM: dts: BCM5301X: Fixed QSPI compatible string
  arm64: dts: ns2: Fixed QSPI compatible string

 .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
 arch/arm/boot/dts/bcm-hr2.dtsi                   |  2 +-
 arch/arm/boot/dts/bcm-nsp.dtsi                   |  2 +-
 arch/arm/boot/dts/bcm5301x.dtsi                  |  2 +-
 arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.25.1

[PATCH 1/5] dt-bindings: spi: Fix spi-bcm-qspi compatible ordering

[Florian Fainelli]

The binding is currently incorrectly defining the compatible strings
from least specific to most specific instead of the converse. Re-order
them from most specific (left) to least specific (right) and fix the
examples as well.

Fixes: 5fc78f4c842a ("spi: Broadcom BRCMSTB, NSP, NS2 SoC bindings")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
index f5e518d099f2..62d4ed2d7fd7 100644
--- a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+++ b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
@@ -23,8 +23,8 @@ Required properties:
 
 - compatible:
     Must be one of :
-    "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-qspi" : MSPI+BSPI on BRCMSTB SoCs
-    "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
+    "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on BRCMSTB SoCs
+    "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi" : Second Instance of MSPI
 						   BRCMSTB  SoCs
     "brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
     			     			  			    BRCMSTB  SoCs
@@ -36,8 +36,8 @@ Required properties:
     			     			  			    BRCMSTB  SoCs
     "brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
     			     			  			    BRCMSTB  SoCs
-    "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"     : MSPI+BSPI on Cygnus, NSP
-    "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi"     : NS2 SoCs
+    "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"     : MSPI+BSPI on Cygnus, NSP
+    "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi"     : NS2 SoCs
 
 - reg:
     Define the bases and ranges of the associated I/O address spaces.
@@ -86,7 +86,7 @@ BRCMSTB SoC Example:
     spi@f03e3400 {
 		#address-cells = <0x1>;
 		#size-cells = <0x0>;
-		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-qspi";
+		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi";
 		reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>;
 		reg-names = "cs_reg", "mspi", "bspi";
 		interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>;
@@ -149,7 +149,7 @@ BRCMSTB SoC Example:
 		#address-cells = <1>;
 		#size-cells = <0>;
 		clocks = <&upg_fixed>;
-		compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-mspi";
+		compatible = "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi";
 		reg = <0xf0416000 0x180>;
 		reg-names = "mspi";
 		interrupts = <0x14>;
@@ -160,7 +160,7 @@ BRCMSTB SoC Example:
 iProc SoC Example:
 
     qspi: spi@18027200 {
-	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
+	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
 	reg = <0x18027200 0x184>,
 	      <0x18027000 0x124>,
 	      <0x1811c408 0x004>,
@@ -191,7 +191,7 @@ iProc SoC Example:
  NS2 SoC Example:
 
 	       qspi: spi@66470200 {
-		       compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";
+		       compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
 		       reg = <0x66470200 0x184>,
 			     <0x66470000 0x124>,
 			     <0x67017408 0x004>,
-- 
2.25.1

Re: [PATCH 1/5] dt-bindings: spi: Fix spi-bcm-qspi compatible ordering

[Rob Herring]

On Thu, 27 Aug 2020 11:18:38 -0700, Florian Fainelli wrote:
> The binding is currently incorrectly defining the compatible strings
> from least specific to most specific instead of the converse. Re-order
> them from most specific (left) to least specific (right) and fix the
> examples as well.
> 
> Fixes: 5fc78f4c842a ("spi: Broadcom BRCMSTB, NSP, NS2 SoC bindings")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
>  .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/5] dt-bindings: spi: Fix spi-bcm-qspi compatible ordering

[Florian Fainelli]

On 9/9/2020 1:41 PM, Rob Herring wrote:
> On Thu, 27 Aug 2020 11:18:38 -0700, Florian Fainelli wrote:
>> The binding is currently incorrectly defining the compatible strings
>> from least specific to most specific instead of the converse. Re-order
>> them from most specific (left) to least specific (right) and fix the
>> examples as well.
>>
>> Fixes: 5fc78f4c842a ("spi: Broadcom BRCMSTB, NSP, NS2 SoC bindings")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> ---
>>   .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
>>   1 file changed, 8 insertions(+), 8 deletions(-)
>>
> 
> Reviewed-by: Rob Herring <robh@kernel.org>
> 

Thanks, and sorry about the nagging on IRC :)
-- 
Florian

[PATCH 2/5] ARM: dts: bcm: HR2: Fixed QSPI compatible string

[Florian Fainelli]

The string was incorrectly defined before from least to most specific,
swap the compatible strings accordingly.

Fixes: b9099ec754b5 ("ARM: dts: Add Broadcom Hurricane 2 DTS include file")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/bcm-hr2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi
index cbebed5f050e..e8df458aad39 100644
--- a/arch/arm/boot/dts/bcm-hr2.dtsi
+++ b/arch/arm/boot/dts/bcm-hr2.dtsi
@@ -217,7 +217,7 @@ rng: rng@33000 {
 		};
 
 		qspi: spi@27200 {
-			compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
+			compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
 			reg = <0x027200 0x184>,
 			      <0x027000 0x124>,
 			      <0x11c408 0x004>,
-- 
2.25.1

[PATCH 3/5] ARM: dts: NSP: Fixed QSPI compatible string

[Florian Fainelli]

The string was incorrectly defined before from least to most
specific, swap the compatible strings accordingly.

Fixes: 329f98c1974e ("ARM: dts: NSP: Add QSPI nodes to NSPI and bcm958625k DTSes")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 0346ea621f0f..c846fa3c244d 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -284,7 +284,7 @@ nand: nand@26000 {
 		};
 
 		qspi: spi@27200 {
-			compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
+			compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
 			reg = <0x027200 0x184>,
 			      <0x027000 0x124>,
 			      <0x11c408 0x004>,
-- 
2.25.1

[PATCH 4/5] ARM: dts: BCM5301X: Fixed QSPI compatible string

[Florian Fainelli]

The string was incorrectly defined before from least to most
specific, swap the compatible strings accordingly.

Fixes: 1c8f40650723 ("ARM: dts: BCM5301X: convert to iProc QSPI")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 2d9b4dd05830..0016720ce530 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -488,7 +488,7 @@ nand: nand@18028000 {
 	};
 
 	spi@18029200 {
-		compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
+		compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
 		reg = <0x18029200 0x184>,
 		      <0x18029000 0x124>,
 		      <0x1811b408 0x004>,
-- 
2.25.1

[PATCH 5/5] arm64: dts: ns2: Fixed QSPI compatible string

[Florian Fainelli]

The string was incorrectly defined before from least to most specific,
swap the compatible strings accordingly.

Fixes: ff73917d38a6 ("ARM64: dts: Add QSPI Device Tree node for NS2")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
index 15f7b0ed3836..39802066232e 100644
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
@@ -745,7 +745,7 @@ nand: nand@66460000 {
 		};
 
 		qspi: spi@66470200 {
-			compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";
+			compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
 			reg = <0x66470200 0x184>,
 				<0x66470000 0x124>,
 				<0x67017408 0x004>,
-- 
2.25.1

Re: [PATCH 0/5] qspi binding and DTS fixes

[Scott Branden]

Patch series looks good.

Acked-by: Scott Branden <scott.branden@broadcom.com>

On 2020-08-27 11:18 a.m., Florian Fainelli wrote:
> Hi all,
>
> This patch series fixes incorrectly defined compatible strings for the
> Broadcom QSPI controller which resulted in the strings not being
> ordered from most to least compatible.
>
> We will need to apply some changes to the spi-bcm-qspi.c driver in
> the future to assume no revision register exist, and these patches
> are a preliminary step towards that goal.
>
> Florian Fainelli (5):
>   dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
>   ARM: dts: bcm: HR2: Fixed QSPI compatible string
>   ARM: dts: NSP: Fixed QSPI compatible string
>   ARM: dts: BCM5301X: Fixed QSPI compatible string
>   arm64: dts: ns2: Fixed QSPI compatible string
>
>  .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
>  arch/arm/boot/dts/bcm-hr2.dtsi                   |  2 +-
>  arch/arm/boot/dts/bcm-nsp.dtsi                   |  2 +-
>  arch/arm/boot/dts/bcm5301x.dtsi                  |  2 +-
>  arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |  2 +-
>  5 files changed, 12 insertions(+), 12 deletions(-)
>

Re: [PATCH 0/5] qspi binding and DTS fixes

[Kamal Dasu]

Looks good to me.

Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>

On Thu, Aug 27, 2020 at 3:30 PM Scott Branden
<scott.branden@broadcom.com> wrote:
>
> Patch series looks good.
>
> Acked-by: Scott Branden <scott.branden@broadcom.com>
>
> On 2020-08-27 11:18 a.m., Florian Fainelli wrote:
> > Hi all,
> >
> > This patch series fixes incorrectly defined compatible strings for the
> > Broadcom QSPI controller which resulted in the strings not being
> > ordered from most to least compatible.
> >
> > We will need to apply some changes to the spi-bcm-qspi.c driver in
> > the future to assume no revision register exist, and these patches
> > are a preliminary step towards that goal.
> >
> > Florian Fainelli (5):
> >   dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
> >   ARM: dts: bcm: HR2: Fixed QSPI compatible string
> >   ARM: dts: NSP: Fixed QSPI compatible string
> >   ARM: dts: BCM5301X: Fixed QSPI compatible string
> >   arm64: dts: ns2: Fixed QSPI compatible string
> >
> >  .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
> >  arch/arm/boot/dts/bcm-hr2.dtsi                   |  2 +-
> >  arch/arm/boot/dts/bcm-nsp.dtsi                   |  2 +-
> >  arch/arm/boot/dts/bcm5301x.dtsi                  |  2 +-
> >  arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |  2 +-
> >  5 files changed, 12 insertions(+), 12 deletions(-)
> >
>

Re: [PATCH 0/5] qspi binding and DTS fixes

[Florian Fainelli]

On 8/27/2020 11:18 AM, Florian Fainelli wrote:
> Hi all,
> 
> This patch series fixes incorrectly defined compatible strings for the
> Broadcom QSPI controller which resulted in the strings not being
> ordered from most to least compatible.
> 
> We will need to apply some changes to the spi-bcm-qspi.c driver in
> the future to assume no revision register exist, and these patches
> are a preliminary step towards that goal.

Rob, can I get your tag for this patch series so it can be sent out? Thanks!

> 
> Florian Fainelli (5):
>    dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
>    ARM: dts: bcm: HR2: Fixed QSPI compatible string
>    ARM: dts: NSP: Fixed QSPI compatible string
>    ARM: dts: BCM5301X: Fixed QSPI compatible string
>    arm64: dts: ns2: Fixed QSPI compatible string
> 
>   .../bindings/spi/brcm,spi-bcm-qspi.txt           | 16 ++++++++--------
>   arch/arm/boot/dts/bcm-hr2.dtsi                   |  2 +-
>   arch/arm/boot/dts/bcm-nsp.dtsi                   |  2 +-
>   arch/arm/boot/dts/bcm5301x.dtsi                  |  2 +-
>   arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |  2 +-
>   5 files changed, 12 insertions(+), 12 deletions(-)
> 

-- 
Florian

Re: [PATCH 0/5] qspi binding and DTS fixes

[Florian Fainelli]

On 8/27/2020 11:18 AM, Florian Fainelli wrote:
> Hi all,
> 
> This patch series fixes incorrectly defined compatible strings for the
> Broadcom QSPI controller which resulted in the strings not being
> ordered from most to least compatible.
> 
> We will need to apply some changes to the spi-bcm-qspi.c driver in
> the future to assume no revision register exist, and these patches
> are a preliminary step towards that goal.

Series applied to devicetree/fixes, sending the PR shortly.
-- 
Florian