Unverified Commit b805cc89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree change for 6.1:

- New board support: i.MX8DXL EVK, Kontron SL/BL i.MX8MM OSM-S, i.MX8MM
  Gateworks GW7904, MSC SM2S-IMX8PLUS SoM and carrier board, NXP
  LS2081ARDB.
- Update i.MX8MQ device tree to use generic name 'dma-controller' for
  SDMA.
- A number of i.MX8ULP device tree improvements and updates: correct
  parent clock of LPI2C & LPSPI, increase the clock speed of LPSPI, add
  PMU and mailbox device, drop undocumented CGC property, enable FEC, etc.
- Add interconnect property for various i.MX8MP blk-ctrl devices.
- Enable VPU PGC, blk-ctrl and PCIe support for i.MX8MP SoC.
- A set of changes from Peng Fan to add various devices for i.MX93 SoC,
  including MU, blk-ctrl, PMU, LPI2C, LPSPI, SRC, etc.
- Two set of changes to update LS1043A and LS1046A device trees on
  various aspects, including USB3, PCIe, DMA, mdio-mux, QSPI Flash, etc.
- Board imx8mq-librem5 update: add USB role switching, add RGB PWM
  notification LEDs, add voice coil motor for focus control, fix MIPI_CSI
  description.
- A series from Frieder Schrempf to improve imx8mm-kontron device trees
  for VSELECT switch, DDRC operating point, SPI NOR partition layout etc.
- A set of display and PMIC related additions and improvements on
  imx8mm-verdin board.
- A number of i.MX8M Plus DHCOM PDK2 device tree improvments from Marek
  Vasut.
- A few imx8mp-venice device tree updates on USB, cpufreq and WiFi/BT.
- A series from Vladimir Oltean to enable multiple switch CPU ports
  support.
- Other small and random board specific updates.

* tag 'imx-dt64-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (90 commits)
  arm64: dts: ls1046a-qds: Modify the qspi flash frequency
  arm64: dts: ls1046a-qds: add mmio based mdio-mux nodes for FPGA
  arm64: dts: ls1046a: add gpios based i2c recovery information
  arm64: dts: ls1046a: use a pseudo-bus to constrain usb and sata dma size
  arm64: dts: ls1046a: make dma-coherent global to the SoC
  arm64: dts: ls1046a: add missing dma ranges property
  arm64: dts: ls1046a: Add big-endian property for PCIe nodes
  arm64: dts: ls1046a: Add the PME interrupt and big-endian to PCIe EP nodes
  arm64: dts: ls1046a: Enable usb3-lpm-capable for usb3 node
  arm64: dts: ls1043a-rdb: add pcf85263 rtc node
  arm64: dts: ls1043a-qds: add mmio based mdio-mux support
  arm64: dts: ls1043a: use a pseudo-bus to constrain usb and sata dma size
  arm64: dts: ls1043a: add gpio based i2c recovery information
  arm64: dts: ls1043a: make dma-coherent global to the SoC
  arm64: dts: ls1043a: add missing dma ranges property
  arm64: dts: ls1043a: Add big-endian property for PCIe nodes
  arm64: dts: ls1043a: Add SCFG phandle for PCIe nodes
  arm64: dts: ls1043a: use pcie aer/pme interrupts
  arm64: dts: ls1043a: Enable usb3-lpm-capable for usb3 node
  arm64: dts: ls1043a: fix the wrong size of dcfg space
  ...

Link: https://lore.kernel.org/r/20220918092806.2152700-4-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 07d0db46 d4e87e4e

arch/arm64/boot/dts/freescale/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-rdb.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-ten64.dtb

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

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb
@@ -48,6 +49,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb



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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-data-modul-edm-sbc.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb
@@ -55,7 +57,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-emcon-avari.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-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-kontron-bl.dtb

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

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-phyboard-polis-rdk.dtb
@@ -67,6 +70,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7903.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7904.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dahlia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dev.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-dahlia.dtb
@@ -83,6 +87,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-venice-gw7902.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw74xx.dtb

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts

+8 −1
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ &enetc_port2 { 
	status = "okay";

};



&enetc_port3 {

	status = "okay";

};



&i2c3 {

	eeprom@57 {

		compatible = "atmel,24c32";
@@ -104,7 +108,10 @@ &mscc_felix_port3 { 
};



&mscc_felix_port4 {

	ethernet = <&enetc_port2>;

	status = "okay";

};



&mscc_felix_port5 {

	status = "okay";

};

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

+8 −1
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ &enetc_port2 { 
	status = "okay";

};



&enetc_port3 {

	status = "okay";

};



&mscc_felix {

	status = "okay";

};
@@ -60,6 +64,9 @@ &mscc_felix_port1 { 
};



&mscc_felix_port4 {

	ethernet = <&enetc_port2>;

	status = "okay";

};



&mscc_felix_port5 {

	status = "okay";

};

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

+11 −1
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ aliases { 
		ethernet3 = &mscc_felix_port1;

		ethernet4 = &mscc_felix_port2;

		ethernet5 = &mscc_felix_port3;

		ethernet6 = &mscc_felix_port4;

		ethernet7 = &mscc_felix_port5;

		ethernet8 = &enetc_port3;

	};



	chosen {
@@ -151,6 +154,10 @@ &enetc_port2 { 
	status = "okay";

};



&enetc_port3 {

	status = "okay";

};



&esdhc {

	sd-uhs-sdr104;

	sd-uhs-sdr50;
@@ -278,7 +285,10 @@ &mscc_felix_port3 { 
};



&mscc_felix_port4 {

	ethernet = <&enetc_port2>;

	status = "okay";

};



&mscc_felix_port5 {

	status = "okay";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ mscc_felix_port3: port@3 { 
					mscc_felix_port4: port@4 {

						reg = <4>;

						phy-mode = "internal";

						ethernet = <&enetc_port2>;

						status = "disabled";



						fixed-link {
@@ -1168,6 +1169,7 @@ fixed-link { 
					mscc_felix_port5: port@5 {

						reg = <5>;

						phy-mode = "internal";

						ethernet = <&enetc_port3>;

						status = "disabled";



						fixed-link {