Unverified Commit 58982e1d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree changes for 6.4:

- New board device trees: Apalis quadmax, DH electronics i.MX8M Plus
  DHCOM and PDK3, Data Modul i.MX8M Plus eDM SBC, Colibri Aster and
  Iris, etc.
- Add FlexSPI, BBNSM and TPM PWM devices for i.MX93 SoC.
- A series of imx8mq-librem5 udpates which includes minor fixes,
  magnetometer, CSI/camera support, and powersaving improvements.
- Add Cadence USB3 support for i.MX8QXP.
- Add FlexCAN support for i.MX8QXP and i.MX8QM.
- Add UART DMA support for i.MX8MQ.
- Add GPT devices for i.MX8MP.
- Add VPU decoder and encoder support for i.MX8QM.
- Add display pipeline and PCIe EP support for i.MX8M family SoCs.
- A series from Peng Fan updating various i.MX8M device trees to pinctrl
  nodes match DT schema.
- A series from Philippe Schenker improving colibri-imx8x device trees
  in various aspects.
- Other random device tree updates.

* tag 'imx-dt64-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (87 commits)
  arm64: dts: imx8mp: Add support for Data Modul i.MX8M Plus eDM SBC
  arm64: dts: imx8mp: Add display pipeline components
  arm64: dts: imx8mn: Add display pipeline components
  arm64: dts: imx8mm: Add display pipeline components
  arm64: dts: freescale: imx8qxp-mek: enable cadence usb3
  arm64: dts: imx8qxp: add cadence usb3 support
  arm64: dts: imx8mq-librem5: add missing #clock-cells
  arm64: dts: imx8mm-prt8mm: update pinctrl to match dtschema
  arm64: dts: imx8mn-bsh-smm: update pinctrl to match dtschema
  arm64: dts: imx8mm-emcon: update pinctrl to match dtschema
  arm64: dts: imx8mq-librem5: update pinctrl to match dtschema
  arm64: dts: imx8mm-ddr4-evk: update gpmi pinctrl to match dtschema
  arm64: dts: imx8mn-evk: update i2c pinctrl to match dtschema
  arm64: dts: imx8mp: Add GPT blocks
  arm64: dts: imx8-apalis-v1.1: drop ci-disable-lpm
  arm64: dts: imx8dxl: drop clocks from scu clock controller
  arm64: dts: imx8mp: verdin-yavia: drop disable-over-current
  arm64: dts: imx8mq: tqma8mq-mba8mx: drop disable-over-current
  arm64: dts: imx8mp: Add support for DH electronics i.MX8M Plus DHCOM and PDK3
  arm64: dts: colibri-imx8x: Add iris v2 carrier board
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0efb9fa0 562d222f

arch/arm64/boot/dts/freescale/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -89,8 +89,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-tqma8mqnl-mba8mx.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb

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

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mp-debix-model-a.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk3.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
@@ -122,9 +124,17 @@ 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-apalis-eval.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-ixora-v1.1.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-eval.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.1.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.2.dtb

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-aster.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris-v2.dtb

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

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

dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-evk.dtb

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ gic: interrupt-controller@6000000 { 
		interrupt-controller;

		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |

					 IRQ_TYPE_LEVEL_LOW)>;

		its: gic-its@6020000 {

		its: msi-controller@6020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x06020000 0 0x20000>;/* GIC Translater */

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ gic: interrupt-controller@6000000 { 
		#size-cells = <2>;

		ranges;



		its: gic-its@6020000 {

		its: msi-controller@6020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x6020000 0 0x20000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ gic: interrupt-controller@6000000 { 
		interrupt-controller;

		interrupts = <1 9 0x4>;



		its: gic-its@6020000 {

		its: msi-controller@6020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x6020000 0 0x20000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ gic: interrupt-controller@6000000 { 
		interrupt-controller;

		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;



		its: gic-its@6020000 {

		its: msi-controller@6020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x6020000 0 0x20000>;