Commit 89f4f128 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX arm64 device tree update for 5.2:
 - Add initial i.MX8MM SoC and EVK board support.
 - Enable OPP table for cpufreq support on i.MX8MQ, i.MX8QXP and
   i.MX8MM.
 - A series from Andrey Smirnov to enable PCIe support for i.MX8MQ.
 - Add TMU (Thermal Management Unit) device on i.MX8MQ for managing
   thermal of CPU, GPU, and VPU.
 - Add SDMA and SAI2 devices for i.MX8MQ SoC and enable wm8524 audio
   support on EVK board.
 - Add LPUART, OCOTP and GPU devices for i.MX8MQ SoC.
 - Add initial i.MX8MQ based Zii Ultra board support
 - Add SCU general IRQ and watchdog support for i.MX8QXP.
 - Add audio related devices and PMU for LS1028A.
 - Enable SATA and cpuidle support for LX2160A.
 - Other small random updates.

* tag 'imx-dt64-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (41 commits)
  arm64: dts: lx2160a: add cpu idle support
  arm64: dts: imx8mq: fix GPU clock frequency
  arm64: dts: fsl: imx8mq-evk: link regulator to GPU domain
  arm64: dts: imx8mm: Add cpufreq properties
  arm64: dts: imx8qxp-mek: Add i2c1 with pca9646
  arm64: dts: imx8qxp: enable scu general irq channel
  arm64: dts: imx8mq: add GPU node
  arm64: dts: imx: add Zii Ultra board support
  arm64: dts: imx8mq: fix higher CPU operating point
  arm64: dts: imx8mq-evk: Enable PCIE0 interface
  arm64: dts: imx8mq: Add nodes for PCIe IP blocks
  arm64: dts: imx8mq: Combine PCIE power domains
  arm64: dts: imx8mq: Add a node for SRC IP block
  arm64: dts: imx8mq: Mark iomuxc_gpr as i.MX6Q compatible
  arm64: dts: imx8qxp: Add lpuart1/lpuart2/lpuart3 nodes
  arm64: dts: lx2160a: add sata node support
  arm64: dts: ls1028a: Corrected the SATA ecc address
  arm64: dts: imx8mq: Change ahb clock for imx8mq
  arm64: dts: imx8mq: Fix the fsl,imx8mq-sdma compatible string
  arm64: dts: imx8qxp: add system controller watchdog support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f45f5182 00c5ce8a

arch/arm64/boot/dts/freescale/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -20,5 +20,8 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb 
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) += imx8mq-evk.dtb

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

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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ 
	status = "okay";

};



&pcie {

	status = "okay";

};



&sai2 {

	status = "okay";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ 
			interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;

		};



		pcie@3400000 {

		pcie: pcie@3400000 {

			compatible = "fsl,ls1012a-pcie";

			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */

			       0x40 0x00000000 0x0 0x00002000>; /* configuration space */

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

+62 −0
Original line number Diff line number Diff line
@@ -32,6 +32,49 @@ 
		device_type = "memory";

		reg = <0x0 0x80000000 0x1 0x00000000>;

	};



	sys_mclk: clock-mclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <25000000>;

	};



	reg_1p8v: regulator-1p8v {

		compatible = "regulator-fixed";

		regulator-name = "1P8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";

		simple-audio-card,widgets =

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Speaker", "Speaker Ext",

			"Line", "Line In Jack";

		simple-audio-card,routing =

			"MIC_IN", "Microphone Jack",

			"Microphone Jack", "Mic Bias",

			"LINE_IN", "Line In Jack",

			"Headphone Jack", "HP_OUT",

			"Speaker Ext", "LINE_OUT";



		simple-audio-card,cpu {

			sound-dai = <&sai1>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&sgtl5000>;

			frame-master;

			bitclock-master;

			system-clock-frequency = <25000000>;

		};

	};

};



&duart0 {
@@ -89,5 +132,24 @@ 
				reg = <0x57>;

			};

		};



		i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x5>;



			sgtl5000: audio-codec@a {

				#sound-dai-cells = <0>;

				compatible = "fsl,sgtl5000";

				reg = <0xa>;

				VDDA-supply = <&reg_1p8v>;

				VDDIO-supply = <&reg_1p8v>;

				clocks = <&sys_mclk>;

			};

		};

	};

};



&sai1 {

	status = "okay";

};

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

+63 −0
Original line number Diff line number Diff line
@@ -28,6 +28,49 @@ 
		device_type = "memory";

		reg = <0x0 0x80000000 0x1 0x0000000>;

	};



	sys_mclk: clock-mclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <25000000>;

	};



	reg_1p8v: regulator-1p8v {

		compatible = "regulator-fixed";

		regulator-name = "1P8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";

		simple-audio-card,widgets =

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Speaker", "Speaker Ext",

			"Line", "Line In Jack";

		simple-audio-card,routing =

			"MIC_IN", "Microphone Jack",

			"Microphone Jack", "Mic Bias",

			"LINE_IN", "Line In Jack",

			"Headphone Jack", "HP_OUT",

			"Speaker Ext", "LINE_OUT";



		simple-audio-card,cpu {

			sound-dai = <&sai4>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&sgtl5000>;

			frame-master;

			bitclock-master;

			system-clock-frequency = <25000000>;

		};

	};

};



&i2c0 {
@@ -39,6 +82,22 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x1>;



			sgtl5000: audio-codec@a {

				#sound-dai-cells = <0>;

				compatible = "fsl,sgtl5000";

				reg = <0xa>;

				VDDA-supply = <&reg_1p8v>;

				VDDIO-supply = <&reg_1p8v>;

				clocks = <&sys_mclk>;

				sclk-strength = <3>;

			};

		};



		i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -88,3 +147,7 @@ 
&enetc_port1 {

	status = "disabled";

};



&sai4 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE