Unverified Commit 1b42ff0c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree changes for 6.7

- New board support: TQ-Systems LS1043A/LS1046A and LS1088 based boards,
  VAR-SOM-MX6 SoM, SolidRun LX2162A SoM & Clearfog, and phyGATE-Tauri
  i.MX 8M Mini board.
- A set of changes from Adam Ford adding audio related devices for i.MX8M
  SoCs, migrating sound card to simple-audio-card for imx8mm-beacon board,
  and adding DMIC support i.MX8M Beacon boards.
- A series from Alexander Stein to add LVDS overlay support for i.MX8M
  based MBA8Mx boards.
- A couple of changes from Cem Tenruh to add gpio-line-names for i.MX8MP
  based phycore boards.
- A bunch of dt-schema check fixes from Fabio Estevam.
- A few changes from Frank Li to add edma devices and enable UART
  support for i.MX93 and i.MX8 SoCs and related boards.
- A series from Marek Vasut to improve various aspects of i.MX8MP based
  DHCOM boards support.
- A series from Teresa Remmet to enable Flexcan, USB and RS232/RS485
  support for imx8mp-phyboard-pollux board.
- A number of changes from Tim Harvey to add imx219 overlay and TPM
  device support for Gateworks boards.
- Other small and random changes.

* tag 'imx-dt64-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (101 commits)
  arm64: dts: imx8mp: Drop i.MX8MP DHCOM rev.100 PHY address workaround from PDK3 DT
  arm64: dts: imx8mp: Update i.MX8MP DHCOM SoM DT to production rev.200
  arm64: dts: imx8mp: Add UART1 and RTC wake up source on DH i.MX8M Plus DHCOM SoM
  arm64: dts: imx8mp: Switch WiFI enable signal to mmc-pwrseq-simple on i.MX8MP DHCOM SoM
  arm64: dts: imx8mp: Fix property indent on DH i.MX8M Plus DHCOM PDK3
  arm64: dts: imx8mp: Describe VDD_ARM run and standby voltage for DH i.MX8M Plus DHCOM SoM
  arm64: dts: imx8mp: Describe VDD_ARM run and standby voltage for Data Modul i.MX8M Plus eDM SBC
  arm64: dts: imx8mp-beacon: Add DMIC support
  arm64: dts: imx8mn-beacon: Add DMIC support
  arm64: dts: imx8mm-beacon: Add DMIC support
  arm64: dts: imx8mm-beacon: Migrate sound card to simple-audio-card
  arm64: dts: imx8mn-evk: Remove codec clocks/clock-names
  arm64: dts: imx8mp-beacon: Configure 100MHz PCIe Ref Clk
  arm64: dts: imx8mn: Add sound-dai-cells to micfil node
  arm64: dts: imx8mm: Add sound-dai-cells to micfil node
  arm64: dts: freescale: add initial device tree for TQMLS1088A
  arm64: dts: freescale: add initial device tree for TQMLS1043A/TQMLS1046A
  arm64: dts: ls1043a: remove second dspi node
  arm64: dts: freescale: Add support for LX2162 SoM & Clearfog Board
  arm64: dts: lx2160a: describe the SerDes block #2
  ...

Link: https://lore.kernel.org/r/20231015132300.2268016-3-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2de35611 26517236

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -21831,9 +21831,11 @@ W: https://www.tq-group.com/en/products/tq-embedded/ 
F:	arch/arm/boot/dts/imx*mba*.dts*

F:	arch/arm/boot/dts/imx*tqma*.dts*

F:	arch/arm/boot/dts/mba*.dtsi

F:	arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*

F:	arch/arm64/boot/dts/freescale/imx*mba*.dts*

F:	arch/arm64/boot/dts/freescale/imx*tqma*.dts*

F:	arch/arm64/boot/dts/freescale/mba*.dtsi

F:	arch/arm64/boot/dts/freescale/tqml*.dts*

F:	drivers/gpio/gpio-tqmx86.c

F:	drivers/mfd/tqmx86.c

F:	drivers/watchdog/tqmx86_wdt.c

arch/arm64/boot/dts/freescale/Makefile

+20 −0
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-tqmls1043a-mbls10xxa.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-frwy.dtb

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-tqmls1046a-mbls10xxa.dtb

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-ten64.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-tqmls1088a-mbls10xxa.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
@@ -33,6 +36,7 @@ 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-clearfog.dtb

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



fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo
@@ -66,6 +70,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-mx8menlo.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-phyboard-polis-rdk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-phygate-tauri-l.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-prt8mm.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
@@ -82,6 +88,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-yavia.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-dahlia.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-yavia.dtb



imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33-dtbs += imx8mm-tqma8mqml-mba8mx.dtb imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33.dtbo

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



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

dtb-$(CONFIG_ARCH_MXC) += imx8mn-bsh-smm-s2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-bsh-smm-s2pro.dtb
@@ -91,6 +101,10 @@ 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



imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33-dtbs += imx8mn-tqma8mqnl-mba8mx.dtb imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.dtbo

dtb-$(CONFIG_ARCH_MXC) += imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.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
@@ -132,6 +146,10 @@ 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



imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33-dtbs += imx8mq-tqma8mq-mba8mx.dtb imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.dtbo

dtb-$(CONFIG_ARCH_MXC) += imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.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
@@ -158,6 +176,7 @@ imx8mm-venice-gw73xx-0x-rpidsi-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice 
imx8mm-venice-gw73xx-0x-rs232-rts-dtbs	:= imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo

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

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

imx8mp-venice-gw74xx-imx219-dtbs	:= imx8mp-venice-gw74xx.dtb imx8mp-venice-gw74xx-imx219.dtbo

imx8mp-venice-gw74xx-rpidsi-dtbs	:= imx8mp-venice-gw74xx.dtb imx8mp-venice-gw74xx-rpidsi.dtbo



dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-imx219.dtb
@@ -170,6 +189,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rpidsi.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb

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

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



dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb

arch/arm64/boot/dts/freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts

0 → 100644
+49 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)

/*

 * Copyright (c) 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,

 * D-82229 Seefeld, Germany.

 * Author: Gregor Herburger, Timo Herbrecher

 *

 */



/dts-v1/;



#include <dt-bindings/gpio/gpio.h>



#include "fsl-ls1043a-tqmls1043a.dtsi"

#include "tqmls10xxa-mbls10xxa.dtsi"



/ {

	model = "TQ-Systems GmbH LS1043A TQMLS1043A SoM on MBLS10xxA board";

	compatible = "tq,ls1043a-tqmls1043a-mbls10xxa", "tq,ls1043a-tqmls1043a",

		     "fsl,ls1043a";



	aliases {

		qsgmii-s1-p1 = &qsgmii1_phy1;

		qsgmii-s1-p2 = &qsgmii1_phy2;

		qsgmii-s1-p3 = &qsgmii1_phy3;

		qsgmii-s1-p4 = &qsgmii1_phy4;

		qsgmii-s2-p1 = &qsgmii2_phy1;

		qsgmii-s2-p2 = &qsgmii2_phy2;

		qsgmii-s2-p3 = &qsgmii2_phy3;

		qsgmii-s2-p4 = &qsgmii2_phy4;

		serial0 = &duart0;

		serial1 = &duart1;

	};



	chosen {

		stdout-path = &duart1;

	};

};



&esdhc {

	cd-gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;

};



&usb2 {

	status = "okay";

};



#include "fsl-ls1043-post.dtsi"

#include "tqmls104xa-mbls10xxa-fman.dtsi"

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)

/*

 * Copyright (c) 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,

 * D-82229 Seefeld, Germany.

 * Author: Gregor Herburger, Timo Herbrecher

 *

 * Device Tree Include file for LS1043A based SoM of TQ

 */



#include "fsl-ls1043a.dtsi"

#include "tqmls10xxa.dtsi"



&qspi {

	num-cs = <2>;

	status = "okay";



	qflash0: flash@0 {

		compatible = "jedec,spi-nor";

		reg = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		spi-max-frequency = <62500000>;

		spi-rx-bus-width = <4>;

		spi-tx-bus-width = <4>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;

		};

	};

};

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

+0 −14
Original line number Diff line number Diff line
@@ -526,20 +526,6 @@ dspi0: spi@2100000 { 
			status = "disabled";

		};



		dspi1: spi@2110000 {

			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";

			#address-cells = <1>;

			#size-cells = <0>;

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

			interrupts = <0 65 0x4>;

			clock-names = "dspi";

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(1)>;

			spi-num-chipselects = <5>;

			big-endian;

			status = "disabled";

		};



		i2c0: i2c@2180000 {

			compatible = "fsl,ls1043a-i2c", "fsl,vf610-i2c";

			#address-cells = <1>;