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

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

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

i.MX arm64 DTS update for 5.7:

 - New support for Kontron LS1028A based boards and NXP i.MX8MP EVK.
 - Add Ethernet PHY reset GPIO for imx8mm-evk and imx8mq-evk board.
 - Add gpio-fan, thermal and Ethernet support for imx8mq-phanbell board.
 - Add SNVS clock description to pwrkey device for i.MX8 SoCs.
 - A number of updates on librem5-devkit board to add audio, proximity
   sensor, lsm9ds1 mount matrix support, and improve WoWWAN, DVFS, SD
   devices as well.
 - A series of patches from Anson Huang to update i.MX8 EVK boards
   for support of I2C PCA6416, thermal, GPIO LED, OPP table etc.
 - Add PCIe device nodes for LX2160A and LS1028A SoC.
 - Add FSPI deivce support for LX2160A evaluation boards.
 - Add EEPROM and LTC3882 regulator support for lx2160a-cex7 board.
 - Other small and random updates on LS1028A and i.MX8 support.

* tag 'imx-dt64-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (63 commits)
  arm64: dts: ls1028a: disable the felix switch by default
  arm64: dts: imx8mp: Add snvs clock to powerkey
  arm64: dts: imx8mn: Add snvs clock to powerkey
  arm64: dts: ls1028a: Add PCIe controller DT nodes
  arm64: dts: ls1028a: sl28: add support for variant 2
  arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS
  arm64: dts: ls1028a: sl28: fix on-board EEPROMS
  arm64: dts: freescale: sl28: add SPI flash
  arm64: dts: imx8m: fix aips dts node
  arm64: dts: imx8mn: Add CPU thermal zone support
  arm64: dts: imx8mm: Add thermal zone support
  arm64: dts: imx8mq-phanbell: Fix Ethernet PHY post-reset duration
  arm64: dts: enable fspi in imx8mm dts
  arm64: dts: imx8mn: align name for crypto child nodes
  arm64: dts: lx2160aqds: Add FSPI node properties
  arm64: dts: lx2160ardb: Update FSPI node properties
  arm64: dts: imx8mq-phanbell: Add gpio-fan/thermal support
  arm64: dts: layerscape: add iommu-map property to pci nodes
  arm64: dts: imx8mp-evk: Enable pca6416 on i2c3 bus
  arm64: dts: imx8mp-evk: Add i2c3 support
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 96831337 630952e1

arch/arm64/boot/dts/freescale/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-kbox-a-230-ls.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb

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

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

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb
@@ -26,6 +31,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

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

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

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

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

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

0 → 100644
+91 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Device Tree File for the Kontron KBox A-230-LS.

 *

 * This consists of a Kontron SMARC-sAL28 (Dual PHY) and a special

 * carrier (s1914).

 *

 * Copyright (C) 2019 Michael Walle <michael@walle.cc>

 *

 */



/dts-v1/;

#include "fsl-ls1028a-kontron-sl28-var4.dts"



/ {

	model = "Kontron KBox A-230-LS";

	compatible = "kontron,kbox-a-230-ls", "kontron,sl28-var4",

		     "kontron,sl28", "fsl,ls1028a";

};



&enetc_mdio_pf3 {

	/* BCM54140 QSGMII quad PHY */

	qsgmii_phy0: ethernet-phy@7 {

		reg = <7>;

	};



	qsgmii_phy1: ethernet-phy@8 {

		reg = <8>;

	};



	qsgmii_phy2: ethernet-phy@9 {

		reg = <9>;

	};



	qsgmii_phy3: ethernet-phy@10 {

		reg = <10>;

	};

};



&enetc_port2 {

	status = "okay";

};



&i2c3 {

	eeprom@57 {

		compatible = "atmel,24c32";

		reg = <0x57>;

		pagesize = <32>;

	};

};



&mscc_felix {

	status = "okay";

};



&mscc_felix_port0 {

	label = "swp0";

	managed = "in-band-status";

	phy-handle = <&qsgmii_phy0>;

	phy-mode = "qsgmii";

	status = "okay";

};



&mscc_felix_port1 {

	label = "swp1";

	managed = "in-band-status";

	phy-handle = <&qsgmii_phy1>;

	phy-mode = "qsgmii";

	status = "okay";

};



&mscc_felix_port2 {

	label = "swp2";

	managed = "in-band-status";

	phy-handle = <&qsgmii_phy2>;

	phy-mode = "qsgmii";

	status = "okay";

};



&mscc_felix_port3 {

	label = "swp3";

	managed = "in-band-status";

	phy-handle = <&qsgmii_phy3>;

	phy-mode = "qsgmii";

	status = "okay";

};



&mscc_felix_port4 {

	ethernet = <&enetc_port2>;

	status = "okay";

};

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

0 → 100644
+72 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Device Tree file for the Kontron SMARC-sAL28 board.

 *

 * This is for the network variant 2 which has two ethernet ports. These

 * ports are connected to the internal switch.

 *

 * Copyright (C) 2020 Michael Walle <michael@walle.cc>

 *

 */



/dts-v1/;

#include "fsl-ls1028a-kontron-sl28.dts"



/ {

	model = "Kontron SMARC-sAL28 (TSN-on-module)";

	compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a";

};



&enetc_mdio_pf3 {

	phy0: ethernet-phy@5 {

		reg = <0x5>;

		eee-broken-1000t;

		eee-broken-100tx;

	};



	phy1: ethernet-phy@4 {

		reg = <0x4>;

		eee-broken-1000t;

		eee-broken-100tx;

	};

};



&enetc_port0 {

	status = "disabled";

	/*

	 * In the base device tree the PHY was registered in the mdio

	 * subnode as it is PHY for this port. On this module this PHY

	 * is connected to a switch port instead and registered above.

	 * Therefore, delete the mdio subnode as well as the phy-handle

	 * property here.

	 */

	/delete-property/ phy-handle;

	/delete-node/ mdio;

};



&enetc_port2 {

	status = "okay";

};



&mscc_felix {

	status = "okay";

};



&mscc_felix_port0 {

	label = "gbe0";

	phy-handle = <&phy0>;

	phy-mode = "sgmii";

	status = "okay";

};



&mscc_felix_port1 {

	label = "gbe1";

	phy-handle = <&phy1>;

	phy-mode = "sgmii";

	status = "okay";

};



&mscc_felix_port4 {

	ethernet = <&enetc_port2>;

	status = "okay";

};

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

0 → 100644
+117 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Device Tree file for the Kontron SMARC-sAL28 board on a SMARC Eval 2.0

 * carrier (ADS2).

 *

 * Copyright (C) 2019 Michael Walle <michael@walle.cc>

 *

 */



/dts-v1/;

#include "fsl-ls1028a-kontron-sl28.dts"



/ {

	model = "Kontron SMARC-sAL28 (Single PHY) on SMARC Eval 2.0 carrier";

	compatible = "kontron,sl28-var3-ads2", "kontron,sl28-var3",

		     "kontron,sl28", "fsl,ls1028a";



	sound {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-audio-card";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack",

			"Line", "Line Out Jack",

			"Microphone", "Microphone Jack",

			"Line", "Line In Jack";

		simple-audio-card,routing =

			"Line Out Jack", "LINEOUTR",

			"Line Out Jack", "LINEOUTL",

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"IN1L", "Line In Jack",

			"IN1R", "Line In Jack",

			"Microphone Jack", "MICBIAS",

			"IN2L", "Microphone Jack",

			"IN2R", "Microphone Jack";

		simple-audio-card,mclk-fs = <256>;



		simple-audio-card,dai-link@0 {

			reg = <0>;

			bitclock-master = <&dailink0_master>;

			frame-master = <&dailink0_master>;

			format = "i2s";



			cpu {

				sound-dai = <&sai6>;

			};



			dailink0_master: codec {

				sound-dai = <&wm8904>;

			};

		};



		simple-audio-card,dai-link@1 {

			reg = <1>;

			bitclock-master = <&dailink1_master>;

			frame-master = <&dailink1_master>;

			format = "i2s";



			cpu {

				sound-dai = <&sai5>;

			};



			dailink1_master: codec {

				sound-dai = <&wm8904>;

			};

		};

	};

};



&dspi2 {

	flash@0 {

		compatible = "jedec,spi-nor";

		m25p,fast-read;

		spi-max-frequency = <100000000>;

		reg = <0>;

	};

};



&i2c3 {

	eeprom@57 {

		compatible = "atmel,24c64";

		reg = <0x57>;

		pagesize = <32>;

	};

};



&i2c4 {

	status = "okay";



	wm8904: audio-codec@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8904";

		reg = <0x1a>;

		clocks = <&mclk>;

		clock-names = "mclk";

		assigned-clocks = <&mclk>;

		assigned-clock-rates = <1250000>;

	};

};



&sai5 {

	status = "okay";

};



&sai6 {

	status = "okay";

};



&soc {

	mclk: clock-mclk@f130080 {

		compatible = "fsl,vf610-sai-clock";

		reg = <0x0 0xf130080 0x0 0x80>;

		clocks = <&clockgen 4 1>;

		#clock-cells = <0>;

	};

};

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Device Tree file for the Kontron SMARC-sAL28 board.

 *

 * This is for the network variant 4 which has two ethernet ports. It

 * extends the base and provides one more port connected via RGMII.

 *

 * Copyright (C) 2019 Michael Walle <michael@walle.cc>

 *

 */



/dts-v1/;

#include "fsl-ls1028a-kontron-sl28.dts"

#include <dt-bindings/net/qca-ar803x.h>



/ {

	model = "Kontron SMARC-sAL28 (Dual PHY)";

	compatible = "kontron,sl28-var4", "kontron,sl28", "fsl,ls1028a";

};



&enetc_port1 {

	phy-handle = <&phy1>;

	phy-connection-type = "rgmii-id";

	status = "okay";



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;



		phy1: ethernet-phy@4 {

			reg = <0x4>;

			eee-broken-1000t;

			eee-broken-100tx;



			qca,clk-out-frequency = <125000000>;

			qca,clk-out-strength = <AR803X_STRENGTH_FULL>;



			vddio-supply = <&vddh>;



			vddio: vddio-regulator {

				regulator-name = "VDDIO";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			};



			vddh: vddh-regulator {

				regulator-name = "VDDH";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE