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

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

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

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

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

 - LS1088A updates: add device support for DCFG, qoriq-mc, and USB.
 - Add power monitor device INA220 for ls208xa-rdb board.

* tag 'imx-dt64-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: ls208xa: add power monitor chip node
  arm64: dts: ls1088a: Add USB support
  arm64: dts: ls1088a: add fsl-mc hardware resource manager node
  arm64: dts: ls1088a: Added dcfg node in ls1088a dtsi
parents 7c179f9d 1e333007

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

+8 −0
Original line number Diff line number Diff line
@@ -125,3 +125,11 @@ 
&sata {

	status = "okay";

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};

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

+97 −0
Original line number Diff line number Diff line
@@ -166,6 +166,77 @@ 
			     <1 10 IRQ_TYPE_LEVEL_LOW>;/* Hypervisor PPI */

	};



	fsl_mc: fsl-mc@80c000000 {

		compatible = "fsl,qoriq-mc";

		reg = <0x00000008 0x0c000000 0 0x40>,	 /* MC portal base */

		      <0x00000000 0x08340000 0 0x40000>; /* MC control reg */

		msi-parent = <&its>;

		#address-cells = <3>;

		#size-cells = <1>;



		/*

		 * Region type 0x0 - MC portals

		 * Region type 0x1 - QBMAN portals

		 */

		ranges = <0x0 0x0 0x0 0x8 0x0c000000 0x4000000

			  0x1 0x0 0x0 0x8 0x18000000 0x8000000>;



		dpmacs {

			#address-cells = <1>;

			#size-cells = <0>;



			dpmac1: dpmac@1 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <1>;

			};



			dpmac2: dpmac@2 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <2>;

			};



			dpmac3: dpmac@3 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <3>;

			};



			dpmac4: dpmac@4 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <4>;

			};



			dpmac5: dpmac@5 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <5>;

			};



			dpmac6: dpmac@6 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <6>;

			};



			dpmac7: dpmac@7 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <7>;

			};



			dpmac8: dpmac@8 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <8>;

			};



			dpmac9: dpmac@9 {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <9>;

			};



			dpmac10: dpmac@a {

				compatible = "fsl,qoriq-mc-dpmac";

				reg = <0xa>;

			};

		};

	};



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";
@@ -191,6 +262,12 @@ 
			clocks = <&sysclk>;

		};



		dcfg: dcfg@1e00000 {

			compatible = "fsl,ls1088a-dcfg", "syscon";

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

			little-endian;

		};



		tmu: tmu@1f80000 {

			compatible = "fsl,qoriq-tmu";

			reg = <0x0 0x1f80000 0x0 0x10000>;
@@ -394,6 +471,26 @@ 
			status = "disabled";

		};



		usb0: usb3@3100000 {

			compatible = "snps,dwc3";

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

			interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;

			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			status = "disabled";

		};



		usb1: usb3@3110000 {

			compatible = "snps,dwc3";

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

			interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;

			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			status = "disabled";

		};



		sata: sata@3200000 {

			compatible = "fsl,ls1088a-ahci";

			reg = <0x0 0x3200000 0x0 0x10000>,

arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -95,6 +95,18 @@ 
			};

		};



		i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x02>;



			ina220@40 {

				compatible = "ti,ina220";

				reg = <0x40>;

				shunt-resistor = <500>;

			};

		};



		i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;