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

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

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

i.MX arm64 device tree update for 5.20:

- Add device tree support for i.MX93 SoC.
- New board device tree: TQMa8MPQL, DH electronics i.MX8M Plus DHCOM and
  PDK2, i.MX93 11x11 EVK, phyBOARD-Polis-i.MX8MM.
- A series from Abel Vesa and Viorel Suman to fix i.MX8QXP device tree
  to comply with DT schema.
- Disable job ring 0 device for i.MX8MM to avoid caam_jr probe error, due
  to that JR0 reservation is done in both upstream (v2.7) and downstream
  (NXP lf_v2.4) TF-A.
- A series from Krzysztof Kozlowski to align gpio-key and LED node names
  with dtschema.
- Add SNVS LPGPR device for i.MX8MM so that some preserving registers
  becomes available as NVMEM.
- Add NoC device support for i.MX8MP SoC.
- A couple of changes from Sean Anderson to add SFP node for TA devices
  for LayerScape SoCs.
- A series from Shengjiu Wang to enable bt-sco sound card support for
  NXP i.MX8M EVK boards.
- Other small and random board updates.

* tag 'imx-dt64-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (33 commits)
  arm64: dts: freescale: add initial device tree for TQMa8MPQL with i.MX8MP
  arm64: dts: freescale: imx8qxp: Fix the keys node name
  arm64: dts: freescale: imx8: Fix the system-controller node name
  arm64: dts: freescale: imx8qxp: Fix the ocotp node name
  arm64: dts: freescale: imx8qxp: Add fallback compatible for clock controller
  arm64: dts: freescale: imx8: Fix power controller name
  arm64: dts: freescale: imx8qxp: Remove unnecessary clock related entries
  arm64: dts: imx8mp: add NoC node
  arm64: dts: Add SFP node for TA 3.0 devices
  arm64: dts: layerscape: Add SFP node for TA 2.1 devices
  arm64: dts: freescale: Add phyBOARD-Polis-i.MX8MM support
  arm64: dts: imx8m{m,p}-verdin: use IT temperatures
  arm64: dts: imx8mn-evk: add bt-sco sound card support
  arm64: dts: imx8mq-evk: add bt-sco sound card support
  arm64: dts: imx8mm-evk: add bt-sco sound card support
  arm64: freescale/imx8mp-evk.dts: reorder nodes alphabetically
  arm64: dts: imx8mq: Pass a label to the AIPS nodes
  arm64: dts: imx8m: Pass a label to the soc node
  arm64: dts: imx8mm-venice-gw7902: fix UART1 CTS
  arm64: dts: imx8mp: Add support for DH electronics i.MX8M Plus DHCOM and PDK2
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dbd68eb5 418d1d84

arch/arm64/boot/dts/freescale/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-n801x-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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-tqma8mqml-mba8mx.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb
@@ -79,9 +80,11 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb 
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-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-phyboard-pollux-rdk.dtb

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

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dev.dtb
@@ -107,6 +110,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb

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

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

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



imx8mm-venice-gw72xx-0x-imx219-dtbs	:= imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-imx219.dtbo

imx8mm-venice-gw72xx-0x-rs232-rts-dtbs	:= imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-rs232-rts.dtbo

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ &dspi { 
	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q128a11", "jedec,spi-nor";

		compatible = "micron,n25q128a11", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <10000000>;

	};

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

+13 −5
Original line number Diff line number Diff line
@@ -271,6 +271,14 @@ rtic_d: rtic-d@60 { 
			};

		};



		sfp: efuse@1e80000 {

			compatible = "fsl,ls1021a-sfp";

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

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(4)>;

			clock-names = "sfp";

		};



		sec_mon: sec_mon@1e90000 {

			compatible = "fsl,sec-v5.4-mon", "fsl,sec-v5.0-mon",

				     "fsl,sec-v4.0-mon";
@@ -465,7 +473,7 @@ QORIQ_CLK_PLL_DIV(4)>, 
			status = "disabled";

		};



		edma0: edma@2c00000 {

		edma0: dma-controller@2c00000 {

			#dma-cells = <2>;

			compatible = "fsl,vf610-edma";

			reg = <0x0 0x2c00000 0x0 0x10000>,

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

+14 −6
Original line number Diff line number Diff line
@@ -383,6 +383,14 @@ sec_jr3: jr@40000 { 
			};

		};



		sfp: efuse@1e80000 {

			compatible = "fsl,ls1021a-sfp";

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

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(4)>;

			clock-names = "sfp";

		};



		dcfg: dcfg@1ee0000 {

			compatible = "fsl,ls1043a-dcfg", "syscon";

			reg = <0x0 0x1ee0000 0x0 0x10000>;
@@ -784,7 +792,7 @@ wdog0: watchdog@2ad0000 { 
			big-endian;

		};



		edma0: edma@2c00000 {

		edma0: dma-controller@2c00000 {

			#dma-cells = <2>;

			compatible = "fsl,vf610-edma";

			reg = <0x0 0x2c00000 0x0 0x10000>,

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

+14 −6
Original line number Diff line number Diff line
@@ -413,6 +413,14 @@ bportals: bman-portals@508000000 { 
			ranges = <0x0 0x5 0x08000000 0x8000000>;

		};



		sfp: efuse@1e80000 {

			compatible = "fsl,ls1021a-sfp";

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

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(4)>;

			clock-names = "sfp";

		};



		dcfg: dcfg@1ee0000 {

			compatible = "fsl,ls1046a-dcfg", "syscon";

			reg = <0x0 0x1ee0000 0x0 0x1000>;
@@ -683,7 +691,7 @@ wdog0: watchdog@2ad0000 { 
			big-endian;

		};



		edma0: edma@2c00000 {

		edma0: dma-controller@2c00000 {

			#dma-cells = <2>;

			compatible = "fsl,vf610-edma";

			reg = <0x0 0x2c00000 0x0 0x10000>,