Commit 06e78df3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX arm64 device tree changes for 5.5:
 - Add the initial support for a new arm64 family SoC from NXP:
   S32V234 ("Treerunner") vision microprocessors which are targeted for
   high-performance, computationally intensive vision and sensor fusion
   applications that require automotive safety levels.
 - New board support: i.MX8MN LPDDR4 EVK, i.MX8QXP Colibri and
   S32V234 EVB.
 - A series of patch from Andrey Smirnov to improve zii-ultra support by
   fixing regulator and adding accelerometer, switch watchdog.
 - Add system counter device and enable cpuidle support for i.MX8MN.
 - Move usdhc clocks assignment from SoC to board level DTS for
   i.MX8 based boards.
 - Add PCA6416 on I2C3 bus for imx8mm-evk, and enable SCU key for
   imx8qxp-mek board.
 - Enable GPU passive throttling on i.MX8MQ SoC, and add DDR PMU device
   for i.MX8MN.
 - A series from Fabio Estevam to fix DTC W=1 warnings for LS1028A device.
 - Update the clock providers for the Mali DP500 and '#clock-cells' of
   DPCLK node for LS1028A SoC.
 - Misc small updates on various boards.

* tag 'imx-dt64-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits)
  arm64: dts: imx8mn-evk: Remove invalid Atheros properties
  arm64: dts: freescale: add initial support for colibri imx8x
  arm64: dts: ls1028a: Fix tmu unit address
  arm64: dts: ls1028a: Move thermal-zone out of SoC
  arm64: dts: ls1028a-qds: Remove unnecessary #address-cells/#size-cells
  arm64: dts: imx8mn: Remove duplicated machine compatible
  arm64: dts: imx8mm: Remove duplicated machine compatible
  arm64: dts: imx8mq-evk: Add remote control
  arm64: dts: imx8mn: Add LPDDR4 EVK board support
  arm64: dts: imx8mn: Create EVK dtsi file for common use
  arm64: dts: imx8mn: Move usdhc clocks assignment to board DT
  arm64: dts: imx8mm: Move usdhc clocks assignment to board DT
  arm64: dts: imx8mq: Move usdhc clocks assignment to board DT
  arm64: dts: imx8qxp: Move usdhc clocks assignment to board DT
  arm64: dts: fsl: Add device tree for S32V234-EVB
  arm64: dts: imx8mm-evk: Assigned clocks for audio plls
  arm64: dts: zii-ultra: Add node for switch watchdog
  arm64: dts: zii-ultra: Add node for accelerometer
  arm64: dts: zii-ultra: Fix regulator-3p3-main's name
  arm64: dts: zii-ultra: Fix regulator-vsd-3v3's vin-supply
  ...

Link: https://lore.kernel.org/r/20191105150315.15477-5-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 405b7b27 227125fe

arch/arm64/boot/dts/freescale/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb



dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb
@@ -31,4 +32,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-rmb3.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-zest.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb



dtb-$(CONFIG_ARCH_S32) += s32v234-evb.dtb

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

+0 −2
Original line number Diff line number Diff line
@@ -194,8 +194,6 @@ 
	};



	fpga@66 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "fsl,ls1028aqds-fpga", "fsl,fpga-qixis-i2c",

			     "simple-mfd";

		reg = <0x66>;

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

+4 −0
Original line number Diff line number Diff line
@@ -184,3 +184,7 @@ 
&sata {

	status = "okay";

};



&usb1 {

	dr_mode = "otg";

};

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

+35 −48
Original line number Diff line number Diff line
@@ -82,22 +82,8 @@ 
	dpclk: clock-controller@f1f0000 {

		compatible = "fsl,ls1028a-plldig";

		reg = <0x0 0xf1f0000 0x0 0xffff>;

		#clock-cells = <1>;

		clocks = <&osc_27m>;

	};



	aclk: clock-axi {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <650000000>;

		clock-output-names= "aclk";

	};



	pclk: clock-apb {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <650000000>;

		clock-output-names= "pclk";

		clocks = <&osc_27m>;

	};



	reboot {
@@ -142,6 +128,37 @@ 
		};

	};



	thermal-zones {

		core-cluster {

			polling-delay-passive = <1000>;

			polling-delay = <5000>;

			thermal-sensors = <&tmu 0>;



			trips {

				core_cluster_alert: core-cluster-alert {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};



				core_cluster_crit: core-cluster-crit {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};



			cooling-maps {

				map0 {

					trip = <&core_cluster_alert>;

					cooling-device =

						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

				};

			};

		};

	};



	soc: soc {

		compatible = "simple-bus";

		#address-cells = <2>;
@@ -542,7 +559,7 @@ 
			status = "disabled";

		};



		tmu: tmu@1f00000 {

		tmu: tmu@1f80000 {

			compatible = "fsl,qoriq-tmu";

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

			interrupts = <0 23 0x4>;
@@ -594,37 +611,6 @@ 
			#thermal-sensor-cells = <1>;

		};



		thermal-zones {

			core-cluster {

				polling-delay-passive = <1000>;

				polling-delay = <5000>;

				thermal-sensors = <&tmu 0>;



				trips {

					core_cluster_alert: core-cluster-alert {

						temperature = <85000>;

						hysteresis = <2000>;

						type = "passive";

					};



					core_cluster_crit: core-cluster-crit {

						temperature = <95000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};



				cooling-maps {

					map0 {

						trip = <&core_cluster_alert>;

						cooling-device =

							<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					};

				};

			};

		};



		pcie@1f0000000 { /* Integrated Endpoint Root Complex */

			compatible = "pci-host-ecam-generic";

			reg = <0x01 0xf0000000 0x0 0x100000>;
@@ -679,7 +665,8 @@ 
		interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,

			     <0 223 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "DE", "SE";

		clocks = <&dpclk 0>, <&aclk>, <&aclk>, <&pclk>;

		clocks = <&dpclk>, <&clockgen 2 2>, <&clockgen 2 2>,

			 <&clockgen 2 2>;

		clock-names = "pxlclk", "mclk", "aclk", "pclk";

		arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;

		arm,malidp-arqos-value = <0xd000d000>;

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

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ 
	};

};



&usb1 {

	dr_mode = "otg";

};



#include "fsl-ls1046-post.dtsi"



&fman0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE