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

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

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

i.MX arm64 device tree update for 5.13:

- A series from Dong Aisheng to update i.MX8Q device trees for adopting
  SS (SubSystems) based bindings.
- New board support:  Kontron pitx-imx8m, Engicam i.Core MX8M Mini.
- A series from Adrien Grassein to add various peripheral support for
  imx8mm-nitrogen-r2 board.
- A series from Guido Günther to update librem5-devkit device tree.
- A number of patches from Michael Walle to add Root Complex Event
  Collector interrupt, update MTD partitions and add rtc0 alias for
  ls1028a-kontron-sl28 board.
- Add EQOS MAC support for phyBOARD-Pollux-i.MX8MP.
- Add 2x2 SFP+ cage support for clearfog-itx boards.
- Small and random update for various boards.

* tag 'imx-dt64-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (55 commits)
  arm64: dts: fsl-ls1028a-kontron-sl28: add rtc0 alias
  arm64: dts: ls1028a: move rtc alias to individual boards
  arm64: dts: fsl-ls1028a-kontron-sl28: combine unused partitions
  arm64: dts: fsl-ls1028a-kontron-sl28: move MTD partitions
  arm64: dts: imx8mp-evk: Improve the Ethernet PHY description
  arm64: dts: imx8mq-librem5-r3: Mark buck3 as always on
  arm64: dts: imx8mq-librem5: Hog the correct gpio
  arm64: dts: lx2160a-clearfog-itx: add SFP support
  arm64: dts: imx8mp-phyboard-pollux-rdk: Change debug UART
  arm64: dts: imx8mn: Reorder flexspi clock-names entry
  arm64: dts: imx8mm: Reorder flexspi clock-names entry
  arm64: dts: ls1028a: set up the real link speed for ENETC port 2
  arm64: dts: imx8mm-nitrogen-r2: add ecspi2 support
  arm64: dts: imx: add imx8qm mek support
  arm64: dts: imx: add imx8qm common dts file
  arm64: dts: imx8qm: add dma ss support
  arm64: dts: imx8: split adma ss into dma and audio ss
  arm64: dts: imx8qm: add conn ss support
  arm64: dts: imx8qm: add lsio ss support
  arm64: dts: imx8: switch to new lpcg clock binding
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4f662ba2 51c8eaa1

arch/arm64/boot/dts/freescale/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 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-icore-mx8mm-ctouch2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb
@@ -47,6 +49,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-kontron-pitx-imx8m.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-devkit.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-r2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-r3.dtb
@@ -57,6 +60,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mq-thor96.dtb

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

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

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb

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

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

+34 −46
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ aliases { 
		spi1 = &dspi2;

		mmc0 = &esdhc1;

		mmc1 = &esdhc;

		rtc0 = &rtc;

		rtc1 = &ftm_alarm0;

	};



	buttons0 {
@@ -115,8 +117,6 @@ &fspi { 
	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		m25p,fast-read;

		spi-max-frequency = <133000000>;
@@ -125,6 +125,11 @@ flash@0 { 
		spi-rx-bus-width = <2>; /* 2 SPI Rx lines */

		spi-tx-bus-width = <1>; /* 1 SPI Tx line */



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				reg = <0x000000 0x010000>;

				label = "rcw";
@@ -132,29 +137,11 @@ partition@0 { 
			};



			partition@10000 {

			reg = <0x010000 0x0f0000>;

				reg = <0x010000 0x1d0000>;

				label = "failsafe bootloader";

				read-only;

			};



		partition@100000 {

			reg = <0x100000 0x040000>;

			label = "failsafe DP firmware";

			read-only;

		};



		partition@140000 {

			reg = <0x140000 0x0a0000>;

			label = "failsafe trusted firmware";

			read-only;

		};



		partition@1e0000 {

			reg = <0x1e0000 0x020000>;

			label = "reserved";

			read-only;

		};



			partition@200000 {

				reg = <0x200000 0x010000>;

				label = "configuration store";
@@ -171,6 +158,7 @@ partition@3e0000 { 
			};

		};

	};

};



&gpio1 {

	gpio-line-names =
@@ -191,7 +179,7 @@ &gpio2 { 
&i2c0 {

	status = "okay";



	rtc@32 {

	rtc: rtc@32 {

		compatible = "microcrystal,rv8803";

		reg = <0x32>;

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ aliases { 
		serial1 = &duart1;

		mmc0 = &esdhc;

		mmc1 = &esdhc1;

		rtc1 = &ftm_alarm0;

	};



	chosen {

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ aliases { 
		serial1 = &duart1;

		mmc0 = &esdhc;

		mmc1 = &esdhc1;

		rtc1 = &ftm_alarm0;

	};



	chosen {

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

+7 −5
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ / { 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		rtc1 = &ftm_alarm0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1027,7 +1023,7 @@ enetc_port2: ethernet@0,2 { 
				status = "disabled";



				fixed-link {

					speed = <1000>;

					speed = <2500>;

					full-duplex;

				};

			};
@@ -1114,6 +1110,12 @@ fixed-link { 
					full-duplex;

				};

			};



			rcec@1f,0 {

				reg = <0x00f800 0 0 0 0>;

				/* IEP INT_A */

				interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		rcpm: power-controller@1e34040 {