Commit a4da411e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.9/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes 

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
5.9, please pull the following:

- Florian fixes the Broadcom QSPI controller binding such that the most
  specific compatible string is the left most one, and all existing
  in-tree users are updated as well.

* tag 'arm-soc/for-5.9/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  arm64: dts: ns2: Fixed QSPI compatible string
  ARM: dts: BCM5301X: Fixed QSPI compatible string
  ARM: dts: NSP: Fixed QSPI compatible string
  ARM: dts: bcm: HR2: Fixed QSPI compatible string
  dt-bindings: spi: Fix spi-bcm-qspi compatible ordering

Link: https://lore.kernel.org/r/20200909211857.4144718-1-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2aedcb04 686e0a0c

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

+8 −8
Original line number Diff line number Diff line
@@ -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>,

arch/arm/boot/dts/bcm-hr2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
		};



		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>,

arch/arm/boot/dts/bcm-nsp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ 
		};



		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>,

arch/arm/boot/dts/bcm5301x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ 
	};



	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>,

arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ 
		};



		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>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE