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

Commit 614bae98 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Freescale arm64 device tree updates for 4.17" from Shawn Guo:
 - Move cpu_thermal device out of bus node to fix DTC simple_bus_reg
   warning seen with W=1 switch.
 - Fix IFC child nodes' unit-address to eliminate DTC simple_bus_reg
   warnings.
 - Add a dummy size memory 'reg' property for LS1046A device tree to
   avoid unit_address_vs_reg DTC warning, and the real size will be
   filled by bootloader.
 - Update ls208xa-qds board device tree to fix unit_address_vs_reg
   warnings with DSPI device.
 - Add idle-states for LS1012A and LS1043A, and correct
   arm,psci-suspend-param setting for already added idle-states.
 - DPAA QBMan portal and watchdog device addition.

* tag 'imx-dt64-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: ifc: Fix the unit address format in the examples
  arm64: dts: ls1046a: add a dummy memory 'reg' property
  arm64: dts: fsl: fix ifc simple-bus unit address format warnings
  arm64: dts: fsl: update the cpu idle node
  arm64: dts: ls1043a: add cpu idle support
  arm64: dts: ls1012a: add cpu idle support
  arm64: dts: ls208xa-qds: Fix the 'reg' property
  arm64: dts: ls208xa-qds: Pass unit name to dspi child nodes
  arm64: dts: ls208xa: Move cpu_thermal out of bus node
  arm64: dts: ls1088a: Move cpu_thermal out of bus node
  arm64: dts: ls1046a: Move cpu_thermal out of bus node
  arm64: dts: ls1043a: Move cpu_thermal out of bus node
  arm64: dts: ls1012a: Move cpu_thermal out of bus node
  arm64: dts: Add DPAA QBMan portal 9
  arm64: dts: ls1088a: add DT node of watchdog
parents 7a76aad0 4e017f14

Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example: 
			  0x1 0x0 0x0 0xffa00000 0x00010000

			  0x3 0x0 0x0 0xffb00000 0x00020000>;



		flash@0,0 {

		flash@0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";
@@ -58,7 +58,7 @@ Example: 
			};

		};



		flash@1,0 {

		flash@100000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,ifc-nand";
@@ -73,7 +73,7 @@ Example: 
			};

		};



		cpld@3,0 {

		cpld@@300000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,p1010rdb-cpld";

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

+49 −31
Original line number Diff line number Diff line
@@ -70,6 +70,24 @@ 
			reg = <0x0>;

			clocks = <&clockgen 1 0>;

			#cooling-cells = <2>;

			cpu-idle-states = <&CPU_PH20>;

		};

	};



	idle-states {

		/*

		 * PSCI node is not added default, U-boot will add missing

		 * parts if it determines to use PSCI.

		 */

		entry-method = "arm,psci";



		CPU_PH20: cpu-ph20 {

			compatible = "arm,idle-state";

			idle-state-name = "PH20";

			arm,psci-suspend-param = <0x0>;

			entry-latency-us = <1000>;

			exit-latency-us = <1000>;

			min-residency-us = <3000>;

		};

	};
@@ -118,6 +136,37 @@ 
		mask = <0x02>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <5000>;

			thermal-sensors = <&tmu 0>;



			trips {

				cpu_alert: cpu-alert {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit: cpu-crit {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};



			cooling-maps {

				map0 {

					trip = <&cpu_alert>;

					cooling-device =

						<&cpu0 THERMAL_NO_LIMIT

						THERMAL_NO_LIMIT>;

				};

			};

		};

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;
@@ -304,37 +353,6 @@ 
			#thermal-sensor-cells = <1>;

		};



		thermal-zones {

			cpu_thermal: cpu-thermal {

				polling-delay-passive = <1000>;

				polling-delay = <5000>;

				thermal-sensors = <&tmu 0>;



				trips {

					cpu_alert: cpu-alert {

						temperature = <85000>;

						hysteresis = <2000>;

						type = "passive";

					};



					cpu_crit: cpu-crit {

						temperature = <95000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};



				cooling-maps {

					map0 {

						trip = <&cpu_alert>;

						cooling-device =

							<&cpu0 THERMAL_NO_LIMIT

							THERMAL_NO_LIMIT>;

					};

				};

			};

		};



		i2c0: i2c@2180000 {

			compatible = "fsl,vf610-i2c";

			#address-cells = <1>;

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

+3 −3
Original line number Diff line number Diff line
@@ -84,19 +84,19 @@ 
		  0x2 0x0 0x0 0x7fb00000 0x00000100>;

	status = "okay";



	nor@0,0 {

	nor@0 {

		compatible = "cfi-flash";

		reg = <0x0 0x0 0x8000000>;

		bank-width = <2>;

		device-width = <1>;

	};



	nand@1,0 {

	nand@100000000 {

		compatible = "fsl,ifc-nand";

		reg = <0x1 0x0 0x10000>;

	};



	fpga: board-control@2,0 {

	fpga: board-control@200000000 {

		compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis";

		reg = <0x2 0x0 0x0000100>;

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
		  0x1 0x0 0x0 0x7e800000 0x00010000

		  0x2 0x0 0x0 0x7fb00000 0x00000100>;



		nor@0,0 {

		nor@0 {

			compatible = "cfi-flash";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -106,14 +106,14 @@ 
			device-width = <1>;

		};



		nand@1,0 {

		nand@100000000 {

			compatible = "fsl,ifc-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x1 0x0 0x10000>;

		};



		cpld: board-control@2,0 {

		cpld: board-control@200000000 {

			compatible = "fsl,ls1043ardb-cpld";

			reg = <0x2 0x0 0x0000100>;

		};

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

+52 −31
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			#cooling-cells = <2>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu1: cpu@1 {
@@ -89,6 +90,7 @@ 
			reg = <0x1>;

			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu2: cpu@2 {
@@ -97,6 +99,7 @@ 
			reg = <0x2>;

			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu3: cpu@3 {
@@ -105,6 +108,7 @@ 
			reg = <0x3>;

			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_PH20>;

		};



		l2: l2-cache {
@@ -112,6 +116,23 @@ 
		};

	};



	idle-states {

		/*

		 * PSCI node is not added default, U-boot will add missing

		 * parts if it determines to use PSCI.

		 */

		entry-method = "arm,psci";



		CPU_PH20: cpu-ph20 {

			compatible = "arm,idle-state";

			idle-state-name = "PH20";

			arm,psci-suspend-param = <0x0>;

			entry-latency-us = <1000>;

			exit-latency-us = <1000>;

			min-residency-us = <3000>;

		};

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x0 0x80000000 0 0x80000000>;
@@ -159,6 +180,37 @@ 
		mask = <0x02>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <5000>;



			thermal-sensors = <&tmu 3>;



			trips {

				cpu_alert: cpu-alert {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit: cpu-crit {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};



			cooling-maps {

				map0 {

					trip = <&cpu_alert>;

					cooling-device =

						<&cpu0 THERMAL_NO_LIMIT

						THERMAL_NO_LIMIT>;

				};

			};

		};

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <1 13 0xf08>, /* Physical Secure PPI */
@@ -342,37 +394,6 @@ 
			#thermal-sensor-cells = <1>;

		};



		thermal-zones {

			cpu_thermal: cpu-thermal {

				polling-delay-passive = <1000>;

				polling-delay = <5000>;



				thermal-sensors = <&tmu 3>;



				trips {

					cpu_alert: cpu-alert {

						temperature = <85000>;

						hysteresis = <2000>;

						type = "passive";

					};

					cpu_crit: cpu-crit {

						temperature = <95000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};



				cooling-maps {

					map0 {

						trip = <&cpu_alert>;

						cooling-device =

							<&cpu0 THERMAL_NO_LIMIT

							THERMAL_NO_LIMIT>;

					};

				};

			};

		};



		qman: qman@1880000 {

			compatible = "fsl,qman";

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