Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45cba78 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt64-4.15' of... 

Merge tag 'imx-dt64-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Pull "Freescale arm64 device tree updates for 4.15" from Shawn Guo:

 - Add GICv3 ITS node and PCIe devcies for LS1088A support.
 - Enable PCIe support for LS2088A SoC.
 - Add OP-TEE support for various Layerscape SoCs, LS1012A, LS1043A,
   LS1046A, LS1088A and LS208XA.
 - Update DPAA QBMan nodes to use constant defines in the interrupt
   description.
 - Add DSPI device to support SPI-NOR on LS1012A based boards.

* tag 'imx-dt64-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: update the DPAA QBMan nodes
  arm64: dts: ls1088a: add PCIe controller DT nodes
  arm64: dts: ls1088a: add gicv3 ITS DT node
  arm64: dts: ls2088a: add pcie support
  arm64: dts: ls: Add optee node
  dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list
  dt-bindings: spi: Add fsl,ls1012a-dspi compatible string
  arm64: dts: ls1012a: add the DTS node for DSPI support
parents 25b83848 e54b911f

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
                 at25df321a

                 at25df641

                 at26df081a

                 en25s64

                 mr25h256

                 mr25h10

                 mr25h40
@@ -31,6 +32,7 @@ Required properties: 
                 s25fl008k

                 s25fl064k

                 sst25vf040b

                 sst25wf040b

                 m25p40

                 m25p80

                 m25p16

Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
		"fsl,ls2085a-dspi"

		or

		"fsl,ls2080a-dspi" followed by "fsl,ls2085a-dspi"

		"fsl,ls1012a-dspi" followed by "fsl,ls1021a-v1.0-dspi"

- reg : Offset and length of the register set for the device

- interrupts : Should contain SPI controller interrupt

- clocks: from common clock binding: handle to dspi clock.

arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts

+33 −0
Original line number Diff line number Diff line
@@ -93,6 +93,39 @@ 
	};

};



&dspi {

	bus-num = <0>;

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q128a11", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <10000000>;

	};



	flash@1 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "sst25wf040b", "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <1>;

		spi-max-frequency = <10000000>;

	};



	flash@2 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "en25s64", "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <2>;

		spi-max-frequency = <10000000>;

	};

};



&duart0 {

	status = "okay";

};

arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -355,6 +355,19 @@ 
			status = "disabled";

		};



		dspi: dspi@2100000 {

			compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0 0x2100000 0x0 0x10000>;

			interrupts = <0 64 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "dspi";

			clocks = <&clockgen 4 0>;

			spi-num-chipselects = <5>;

			big-endian;

			status = "disabled";

		};



		duart0: serial@21c0500 {

			compatible = "fsl,ns16550", "ns16550a";

			reg = <0x00 0x21c0500 0x0 0x100>;
@@ -472,4 +485,11 @@ 
			phy_type = "ulpi";

		};

	};



	firmware {

		optee {

			compatible = "linaro,optee-tz";

			method = "smc";

		};

	};

};

arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

+9 −2
Original line number Diff line number Diff line
@@ -376,14 +376,14 @@ 
		qman: qman@1880000 {

			compatible = "fsl,qman";

			reg = <0x0 0x1880000 0x0 0x10000>;

			interrupts = <0 45 0x4>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			memory-region = <&qman_fqd &qman_pfdr>;

		};



		bman: bman@1890000 {

			compatible = "fsl,bman";

			reg = <0x0 0x1890000 0x0 0x10000>;

			interrupts = <0 45 0x4>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			memory-region = <&bman_fbpr>;

		};
@@ -749,6 +749,13 @@ 
		};

	};



	firmware {

		optee {

			compatible = "linaro,optee-tz";

			method = "smc";

		};

	};



};



#include "qoriq-qman-portals.dtsi"