Commit 49d47bf9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree changes for 5.11:

- New board support: LX2162A QDS, Kontron i.MX8M Mini SoMs and
  baseboards.
- A number of patches from Adam Ford to add various audio devices for
  i.MX8MM/MN and update imx8mm-beacon-som board on QSPI NOR and RTC.
- Correct WDOG_B pin configuration for i.MX8MM/MN/MP.
- A series from Ioana Ciornei complete the MAC/PCS/PHY representation
  on DPAA2 devices.
- Add PMU device for i.MX8MP/MN.
- Add IR and CAN support for i.MX8MP/MN/MM EVK board.
- Adjust GIC CPU mask to match number of CPUs for i.MX8MP/MN/MM.
- A series of patch from Michael Walle to update LS1028A support with
  addition of CAN and OPTEE, also ENETC PTP and FlexSPI clock input
  correction.
- Add SPDIF sound card support on imx8mq-evk board.
- Misc random updates and device additions.

* tag 'imx-dt64-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
  arm64: dts: imx8mm-beacon-som: Assign PMIC clock
  arm64: dts: imx8mm-beacon-som: Configure RTC aliases
  arm64: dts: imx8mn: Add node for SPDIF
  arm64: dts: imx8mn: Add support for micfil
  arm64: dts: imx8mn: Add SAI nodes
  arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter
  arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices
  arm64: dts: freescale: update calibration table for TMU module
  arm64: dts: freescale: sl28: combine SPI MTD partitions
  arm64: dts: ls1028a: add optee node
  arm64: dts: ls1028a: fix FlexSPI clock input
  arm64: dts: ls1028a: fix ENETC PTP clock input
  arm64: dts: imx: Fix imx8mm-kontron-n801x-s.dtb target
  arm64: dts: imx8mn-evk: add IR support
  arm64: dts: imx8mm-evk: add IR support
  arm64: dts: imx8mq-evk: add linux,autosuspend-period property for IR
  arm64: dts: imx8mp-evk: add CAN support
  arm64: dts: imx8mq-evk: Add spdif sound card support
  arm64: dts: imx8mq: Configure clock rate for audio plls
  arm64: dts: layerscape: Add PCIe EP node for ls1088a
  ...

Link: https://lore.kernel.org/r/20201202142717.9262-5-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa66be3b 0b848626

arch/arm64/boot/dts/freescale/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,10 +27,12 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-clearfog-cx.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-honeycomb.dtb

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

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

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



dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-n801x-s.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

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

+36 −33
Original line number Diff line number Diff line
@@ -291,43 +291,46 @@ 
			compatible = "fsl,qoriq-tmu";

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

			interrupts = <0 33 0x4>;

			fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>;

			fsl,tmu-calibration = <0x00000000 0x00000026

					       0x00000001 0x0000002d

			fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x60062>;

			fsl,tmu-calibration = <0x00000000 0x00000025

					       0x00000001 0x0000002c

					       0x00000002 0x00000032

					       0x00000003 0x00000039

					       0x00000004 0x0000003f

					       0x00000005 0x00000046

					       0x00000006 0x0000004d

					       0x00000007 0x00000054

					       0x00000008 0x0000005a

					       0x00000009 0x00000061

					       0x0000000a 0x0000006a

					       0x0000000b 0x00000071



					       0x00010000 0x00000025

					       0x00010001 0x0000002c

					       0x00000006 0x0000004c

					       0x00000007 0x00000053

					       0x00000008 0x00000059

					       0x00000009 0x0000005f

					       0x0000000a 0x00000066

					       0x0000000b 0x0000006c



					       0x00010000 0x00000026

					       0x00010001 0x0000002d

					       0x00010002 0x00000035

					       0x00010003 0x0000003d

					       0x00010004 0x00000045

					       0x00010005 0x0000004e

					       0x00010006 0x00000057

					       0x00010007 0x00000061

					       0x00010008 0x0000006b

					       0x00010009 0x00000076



					       0x00020000 0x00000029

					       0x00020001 0x00000033

					       0x00020002 0x0000003d

					       0x00020003 0x00000049

					       0x00020004 0x00000056

					       0x00020005 0x00000061

					       0x00020006 0x0000006d



					       0x00030000 0x00000021

					       0x00030001 0x0000002a

					       0x00030002 0x0000003c

					       0x00030003 0x0000004e>;

					       0x00010005 0x0000004d

					       0x00010006 0x00000055

					       0x00010007 0x0000005d

					       0x00010008 0x00000065

					       0x00010009 0x0000006d



					       0x00020000 0x00000026

					       0x00020001 0x00000030

					       0x00020002 0x0000003a

					       0x00020003 0x00000044

					       0x00020004 0x0000004e

					       0x00020005 0x00000059

					       0x00020006 0x00000063



					       0x00030000 0x00000014

					       0x00030001 0x00000021

					       0x00030002 0x0000002e

					       0x00030003 0x0000003a

					       0x00030004 0x00000047

					       0x00030005 0x00000053

					       0x00030006 0x00000060>;

			big-endian;

			#thermal-sensor-cells = <1>;

		};
@@ -401,7 +404,7 @@ 
			#interrupt-cells = <2>;

		};



		wdog0: wdog@2ad0000 {

		wdog0: watchdog@2ad0000 {

			compatible = "fsl,ls1012a-wdt",

				     "fsl,imx21-wdt";

			reg = <0x0 0x2ad0000 0x0 0x10000>;
@@ -454,7 +457,7 @@ 
				 <&clockgen 4 3>;

		};



		usb0: usb3@2f00000 {

		usb0: usb@2f00000 {

			compatible = "snps,dwc3";

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

			interrupts = <0 60 0x4>;
@@ -475,7 +478,7 @@ 
			status = "disabled";

		};



		usb1: usb2@8600000 {

		usb1: usb@8600000 {

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

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

			interrupts = <0 139 0x4>;

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts

+7 −11
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
		serial2 = &lpuart1;

		spi0 = &fspi;

		spi1 = &dspi2;

		mmc0 = &esdhc1;

		mmc1 = &esdhc;

	};



	buttons0 {
@@ -60,6 +62,10 @@ 
	};

};



&can0 {

	status = "okay";

};



&dspi2 {

	status = "okay";

};
@@ -154,20 +160,10 @@ 
		};



		partition@210000 {

			reg = <0x210000 0x0f0000>;

			reg = <0x210000 0x1d0000>;

			label = "bootloader";

		};



		partition@300000 {

			reg = <0x300000 0x040000>;

			label = "DP firmware";

		};



		partition@340000 {

			reg = <0x340000 0x0a0000>;

			label = "trusted firmware";

		};



		partition@3e0000 {

			reg = <0x3e0000 0x020000>;

			label = "bootloader environment";

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
		gpio2 = &gpio3;

		serial0 = &duart0;

		serial1 = &duart1;

		mmc0 = &esdhc;

		mmc1 = &esdhc1;

	};



	chosen {

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
		crypto = &crypto;

		serial0 = &duart0;

		serial1 = &duart1;

		mmc0 = &esdhc;

		mmc1 = &esdhc1;

	};



	chosen {