Unverified Commit 2de35611 authored Oct 16, 2023 by Arnd Bergmann

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

i.MX ARM device tree changes for 6.7:

- New board support: Variscite VAR-SOM-MX6 SoM and Custom board.
- A bunch of dt-schema check fixes from Fabio Estevam.
- A couple of MBA6ULX changes from Alexander Stein that marks gpio-buttons
  as wakeup-source and improves gpio-keys button node names.
- Add ATM0700D4 panel support for sk-imx53 board.
- Correct regulator node name for imx6qdl-nitrogen6 board.
- A couple of Gateworks i.MX6QDL board update: adding MDIO nodes and
  populating Ethernet MAC address.

* tag 'imx-dt-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (31 commits)
  ARM: dts: imx7d-pico-pi: Disable USDHC1
  ARM: dts: imx28: Fix dcp compatible
  ARM: dts: imx7s: Remove #power-domain-cells from gpcv2
  ARM: dts: imx25: Remove clock-names from the watchdog
  ARM: dts: imx25: Fix sram node
  ARM: dts: imx25: Fix dryice node
  ARM: dts: imx6qdl-gw5904: add dt props for populating eth MAC addrs
  ARM: dts: vfxxx: Write dmas in a single line
  ARM: dts: imx27-phytec: Use eeprom as the node name
  ARM: dts: imx51: Remove invalid sahara compatible
  ARM: dts: imx53: Adjust the ecspi compatible
  ARM: dts: imx7ulp: Fix usbphy1 compatible
  ARM: dts: imx6q-pistachio: Use a valid value for fsl,tx-d-cal
  ARM: dts: imx6q-b650v3: Fix fsl,tx-cal-45-dn-ohms
  ARM: dts: imx28-tx28: Move phy_type to USB node
  ARM: dts: mxs: Switch to #pwm-cells = <3>
  ARM: dts: imx6q: Add Variscite MX6 Custom board support
  ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6 SoM support
  ARM: dts: mxs: Fix duart clock-names
  ARM: dts: imx6ull/7d-colibri: Fix compatible
  ...

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


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 6a4347fd 46da7fda

arch/arm/boot/dts/nxp/imx/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ dtb-$(CONFIG_SOC_IMX53) += \
		imx53-qsb.dtb \
		imx53-qsrb.dtb \
		imx53-sk-imx53.dtb \
		imx53-sk-imx53-atm0700d4-lvds.dtb \
		imx53-sk-imx53-atm0700d4-rgb.dtb \
		imx53-smd.dtb \
		imx53-tx53-x03x.dtb \
		imx53-tx53-x13x.dtb \
		@@ -244,6 +246,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-udoo.dtb \
		imx6q-utilite-pro.dtb \
		imx6q-var-dt6customboard.dtb \
		imx6q-var-mx6customboard.dtb \
		imx6q-vicut1.dtb \
		imx6q-wandboard.dtb \
		imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/nxp/imx/imx25.dtsi

+4 −3

Original line number	Diff line number	Diff line
		@@ -529,7 +529,6 @@ watchdog@53fdc000 {
		compatible = "fsl,imx25-wdt", "fsl,imx21-wdt";
		reg = <0x53fdc000 0x4000>;
		clocks = <&clks 126>;
		clock-names = "";
		interrupts = <55>;
		};

		@@ -583,10 +582,9 @@ usbmisc: usbmisc@53ff4600 {
		};

		dryice@53ffc000 {
		compatible = "fsl,imx25-dryice", "fsl,imx25-rtc";
		compatible = "fsl,imx25-rtc";
		reg = <0x53ffc000 0x4000>;
		clocks = <&clks 81>;
		clock-names = "ipg";
		interrupts = <25 56>;
		};
		};
		@@ -594,6 +592,9 @@ dryice@53ffc000 {
		iram: sram@78000000 {
		compatible = "mmio-sram";
		reg = <0x78000000 0x20000>;
		ranges = <0 0x78000000 0x20000>;
		#address-cells = <1>;
		#size-cells = <1>;
		};

		emi@80000000 {

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ &i2c2 {
		pinctrl-0 = <&pinctrl_i2c2>;
		status = "okay";

		at24@52 {
		eeprom@52 {
		compatible = "atmel,24c32";
		pagesize = <32>;
		reg = <0x52>;

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ &i2c2 {
		pinctrl-0 = <&pinctrl_i2c2>;
		status = "okay";

		at24@52 {
		eeprom@52 {
		compatible = "atmel,24c32";
		pagesize = <32>;
		reg = <0x52>;

arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,8 @@ i2c_gpio: i2c-gpio {
		compatible = "i2c-gpio";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_swi2c>;
		gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>, /* sda */
		<&gpio3 4 GPIO_ACTIVE_HIGH>; /* scl */
		sda-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
		scl-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
		i2c-gpio,delay-us = <50>;
		status = "okay";