Skip to content

Commit fcd2e4b

Browse files
committed
dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
The binding is currently incorrectly defining the compatible strings from least specifice 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: 5fc78f4 ("spi: Broadcom BRCMSTB, NSP, NS2 SoC bindings") Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
1 parent 9123e3a commit fcd2e4b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Required properties:
2323

2424
- compatible:
2525
Must be one of :
26-
"brcm,spi-bcm-qspi", "brcm,spi-brcmstb-qspi" : MSPI+BSPI on BRCMSTB SoCs
27-
"brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
26+
"brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on BRCMSTB SoCs
27+
"brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi" : Second Instance of MSPI
2828
BRCMSTB SoCs
2929
"brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
3030
BRCMSTB SoCs
@@ -36,8 +36,8 @@ Required properties:
3636
BRCMSTB SoCs
3737
"brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
3838
BRCMSTB SoCs
39-
"brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi" : MSPI+BSPI on Cygnus, NSP
40-
"brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi" : NS2 SoCs
39+
"brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on Cygnus, NSP
40+
"brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi" : NS2 SoCs
4141

4242
- reg:
4343
Define the bases and ranges of the associated I/O address spaces.
@@ -86,7 +86,7 @@ BRCMSTB SoC Example:
8686
spi@f03e3400 {
8787
#address-cells = <0x1>;
8888
#size-cells = <0x0>;
89-
compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-qspi";
89+
compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi";
9090
reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>;
9191
reg-names = "cs_reg", "mspi", "bspi";
9292
interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>;
@@ -149,7 +149,7 @@ BRCMSTB SoC Example:
149149
#address-cells = <1>;
150150
#size-cells = <0>;
151151
clocks = <&upg_fixed>;
152-
compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-mspi";
152+
compatible = "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi";
153153
reg = <0xf0416000 0x180>;
154154
reg-names = "mspi";
155155
interrupts = <0x14>;
@@ -160,7 +160,7 @@ BRCMSTB SoC Example:
160160
iProc SoC Example:
161161

162162
qspi: spi@18027200 {
163-
compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
163+
compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
164164
reg = <0x18027200 0x184>,
165165
<0x18027000 0x124>,
166166
<0x1811c408 0x004>,
@@ -191,7 +191,7 @@ iProc SoC Example:
191191
NS2 SoC Example:
192192

193193
qspi: spi@66470200 {
194-
compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";
194+
compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
195195
reg = <0x66470200 0x184>,
196196
<0x66470000 0x124>,
197197
<0x67017408 0x004>,

0 commit comments

Comments
 (0)