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

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

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

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

Pull "Freescale arm64 device tree updates for 4.14" from Shawn Guo:
 - Correct the typo in fsl-ls1088a-rdb board name.
 - A series from Horia Geantă to consolidate aliases node and enable
   crypto support for ls208xa and ls1088a.
 - Enable USB host support for ls1012a.
 - Enable cpuidle support for ls1088a and ls208xa.

* tag 'imx-dt64-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: ls1088: Correction in Board name from "L1088A" to "LS1088A"
  arm64: dts: ls208xa: add cpu idle support
  arm64: dts: ls1088a: add cpu idle support
  arm64: dts: freescale: ls1088a: add crypto node
  arm64: dts: freescale: ls208xa: add crypto node
  arm64: dts: freescale: ls208xa: share aliases node
  arm64: dts: ls1012a: add USB host controller nodes
parents 3004a512 f83de4f0

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

+17 −0
Original line number Diff line number Diff line
@@ -444,6 +444,15 @@ 
				 <&clockgen 4 3>;

		};



		usb0: usb3@2f00000 {

			compatible = "snps,dwc3";

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

			interrupts = <0 60 0x4>;

			dr_mode = "host";

			snps,quirk-frame-length-adjustment = <0x20>;

			snps,dis_rxdet_inp3_quirk;

		};



		sata: sata@3200000 {

			compatible = "fsl,ls1012a-ahci", "fsl,ls1043a-ahci";

			reg = <0x0 0x3200000 0x0 0x10000>,
@@ -454,5 +463,13 @@ 
			dma-coherent;

			status = "disabled";

		};



		usb1: usb2@8600000 {

			compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";

			reg = <0x0 0x8600000 0x0 0x1000>;

			interrupts = <0 139 0x4>;

			dr_mode = "host";

			phy_type = "ulpi";

		};

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "fsl-ls1088a.dtsi"



/ {

	model = "L1088A RDB Board";

	model = "LS1088A RDB Board";

	compatible = "fsl,ls1088a-rdb", "fsl,ls1088a";

};

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

+65 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		crypto = &crypto;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -62,6 +66,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x0>;

			clocks = <&clockgen 1 0>;

			cpu-idle-states = <&CPU_PH20>;

			#cooling-cells = <2>;

		};
@@ -70,6 +75,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x1>;

			clocks = <&clockgen 1 0>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu2: cpu@2 {
@@ -77,6 +83,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x2>;

			clocks = <&clockgen 1 0>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu3: cpu@3 {
@@ -84,6 +91,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x3>;

			clocks = <&clockgen 1 0>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu4: cpu@100 {
@@ -91,6 +99,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x100>;

			clocks = <&clockgen 1 1>;

			cpu-idle-states = <&CPU_PH20>;

			#cooling-cells = <2>;

		};
@@ -99,6 +108,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x101>;

			clocks = <&clockgen 1 1>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu6: cpu@102 {
@@ -106,6 +116,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x102>;

			clocks = <&clockgen 1 1>;

			cpu-idle-states = <&CPU_PH20>;

		};



		cpu7: cpu@103 {
@@ -113,6 +124,16 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x103>;

			clocks = <&clockgen 1 1>;

			cpu-idle-states = <&CPU_PH20>;

		};



		CPU_PH20: cpu-ph20 {

			compatible = "arm,idle-state";

			idle-state-name = "PH20";

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

			entry-latency-us = <1000>;

			exit-latency-us = <1000>;

			min-residency-us = <3000>;

		};

	};
@@ -136,6 +157,11 @@ 
			     <1 10 IRQ_TYPE_LEVEL_LOW>;/* Hypervisor PPI */

	};



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";

	};



	sysclk: sysclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;
@@ -369,6 +395,45 @@ 
			dma-coherent;

			status = "disabled";

		};



		crypto: crypto@8000000 {

			compatible = "fsl,sec-v5.0", "fsl,sec-v4.0";

			fsl,sec-era = <8>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x00 0x8000000 0x100000>;

			reg = <0x00 0x8000000 0x0 0x100000>;

			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;



			sec_jr0: jr@10000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	   = <0x10000 0x10000>;

				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr1: jr@20000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	   = <0x20000 0x10000>;

				interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr2: jr@30000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	   = <0x30000 0x10000>;

				interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr3: jr@40000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	   = <0x40000 0x10000>;

				interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;

			};

		};

	};



};

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

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
	model = "Freescale Layerscape 2080a QDS Board";

	compatible = "fsl,ls2080a-qds", "fsl,ls2080a";



	aliases {

		serial0 = &serial0;

		serial1 = &serial1;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

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

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
	model = "Freescale Layerscape 2080a RDB Board";

	compatible = "fsl,ls2080a-rdb", "fsl,ls2080a";



	aliases {

		serial0 = &serial0;

		serial1 = &serial1;

	};



	chosen {

		stdout-path = "serial1:115200n8";

	};