Commit 3b796abd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree update for 5.9:

- Update i.MX8M OCOTP device node name to match .yaml schema.
- Add ftm_alarm0 device support for layerscape SoCs.
- Add DSPI controller support for lx2160a device.
- A series from Peng Fan to add aliases for various devices on i.MX8
  SoCs.
- Add Hantro G1/G2 VPU device support for imx8mq.
- Add more thermal zone support for ls1028a, ls1043a and ls1046a.
- Other small random changes.

* tag 'imx-dt64-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (26 commits)
  arm64: dts: lx2160a-rdb: fix shunt-resistor value
  arm64: dts: ls1028a-qds: Add DSPI flash nodes
  arm64: dts: lx2160a: Increase configuration space size
  arm64: dts: zii-ultra: update MDIO speed and preamble
  arm64: dts: ls1043a: update USB nodes status to match board config
  arm64: dts: imx8mn-evk: add pca9450 for i.mx8mn-evk board
  arm64: dts: imx8mp: add ddr pmu device node
  arm64: dts: ls1043a: add more thermal zone support
  arm64: dts: ls1046a: add more thermal zone support
  arm64: dts: layerscape: add ftm_alarm0 node
  arm64: dts: ls1028a: Add ftm_alarm0 DT node
  arm64: dts: lx2160a: add ftm_alarm0 DT node
  arm64: dts: lx2160a: add DT node for all DSPI controller
  arm64: dts: lx2160a: add dspi controller DT nodes
  arm64: dts: imx8mp: Add fallback compatible to ocotp node
  arm64: dts: imx8qxp: Add ethernet alias
  arm64: dts: imx8qxp: add i2c aliases
  arm64: dts: imx8qxp: add alias for lsio MU
  arm64: dts: imx8m: add mu node
  arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
  ...

Link: https://lore.kernel.org/r/20200720085536.24138-4-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d27895a1 7339115a

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

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


	aliases {

		crypto = &crypto;

		rtc1 = &ftm_alarm0;

		rtic-a = &rtic_a;

		rtic-b = &rtic_b;

		rtic-c = &rtic_c;
@@ -512,6 +513,20 @@ 
					<0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		rcpm: power-controller@1ee2140 {

			compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+";

			reg = <0x0 0x1ee2140 0x0 0x4>;

			#fsl,rcpm-wakeup-cells = <1>;

		};



		ftm_alarm0: timer@29d0000 {

			compatible = "fsl,ls1012a-ftm-alarm";

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

			fsl,rcpm-wakeup = <&rcpm 0x20000>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			big-endian;

		};

	};



	firmware {

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

+85 −0
Original line number Diff line number Diff line
@@ -107,6 +107,91 @@ 
	};

};



&dspi0 {

	bus-num = <0>;

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <0>;

		spi-max-frequency = <10000000>;

	};



	flash@1 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <1>;

		spi-max-frequency = <10000000>;

	};



	flash@2 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <2>;

		spi-max-frequency = <10000000>;

	};

};



&dspi1 {

	bus-num = <1>;

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <0>;

		spi-max-frequency = <10000000>;

	};



	flash@1 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <1>;

		spi-max-frequency = <10000000>;

	};



	flash@2 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <2>;

		spi-max-frequency = <10000000>;

	};

};



&dspi2 {

	bus-num = <2>;

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-cpol;

		spi-cpha;

		reg = <0>;

		spi-max-frequency = <10000000>;

	};

};



&duart0 {

	status = "okay";

};

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

+38 −1
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		rtc1 = &ftm_alarm0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -129,11 +133,31 @@ 
	};



	thermal-zones {

		core-cluster {

		ddr-controller {

			polling-delay-passive = <1000>;

			polling-delay = <5000>;

			thermal-sensors = <&tmu 0>;



			trips {

				ddr-ctrler-alert {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};



				ddr-ctrler-crit {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		core-cluster {

			polling-delay-passive = <1000>;

			polling-delay = <5000>;

			thermal-sensors = <&tmu 1>;



			trips {

				core_cluster_alert: core-cluster-alert {

					temperature = <85000>;
@@ -983,6 +1007,19 @@ 
				};

			};

		};



		rcpm: power-controller@1e34040 {

			compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";

			reg = <0x0 0x1e34040 0x0 0x1c>;

			#fsl,rcpm-wakeup-cells = <7>;

		};



		ftm_alarm0: timer@2800000 {

			compatible = "fsl,ls1028a-ftm-alarm";

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

			fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0 0x0>;

			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

		};

	};



	malidp0: display@f080000 {

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

+4 −0
Original line number Diff line number Diff line
@@ -148,4 +148,8 @@ 
	};

};



&usb0 {

	status = "okay";

};



#include "fsl-ls1043-post.dtsi"

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

+8 −0
Original line number Diff line number Diff line
@@ -209,3 +209,11 @@ 
		fsl,tdm-interface;

	};

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE