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

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

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

i.MX arm64 device tree changes for 5.1:
 - Add initial i.MX8QXP SoC and MEK board support.
 - Various device additions to i.MX8MQ SoC and EVK board support:
   RTC, QuadSPI, PMU, ECSPI, PWM, GPC power domain, USB etc.
 - Use generic node name for m25p80 flash on layerscape devices.
 - Add num-viewport property for layerscape PCIe devices, and
   incr-burst-type-adjustment for USB3 devices.
 - Add LS1012AX based Oxalis board support.
 - Add fsl-mc, FlexSPI device and dma-ranges property for LX2160A SoC.
 - Add SMMU device and missing dma-coherent property in fsl-mc for
   LS1088 SoC.

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

: (30 commits)
  arm64: dts: imx8mq: specify dma-ranges
  arm64: dts: imx8mq: Add ARM PMU node
  arm64: dts: imx8mq: Add RTC support
  arm64: dts: imx8mq-evk: Enable the QuadSPI controller
  arm64: dts: imx8mq: Add QuadSPI controller
  arm64: dts: imx8mq: Add ECSPI support
  arm64: dts: imx8mq-evk: Add fsl,magic-packet property
  arm64: dts: imx8mq-evk: add missing MDIO / PHY nodes
  arm64: dts: imx8mq-evk: enable USB nodes for USB3 host
  arm64: dts: imx8mq: add USB nodes
  arm64: dts: imx8mq: properly describe IRQ hierarchy
  arm64: dts: lx2160a: update fspi node
  arm64: dts: freescale: Add devicetree for Oxalis
  arm64: dts: lx2160a: add FlexSPI node property
  arm64: dts: imx8qxp: Fix MU4_INT number
  arm64: dts: imx8mq: add GPC power domains
  arm64: dts: imx8mq: Add pwm device nodes
  arm64: dts: imx: add i.MX8QXP system controller RTC support
  arm64: dts: imx: add imx8qxp mek support
  arm64: dts: imx: add imx8qxp support
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42d61413 ca04fed4

arch/arm64/boot/dts/freescale/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb
@@ -20,3 +21,4 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb



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

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

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

0 → 100644
+96 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Device Tree file for Oxalis

 *

 * Copyright (c) 2019 Manivannan Sadhasivam

 *

 */



/dts-v1/;



#include "fsl-ls1012a.dtsi"



/ {

	model = "Oxalis";

	compatible = "ebs-systart,oxalis", "fsl,ls1012a";



	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 = <&sai2>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&codec>;

			frame-master;

			bitclock-master;

			system-clock-frequency = <25000000>;

		};

	};

};



&duart0 {

	status = "okay";

};



&duart1 {

	status = "okay";

};



&esdhc1 {

	status = "okay";

};



&i2c0 {

	status = "okay";



	codec: audio-codec@a {

		#sound-dai-cells = <0>;

		compatible = "fsl,sgtl5000";

		reg = <0xa>;

		VDDA-supply = <&reg_1p8v>;

		VDDIO-supply = <&reg_1p8v>;

		clocks = <&sys_mclk>;

	};

};



&i2c1 {

	status = "okay";

};



&sai2 {

	status = "okay";

};



&sata {

	status = "okay";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ 
			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		sata: sata@3200000 {
@@ -486,6 +487,7 @@ 
			#size-cells = <2>;

			device_type = "pci";

			num-lanes = <4>;

			num-viewport = <2>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */

				  0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
&qspi {

	status = "okay";



	qflash0: s25fl128s@0 {

	qflash0: flash@0 {

		compatible = "spansion,m25p80";

		#address-cells = <1>;

		#size-cells = <1>;

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

+6 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ 
			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		usb1: usb3@3000000 {
@@ -620,6 +621,7 @@ 
			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		usb2: usb3@3100000 {
@@ -629,6 +631,7 @@ 
			dr_mode = "host";

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

			snps,dis_rxdet_inp3_quirk;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		sata: sata@3200000 {
@@ -675,6 +678,7 @@ 
			device_type = "pci";

			dma-coherent;

			num-lanes = <4>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */

				  0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -701,6 +705,7 @@ 
			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */

				  0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -727,6 +732,7 @@ 
			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000   /* downstream I/O */

				  0x82000000 0x0 0x40000000 0x50 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */

CRA Git | Maintained and supported by SUSTech CRA and CCSE