Unverified Commit 9d71d4a9 authored Feb 25, 2022 by Arnd Bergmann

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

i.MX arm device tree change for 5.18:

- A series from Alexander Stein to update imx6qdl based TQMA6 and MBA6
  devices, adding I2C bus recovery, marking GPIO buttons as wakeup
  source etc.
- A set of maintenance patches from Oleksij Rempel adding display,
  CAN termination and thermal support for i.MX6 based boards from
  Plymovent, Protonic and from Kverneland.
- A couple of patches from Thierry Reding to correct i.MX28 RTC
  compatbile, and rename RTC device nodes for i.MX SoCs.
- Update i.MX7 device tree to use audio_mclk_post_div clock instead of
  audio_mclk_root_clk, and move PCIe out of AIPS3 bus.
- A couple of patches on imx6qdl-phytec to support PMIC MFD subdevices.
- Add pinctrl header support for i.MXRT1050 SoC.
- Other small and random changes.

* tag 'imx-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits)
  ARM: dts: imx6qp-sabresd: Enable PCIe support
  ARM: dts: imx6dl: plym2m, prtvt7, victgo: add thermal zones and hwmon
  ARM: dts: imx6dl: plym2m, prtvt7, victgo: make use of new resistive-adc-touch driver
  ARM: dts: imx6qdl-vicut1: add CAN termination support
  ARM: dts: imx6dl-prtvt7: Add missing tvp5150 video decoder node
  ARM: dts: imx6dl-prtvt7: Add display and panel nodes
  ARM: dts: imx6qdl-mba6: Move pinmux to regulator node
  ARM: dts: imx6qdl: tqma6: Remove obsolete comment
  ARM: dts: imx6qdl: tqma6: Mark gpio-buttons as wakeup-source
  ARM: dts: imx6qdl: tqma6: Add i2c bus recovery
  ARM: dts: imx6qdl-mba6: Move rtc alias to common location
  ARM: dts: imx7: Move PCIe out of AIPS3
  ARM: dts: imx: Add missing LVDS decoder on M53Menlo
  ARM: dts: imx6qdl-phytec: handle unneeded MFD-subdevices correctly
  ARM: dts: imx6qdl-phytec: add missing pmic MFD subdevices
  ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
  ARM: dts: imx28: reparent gpmi clock to ref_gpmi
  ARM: dts: imxrt1050-pinfunc: Add pinctrl binding header
  ARM: dts: imx6sx-udoo-neo: Add HDMI support
  ARM: dts: imx6qdl-dhcom-pdk2: Include missing headers
  ...

Link: https://lore.kernel.org/r/20220222075226.160187-4-shawnguo@kernel.org


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

parents fd9eff2e 9baabac7

arch/arm/boot/dts/imx28-tx28.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ touchscreen: tsc2007@48 {
		};

		ds1339: rtc@68 {
		compatible = "mxim,ds1339";
		compatible = "dallas,ds1339";
		reg = <0x68>;
		trickle-resistor-ohms = <250>;
		trickle-diode-disable;

arch/arm/boot/dts/imx28.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@ gpmi: nand-controller@8000c000 {
		interrupt-names = "bch";
		clocks = <&clks 50>;
		clock-names = "gpmi_io";
		assigned-clocks = <&clks 13>;
		assigned-clock-parents = <&clks 10>;
		dmas = <&dma_apbh 4>;
		dma-names = "rx-tx";
		status = "disabled";

arch/arm/boot/dts/imx51-ts4800.dts

+1 −1

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

		rtc: m41t00@68 {
		rtc: rtc@68 {
		compatible = "st,m41t00";
		reg = <0x68>;
		};

arch/arm/boot/dts/imx53-m53menlo.dts

+27 −2

Original line number	Diff line number	Diff line
		@@ -53,6 +53,31 @@ eth {
		};
		};

		lvds-decoder {
		compatible = "ti,ds90cf364a", "lvds-decoder";

		ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port@0 {
		reg = <0>;

		lvds_decoder_in: endpoint {
		remote-endpoint = <&lvds0_out>;
		};
		};

		port@1 {
		reg = <1>;

		lvds_decoder_out: endpoint {
		remote-endpoint = <&panel_in>;
		};
		};
		};
		};

		panel {
		compatible = "edt,etm0700g0dh6";
		pinctrl-0 = <&pinctrl_display_gpio>;
		@@ -61,7 +86,7 @@ panel {

		port {
		panel_in: endpoint {
		remote-endpoint = <&lvds0_out>;
		remote-endpoint = <&lvds_decoder_out>;
		};
		};
		};
		@@ -450,7 +475,7 @@ port@2 {
		reg = <2>;

		lvds0_out: endpoint {
		remote-endpoint = <&panel_in>;
		remote-endpoint = <&lvds_decoder_in>;
		};
		};
		};

arch/arm/boot/dts/imx53-tx53.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ &i2c1 {
		clock-frequency = <400000>;
		status = "okay";

		rtc1: ds1339@68 {
		rtc1: rtc@68 {
		compatible = "dallas,ds1339";
		reg = <0x68>;
		pinctrl-names = "default";