Skip to contentSkip to conversation

ARM: dts: imx: Fix iMX6QDL DHCOM PDK2 DTC Warnings

PATCH In review Marcel Ziswiler 5 participants 9 messages Apr 26, 2022 – Apr 27, 2022

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: imx: Fix iMX6QDL DHCOM PDK2 DTC Warnings

From: Marcel Ziswiler <[email protected]>

Currently, compiling any i.MX 6 based target results in the following warning:

w+arch/arm/dts/imx6q-dhcom-pdk2.dtb: Warning (pwms_property):
/display-bl:pwms: cell 3 is not a phandle reference
w+arch/arm/dts/imx6q-dhcom-pdk2.dtb: Warning (pwms_property):
/display-bl: Missing property '#pwm-cells' in node /soc/bus@2000000/gpc@20dc000 or bad phandle (referred from pwms[3])
w+arch/arm/dts/imx6dl-dhcom-pdk2.dtb: Warning (pwms_property):
/display-bl:pwms: cell 3 is not a phandle reference
w+arch/arm/dts/imx6dl-dhcom-pdk2.dtb: Warning (pwms_property):
/display-bl: Missing property '#pwm-cells' in node /soc/bus@2000000/gpc@20dc000 or bad phandle (referred from pwms[3])

This is due to the imx6qdl-dhcom-pdk2.dtsi using a later pwm-cells of 3 (e.g. the one with the last cell indicating whether or not it is inverted) then what U-Boot's current imx6qdl.dtsi has. Unfortunately, fixing aka synchronising that one as well would lead to further issues:

w+arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dtb: Warning
(pwms_property): /backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-brppt2.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-cubox-i.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-aristainetos2c_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-cubox-i-emmc-som-v15.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-cubox-i-som-v15.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-icore.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-icore-mipi.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-sabreauto.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-sabresd.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-cubox-i.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-cubox-i-emmc-som-v15.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-cubox-i-som-v15.dtb: Warning (pwms_property):
/pwmleds/front:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-icore.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-icore-mipi.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-logicpd.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-novena.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-phytec-mira-rdk-nand.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-sabreauto.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6q-sabresd.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6qp-sabreauto.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6qp-sabresd.dtb: Warning (pwms_property):
/backlight-lvds:pwms: property size (12) too small for cell size 3

Messing with all those so late in the game does not seem like too good of an idea. Therefore, I suggest reverting just that one PWM node for now. We may (and really should) properly synchronise all i.MX 6 DTs again in the next cycle.

Fixes 8ed378ff78d1 ("ARM: dts: imx: Synchronize iMX6QDL DHCOM PDK2 DTs with Linux 5.15.12")

---

 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +1 -1
index bf6b3a5ce0..9dcb37ec7e 100644
@@ -25,7 +25,7 @@
 		compatible = "pwm-backlight";
 		default-brightness-level = <8>;
 		enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>; /* GPIO G */
-		pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>;
+		pwms = <&pwm1 0 50000>;
 		status = "okay";
 	};
 
Signature · 1 line
2.34.1
#1 lore raw
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Currently, compiling any i.MX 6 based target results in the following warning:

Oh no.

[...]

arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi line 28

Quoted 13 lines
  arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +1 -1
index bf6b3a5ce0..9dcb37ec7e 100644
@@ -25,7 +25,7 @@
  		compatible = "pwm-backlight";
  		default-brightness-level = <8>;
  		enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>; /* GPIO G */
-		pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>;
+		pwms = <&pwm1 0 50000>;

I think just pick Linux

fa28d8212ede ("ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files")

That should fix it.

#2 lore raw
Quoted 26 lines · Marek Vasut
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Currently, compiling any i.MX 6 based target results in the following warning:

Oh no.

[...]

arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi line 28

Quoted 13 lines
  arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +1 -1
index bf6b3a5ce0..9dcb37ec7e 100644
@@ -25,7 +25,7 @@
  		compatible = "pwm-backlight";
  		default-brightness-level = <8>;
  		enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>; /* GPIO G */
-		pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>;
+		pwms = <&pwm1 0 50000>;

I think just pick Linux

Quoted 2 lines

fa28d8212ede ("ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files")

We've just done -rc1, there should be time for re-syncing things.

Signature · 1 line
Tom
#3 lore raw
In reply to Marek Vasut
Quoted 26 lines · Marek Vasut
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Currently, compiling any i.MX 6 based target results in the following warning:

Oh no.

[...]

Quoted 10 lines

  arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +0 -0
index bf6b3a5ce0..9dcb37ec7e 100644
@@ -25,7 +25,7 @@
                 compatible = "pwm-backlight";
                 default-brightness-level = <8>;
Quoted 3 lines

                enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>; /* GPIO G */ -               pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>; +               pwms = <&pwm1 0 50000>;

I think just pick Linux

Quoted 5 lines

fa28d8212ede ("ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files")

That should fix it.

Yes, and breaks everything else.

#4 lore raw
Quoted 27 lines · Marcel Ziswiler
Quoted 26 lines · Marek Vasut
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Currently, compiling any i.MX 6 based target results in the following warning:

Oh no.

[...]

arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi line 28

Quoted 13 lines
   arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +1 -1
index bf6b3a5ce0..9dcb37ec7e 100644
@@ -25,7 +25,7 @@
                 compatible = "pwm-backlight";
                 default-brightness-level = <8>;
                 enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>; /* GPIO G */
-               pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>;
+               pwms = <&pwm1 0 50000>;

I think just pick Linux

Quoted 7 lines
Quoted 5 lines

fa28d8212ede ("ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files")

That should fix it.

Yes, and breaks everything else.

Ouch ... so what did Linux do about that breakage ?

btw the polarity flag is correct, the PWM is really inverted.

reviewer
#6 lore raw
In reply to Marcel Ziswiler

Hi Marcel,

Quoted 4 lines · Marcel Ziswiler

Messing with all those so late in the game does not seem like too good of an idea. Therefore, I suggest reverting just that one PWM node for now. We may (and really should) properly synchronise all i.MX 6 DTs again in the next cycle.

I did an attempt to sync the imx6 dts with Linux and generated the attached patch.

It builds the dtb's cleanly.

Boot tested only on a imx6q-sabresd.

I can send it after 2022.07 is released.

Regards,

Fabio Estevam

From b29e690c55690ae52e2af95fcc795e8ca3ecae62 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Tue, 26 Apr 2022 23:43:36 -0300
Subject: [PATCH] imx6: Sync device tree with Linux 5.18-rc4

Sync device tree with Linux 5.18-rc4.

---
 arch/arm/dts/imx6-logicpd-baseboard.dtsi      |  12 +-
 arch/arm/dts/imx6-logicpd-som.dtsi            |   4 +
 arch/arm/dts/imx6dl-brppt2.dts                |   2 +
 arch/arm/dts/imx6dl-mamoj.dts                 | 273 +++++-
 arch/arm/dts/imx6dl-mba6.dtsi                 |  10 +-
 arch/arm/dts/imx6dl-mba6a.dts                 |  15 +-
 arch/arm/dts/imx6dl-mba6b.dts                 |  15 +-
 arch/arm/dts/imx6dl-nitrogen6x.dts            |  12 +-
 arch/arm/dts/imx6dl-riotboard.dts             |   2 +
 arch/arm/dts/imx6dl-sabreauto.dts             |  15 +
 arch/arm/dts/imx6dl-tqma6a.dtsi               |  12 +-
 arch/arm/dts/imx6dl-tqma6b.dtsi               |  12 +-
 arch/arm/dts/imx6dl.dtsi                      |  13 +-
 arch/arm/dts/imx6q-b450v3.dts                 |  19 +-
 arch/arm/dts/imx6q-b650v3.dts                 |  17 +-
 arch/arm/dts/imx6q-b850v3.dts                 |  23 +-
 arch/arm/dts/imx6q-ba16.dtsi                  |  18 +-
 arch/arm/dts/imx6q-bx50v3.dtsi                |  61 +-
 arch/arm/dts/imx6q-cm-fx6.dts                 | 112 ++-
 arch/arm/dts/imx6q-icore-ofcap10.dts          |  28 +-
 arch/arm/dts/imx6q-logicpd.dts                |  18 +-
 arch/arm/dts/imx6q-marsboard.dts              |   2 +-
 arch/arm/dts/imx6q-mba6.dtsi                  |  32 +-
 arch/arm/dts/imx6q-mba6a.dts                  |  14 +-
 arch/arm/dts/imx6q-mba6b.dts                  |  14 +-
 arch/arm/dts/imx6q-mccmon6.dts                | 213 +++--
 arch/arm/dts/imx6q-nitrogen6x.dts             |  12 +-
 arch/arm/dts/imx6q-novena.dts                 |  42 +-
 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts   |   3 +
 arch/arm/dts/imx6q-sabrelite.dts              |  52 +-
 arch/arm/dts/imx6q-tbs2910.dts                |   9 +-
 arch/arm/dts/imx6q-tqma6a.dtsi                |  12 +-
 arch/arm/dts/imx6q-tqma6b.dtsi                |  11 +-
 arch/arm/dts/imx6q.dtsi                       |  36 +-
 .../arm/dts/imx6qdl-aristainetos2-common.dtsi |   1 +
 arch/arm/dts/imx6qdl-cubox-i.dtsi             |   5 +-
 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi          |   6 +-
 arch/arm/dts/imx6qdl-dhcom-som.dtsi           |   8 +-
 arch/arm/dts/imx6qdl-gw51xx.dtsi              |   7 +-
 arch/arm/dts/imx6qdl-gw52xx.dtsi              |  10 +-
 arch/arm/dts/imx6qdl-gw53xx.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw54xx.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw551x.dtsi              |   7 +-
 arch/arm/dts/imx6qdl-gw552x.dtsi              |  29 +-
 arch/arm/dts/imx6qdl-gw553x.dtsi              |   5 +-
 arch/arm/dts/imx6qdl-gw560x.dtsi              |  14 +-
 arch/arm/dts/imx6qdl-gw5903.dtsi              |   6 -
 arch/arm/dts/imx6qdl-gw5904.dtsi              |  27 +-
 arch/arm/dts/imx6qdl-gw5907.dtsi              |   9 +-
 arch/arm/dts/imx6qdl-gw5910.dtsi              |   7 -
 arch/arm/dts/imx6qdl-gw5912.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw5913.dtsi              |  10 +-
 arch/arm/dts/imx6qdl-hummingboard2.dtsi       |   2 +-
 arch/arm/dts/imx6qdl-icore.dtsi               |  19 +-
 arch/arm/dts/imx6qdl-mba6.dtsi                | 599 +++++++++---
 arch/arm/dts/imx6qdl-mba6a.dtsi               |  35 +-
 arch/arm/dts/imx6qdl-mba6b.dtsi               |  40 +-
 arch/arm/dts/imx6qdl-nitrogen6x.dtsi          | 733 +++++++++++++--
 arch/arm/dts/imx6qdl-phytec-mira.dtsi         |  32 +-
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi  |  30 +-
 arch/arm/dts/imx6qdl-pico.dtsi                | 226 ++++-
 arch/arm/dts/imx6qdl-sabreauto.dtsi           | 119 ++-
 arch/arm/dts/imx6qdl-sabrelite.dtsi           | 874 ++++++++++++-----
 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi      |   6 +
 arch/arm/dts/imx6qdl-sabresd.dtsi             | 214 +++--
 arch/arm/dts/imx6qdl-sr-som-ti.dtsi           |   1 +
 arch/arm/dts/imx6qdl-sr-som.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-tqma6.dtsi               | 326 +++----
 arch/arm/dts/imx6qdl-tqma6a.dtsi              |  46 +-
 arch/arm/dts/imx6qdl-tqma6b.dtsi              |  28 +-
 arch/arm/dts/imx6qdl-udoo.dtsi                |   2 +
 arch/arm/dts/imx6qdl-wandboard-revd1.dtsi     |   2 -
 arch/arm/dts/imx6qdl-wandboard.dtsi           | 102 +-
 arch/arm/dts/imx6qdl.dtsi                     | 190 ++--
 arch/arm/dts/imx6qp-sabreauto.dts             |   7 +-
 arch/arm/dts/imx6qp-sabresd.dts               |  10 +-
 arch/arm/dts/imx6qp.dtsi                      |   3 +-
 arch/arm/dts/imx6sl-evk.dts                   | 183 ++--
 arch/arm/dts/imx6sl.dtsi                      | 348 ++++---
 arch/arm/dts/imx6sll-evk.dts                  | 879 +++++++-----------
 arch/arm/dts/imx6sll.dtsi                     | 445 +++++----
 arch/arm/dts/imx6sx-sabreauto.dts             | 623 ++++++++++---
 arch/arm/dts/imx6sx-sdb.dts                   |   8 +-
 arch/arm/dts/imx6sx-sdb.dtsi                  |  56 +-
 arch/arm/dts/imx6sx-softing-vining-2000.dts   |  50 +-
 arch/arm/dts/imx6sx-udoo-neo.dtsi             |  74 ++
 arch/arm/dts/imx6sx.dtsi                      | 127 ++-
 arch/arm/dts/imx6ul-14x14-evk.dtsi            | 161 +++-
 arch/arm/dts/imx6ul-geam.dts                  | 363 +++++++-
 arch/arm/dts/imx6ul-isiot-emmc.dts            |  42 +-
 arch/arm/dts/imx6ul-isiot-nand.dts            |  45 +-
 arch/arm/dts/imx6ul-isiot.dtsi                | 330 +++++--
 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi      |  18 +-
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  |  30 +-
 arch/arm/dts/imx6ul-litesom.dtsi              |   1 +
 arch/arm/dts/imx6ul-opos6ul.dtsi              | 194 +---
 arch/arm/dts/imx6ul-opos6uldev.dts            | 387 +-------
 arch/arm/dts/imx6ul-phytec-phycore-som.dtsi   |  21 +-
 .../dts/imx6ul-phytec-segin-ff-rdk-nand.dts   |   2 +
 arch/arm/dts/imx6ul-phytec-segin.dtsi         |  46 +-
 arch/arm/dts/imx6ul-pico-hobbit.dts           |   2 +-
 arch/arm/dts/imx6ul-pico-pi.dts               |   4 +-
 arch/arm/dts/imx6ul-pico.dtsi                 |  40 +-
 arch/arm/dts/imx6ul.dtsi                      | 186 ++--
 arch/arm/dts/imx6ull-colibri.dtsi             | 427 +++++----
 arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts   |   2 +-
 .../dts/imx6ull-phytec-segin-ff-rdk-emmc.dts  |   1 +
 arch/arm/dts/imx6ull-phytec-segin.dtsi        |   7 -
 arch/arm/dts/imx6ull.dtsi                     |  14 +
 arch/arm/dts/imx6ulz.dtsi                     |   1 -
 include/dt-bindings/clock/imx6qdl-clock.h     |  14 +-
 111 files changed, 6508 insertions(+), 3653 deletions(-)
arch/arm/dts/imx6-logicpd-baseboard.dtsi +8 -4
index c40a7af6ebee..d9de9b4f0c52 100644
@@ -212,6 +212,7 @@
 &ecspi1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
+	cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;
 	status = "disabled";
 };
 
@@ -237,7 +238,6 @@
 		compatible = "wlf,wm8962";
 		reg = <0x1a>;
 		clocks = <&clks IMX6QDL_CLK_CKO>;
-		clock-names = "xclk";
 		DCVDD-supply = <&reg_audio>;
 		DBVDD-supply = <&reg_audio>;
 		AVDD-supply = <&reg_audio>;
@@ -249,9 +249,9 @@
 		gpio-cfg = <
 			0x0000 /* 0:Default */
 			0x0000 /* 1:Default */
-			0x0013 /* 2:FN_DMICCLK */
+			0x0000 /* 2:FN_DMICCLK */
 			0x0000 /* 3:Default */
-			0x8014 /* 4:FN_DMICCDAT */
+			0x0000 /* 4:FN_DMICCDAT */
 			0x0000 /* 5:Default */
 		>;
 	};
@@ -328,6 +328,10 @@
 	pinctrl-0 = <&pinctrl_pwm3>;
 };
 
+&snvs_pwrkey {
+	status = "okay";
+};
+
 &ssi2 {
 	status = "okay";
 };
@@ -379,7 +383,7 @@
 			MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK	0x100b1
 			MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI	0x100b1
 			MX6QDL_PAD_KEY_COL1__ECSPI1_MISO	0x100b1
-			MX6QDL_PAD_KEY_ROW1__ECSPI1_SS0		0x100b1
+			MX6QDL_PAD_KEY_ROW1__GPIO4_IO09		0x1b0b0
 		>;
 	};
 
arch/arm/dts/imx6-logicpd-som.dtsi +4 -0
index 7ceae3573248..547fb141ec0c 100644
@@ -207,6 +207,10 @@
 	vin-supply = <&sw1c_reg>;
 };
 
+&snvs_poweroff {
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog>;
arch/arm/dts/imx6dl-brppt2.dts +2 -0
index 4f1c52bff834..5716e48a907e 100644
@@ -161,10 +161,12 @@
 };
 
 &pwm3 {
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
 &pwm4 {
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
arch/arm/dts/imx6dl-mamoj.dts +272 -1

313 lines not on this page · raw message

arch/arm/dts/imx6dl-mba6.dtsi +7 -3
index d74adf2b2885..b749b424bbd6 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 &ethphy {
 	rxdv-skew-ps = <180>;
arch/arm/dts/imx6dl-mba6a.dts +10 -5
index fc9cc2c056f6..df0a96b28af0 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
@@ -11,6 +15,7 @@
 #include "imx6dl-mba6.dtsi"
 
 / {
-	model = "TQ TQMa6S on MBa6x";
-	compatible = "tq,mba6a", "tq,tqma6dl", "fsl,imx6dl";
+	model = "TQ TQMa6S/DL on MBa6x";
+	compatible = "tq,imx6dl-mba6x-a", "tq,mba6a",
+		     "tq,imx6dl-tqma6dl-a", "fsl,imx6dl";
 };
arch/arm/dts/imx6dl-mba6b.dts +10 -5
index a3c8d9d4c6bd..610b19d2db0f 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
@@ -11,6 +15,7 @@
 #include "imx6dl-mba6.dtsi"
 
 / {
-	model = "TQ TQMa6S on MBa6x";
-	compatible = "tq,mba6b", "tq,tqma6dl", "fsl,imx6dl";
+	model = "TQ TQMa6S/DL on MBa6x";
+	compatible = "tq,imx6dl-mba6x-b", "tq,mba6b",
+		     "tq,imx6dl-tqma6dl-b", "fsl,imx6dl";
 };
arch/arm/dts/imx6dl-nitrogen6x.dts +6 -6
index 9427ab6399bf..ef58d3b0ea0d 100644
@@ -1,11 +1,11 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright 2013-2019 Boundary Devices, Inc.
-// Copyright 2012 Freescale Semiconductor, Inc.
-// Copyright 2011 Linaro Ltd.
+// SPDX-License-Identifier: GPL-2.0 OR X11
+/*
+ * Copyright 2013 Boundary Devices, Inc.
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ */
 
 /dts-v1/;
-
 #include "imx6dl.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
 
arch/arm/dts/imx6dl-riotboard.dts +2 -0
index 065d3ab0f50a..e7d9bfbfd0e4 100644
@@ -106,6 +106,8 @@
 			reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 			reset-assert-us = <10000>;
 			reset-deassert-us = <1000>;
+			qca,smarteee-tw-us-1g = <24>;
+			qca,clk-out-frequency = <125000000>;
 		};
 	};
 };
arch/arm/dts/imx6dl-sabreauto.dts +15 -0
index 660d52a245ba..ff3283c83a39 100644
@@ -11,3 +11,18 @@
 	model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
 	compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
 };
+
+&cpu0 {
+	operating-points = <
+		/* kHz    uV */
+		996000  1275000
+		792000  1175000
+		396000  1150000
+	>;
+	fsl,soc-operating-points = <
+		/* ARM kHz  SOC-PU uV */
+		996000	1200000
+		792000	1175000
+		396000	1175000
+	>;
+};
arch/arm/dts/imx6dl-tqma6a.dtsi +7 -5
index df87b381cae2..e891ef9b0091 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-tqma6a.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };
-
arch/arm/dts/imx6dl-tqma6b.dtsi +7 -5
index 47ffbc4d9529..38cd8501a886 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-tqma6b.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };
-
arch/arm/dts/imx6dl.dtsi +8 -5
index ae5aad6b9efc..fdd81fdc3f35 100644
@@ -15,7 +15,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu@0 {
+		cpu0: cpu@0 {
 			compatible = "arm,cortex-a9";
 			device_type = "cpu";
 			reg = <0>;
@@ -44,6 +44,8 @@
 			arm-supply = <&reg_arm>;
 			pu-supply = <&reg_pu>;
 			soc-supply = <&reg_soc>;
+			nvmem-cells = <&cpu_speed_grade>;
+			nvmem-cell-names = "speed_grade";
 		};
 
 		cpu@1 {
@@ -64,6 +66,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -85,10 +88,6 @@
 		};
 
 		aips1: bus@2000000 {
-			iomuxc: iomuxc@20e0000 {
-				compatible = "fsl,imx6dl-iomuxc";
-			};
-
 			pxp: pxp@20f0000 {
 				reg = <0x020f0000 0x4000>;
 				interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -295,6 +294,10 @@
 	compatible = "fsl,imx6dl-hdmi";
 };
 
+&iomuxc {
+	compatible = "fsl,imx6dl-iomuxc";
+};
+
 &ipu1_csi1 {
 	ipu1_csi1_from_ipu1_csi1_mux: endpoint {
 		remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>;
arch/arm/dts/imx6q-b450v3.dts +7 -12
index 995caa8a3314..d994b32ad825 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -66,13 +65,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
-				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
-};
-
 &ldb {
 	status = "okay";
 
@@ -92,14 +84,19 @@
 };
 
 &pca9539 {
-	P04 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "", "SM_D_ACT", "DP1_RST#", "",
+			  "WD15S_EN", "WD15S_DIS#", "", "",
+			  "", "", "", "";
+
+	P04-hog {
 		gpio-hog;
 		gpios = <4 0>;
 		output-low;
 		line-name = "PCA9539-P04";
 	};
 
-	P07 {
+	P07-hog {
 		gpio-hog;
 		gpios = <7 0>;
 		output-low;
@@ -158,5 +155,3 @@
 		};
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-b650v3.dts +6 -11
index 95a61347da59..fa1a1df37cde 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -66,13 +65,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
-				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
-};
-
 &ldb {
 	status = "okay";
 
@@ -92,7 +84,12 @@
 };
 
 &pca9539 {
-	P07 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "", "SM_D_ACT", "DP1_RST#", "",
+			  "WD15S_EN", "WD15S_DIS#", "", "",
+			  "", "", "", "";
+
+	P07-hog {
 		gpio-hog;
 		gpios = <7 0>;
 		output-low;
@@ -157,5 +154,3 @@
 		};
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-b850v3.dts +7 -16
index 6416825234b0..db8c332df6a1 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -54,17 +53,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
-			  <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>,
-			  <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
-				 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
-				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
-				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>;
-};
-
 &ldb {
 	fsl,dual-channel;
 	status = "okay";
@@ -211,14 +199,19 @@
 };
 
 &pca9539 {
-	P10 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "REMOTE_ON_PML#", "SM_D_ACT", "DP1_RST#", "DP2_RST#",
+			  "", "", "", "",
+			  "", "", "", "";
+
+	P10-hog {
 		gpio-hog;
 		gpios = <8 0>;
 		output-low;
 		line-name = "PCA9539-P10";
 	};
 
-	P11 {
+	P11-hog {
 		gpio-hog;
 		gpios = <9 0>;
 		output-low;
@@ -300,5 +293,3 @@
 		phy-handle = <&switchphy4>;
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-ba16.dtsi +14 -4
index 9da2bb6e869e..f266f1b7e0cf 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Support for imx6 based Advantech DMS-BA16 Qseven module
  *
@@ -125,6 +124,9 @@
 		regulator-name = "usb_otg_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
+		pinctrl-0 = <&pinctrl_usbotg_vbus>;
+		gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 };
 
@@ -135,12 +137,12 @@
 };
 
 &ecspi1 {
-	cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
+	cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
 	status = "okay";
 
-	flash: n25q032@0 {
+	flash: flash@0 {
 		compatible = "jedec,spi-nor";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -173,8 +175,9 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	status = "okay";
+	phy-supply = <&reg_3p3v>;
 	phy-handle = <&phy0>;
+	status = "okay";
 
 	mdio {
 		#address-cells = <1>;
@@ -346,6 +349,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	status = "okay";
@@ -586,6 +590,12 @@
 		>;
 	};
 
+	pinctrl_usbotg_vbus: usbotgvbusgrp {
+		fsl,pins = <
+			MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x000b0
+		>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX6QDL_PAD_SD2_CMD__SD2_CMD	0x17059
arch/arm/dts/imx6q-bx50v3.dtsi +44 -17

161 lines not on this page · raw message

arch/arm/dts/imx6q-cm-fx6.dts +100 -12

144 lines not on this page · raw message

arch/arm/dts/imx6q-icore-ofcap10.dts +16 -12
index 81cc346dd149..02aca1e28ce3 100644
@@ -12,6 +12,17 @@
 / {
 	model = "Engicam i.CoreM6 Quad/Dual OpenFrame Capacitive touch 10.1 Kit";
 	compatible = "engicam,imx6-icore", "fsl,imx6q";
+
+	panel {
+		compatible = "ampire,am-1280800n3tzqw-t00h";
+		backlight = <&backlight_lvds>;
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&lvds0_out>;
+			};
+		};
+	};
 };
 
 &ldb {
@@ -22,18 +33,11 @@
 		fsl,data-width = <24>;
 		status = "okay";
 
-		display-timings {
-			native-mode = <&timing0>;
-			timing0: timing0 {
-				clock-frequency = <60000000>;
-				hactive = <1280>;
-				vactive = <800>;
-				hback-porch = <40>;
-				hfront-porch = <40>;
-				vback-porch = <10>;
-				vfront-porch = <3>;
-				hsync-len = <80>;
-				vsync-len = <10>;
+		port@4 {
+			reg = <4>;
+
+			lvds0_out: endpoint {
+				remote-endpoint = <&panel_in>;
 			};
 		};
 	};
arch/arm/dts/imx6q-logicpd.dts +14 -4
index 45eb0b7f75f8..46a4ddedb423 100644
@@ -9,11 +9,11 @@
 
 / {
 	model = "Logic PD i.MX6QD SOM-M3";
-	compatible = "fsl,imx6q";
+	compatible = "logicpd,imx6q-logicpd", "fsl,imx6q";
 
 	backlight: backlight-lvds {
 		compatible = "pwm-backlight";
-		pwms = <&pwm3 0 20000>;
+		pwms = <&pwm3 0 20000 0>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;
 		default-brightness-level = <6>;
 		power-supply = <&reg_lcd>;
@@ -21,6 +21,8 @@
 
 	panel-lvds0 {
 		compatible = "okaya,rs800480t-7x0gp";
+		power-supply = <&reg_lcd_reset>;
+		backlight = <&backlight>;
 
 		port {
 			panel_in_lvds0: endpoint {
@@ -38,7 +40,6 @@
 		regulator-max-microvolt = <3300000>;
 		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
-		regulator-always-on;
 		vin-supply = <&reg_3v3>;
 		startup-delay-us = <500000>;
 	};
@@ -52,7 +53,6 @@
 		regulator-max-microvolt = <3300000>;
 		gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
-		regulator-always-on;
 		vin-supply = <&reg_lcd>;
 	};
 };
@@ -73,6 +73,16 @@
 	status = "okay";
 };
 
+&i2c1 {
+	touchscreen@26 {
+		compatible = "ilitek,ili2117";
+		reg = <0x26>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_touchscreen>;
+		interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_RISING>;
+	};
+};
+
 &ldb {
 	status = "okay";
 
arch/arm/dts/imx6q-marsboard.dts +1 -1
index 05ee28388229..cc1801002394 100644
@@ -100,7 +100,7 @@
 	cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "microchip,sst25vf016b";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
arch/arm/dts/imx6q-mba6.dtsi +29 -3
index 76e8410f8ed9..0d7be4567291 100644
@@ -1,6 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
+
+&ecspi5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ecspi5_mba6x>;
+	cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+};
 
 &ethphy {
 	rxdv-skew-ps = <180>;
@@ -16,3 +26,19 @@
 	txc-skew-ps = <1860>;
 	rxc-skew-ps = <1860>;
 };
+
+&sata {
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl_ecspi5_mba6x: ecspi5grp-mba6x {
+		fsl,pins = <
+			/* HYS, SPEED = MED, 100k up, DSE = 011, SRE_FAST */
+			MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO 0x1b099
+			MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI 0xb099
+			MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK 0xb099
+			MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0xb099 /* eCSPI5 SS0 */
+		>;
+	};
+};
arch/arm/dts/imx6q-mba6a.dts +9 -5
index 7983ad94f82a..349a08605a5e 100644
@@ -1,10 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include "imx6q-tqma6a.dtsi"
 #include "imx6qdl-mba6.dtsi"
 #include "imx6qdl-mba6a.dtsi"
@@ -12,5 +15,6 @@
 
 / {
 	model = "TQ TQMa6Q on MBa6x";
-	compatible = "tq,mba6a", "fsl,imx6q";
+	compatible = "tq,imx6q-mba6x-a", "tq,mba6a",
+		     "tq,imx6q-tqma6q-a", "fsl,imx6q";
 };
arch/arm/dts/imx6q-mba6b.dts +9 -5
index 9d117dd190fa..02c9f3e91b8f 100644
@@ -1,10 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include "imx6q-tqma6b.dtsi"
 #include "imx6qdl-mba6.dtsi"
 #include "imx6qdl-mba6b.dtsi"
@@ -12,5 +15,6 @@
 
 / {
 	model = "TQ TQMa6Q on MBa6x";
-	compatible = "tq,mba6b", "fsl,imx6q";
+	compatible = "tq,imx6q-mba6x-b", "tq,mba6b",
+		     "tq,imx6q-tqma6q-b", "fsl,imx6q";
 };
arch/arm/dts/imx6q-mccmon6.dts +150 -63

274 lines not on this page · raw message

arch/arm/dts/imx6q-nitrogen6x.dts +6 -6
index ebb22a404eff..435445a34ad0 100644
@@ -1,11 +1,11 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright 2013-2019 Boundary Devices, Inc.
-// Copyright 2012 Freescale Semiconductor, Inc.
-// Copyright 2011 Linaro Ltd.
+// SPDX-License-Identifier: GPL-2.0 OR X11
+/*
+ * Copyright 2013 Boundary Devices, Inc.
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ */
 
 /dts-v1/;
-
 #include "imx6q.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
 
arch/arm/dts/imx6q-novena.dts +24 -18

68 lines not on this page · raw message

arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts +3 -0
index 65d2e483c136..3f13726c8058 100644
@@ -8,6 +8,9 @@
 #include "imx6q.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
 #include "imx6qdl-phytec-mira.dtsi"
+#include "imx6qdl-phytec-mira-peb-eval-01.dtsi"
+#include "imx6qdl-phytec-mira-peb-av-02.dtsi"
+#include "imx6qdl-phytec-mira-peb-wlbt-05.dtsi"
 
 / {
 	model = "PHYTEC phyBOARD-Mira Quad Carrier-Board with NAND";
arch/arm/dts/imx6q-sabrelite.dts +46 -6

60 lines not on this page · raw message

arch/arm/dts/imx6q-tbs2910.dts +5 -4
index 7d0a0676ff7c..8daef65d5bb3 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+ OR MIT
 //
-// Copyright 2014-2019 Soeren Moch <[email protected]>
+// Copyright 2014 Soeren Moch <[email protected]>
 
 /dts-v1/;
 
@@ -20,7 +20,7 @@
 		mmc0 = &usdhc2;
 		mmc1 = &usdhc3;
 		mmc2 = &usdhc4;
-		usb0 = &usbotg;
+		/delete-property/ mmc3;
 	};
 
 	memory@10000000 {
@@ -106,7 +106,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
 	phy-handle = <&phy>;
 	status = "okay";
 
@@ -117,6 +116,8 @@
 		phy: ethernet-phy@4 {
 			reg = <4>;
 			qca,clk-out-frequency = <125000000>;
+			reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
 		};
 	};
 };
@@ -158,7 +159,7 @@
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "okay";
 
-	rtc: ds1307@68 {
+	rtc: rtc@68 {
 		compatible = "dallas,ds1307";
 		reg = <0x68>;
 	};
arch/arm/dts/imx6q-tqma6a.dtsi +7 -5
index b252077f4994..ab4c07c13a13 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6q.dtsi"
 #include "imx6qdl-tqma6a.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };
-
arch/arm/dts/imx6q-tqma6b.dtsi +6 -5
index 107a9eb037ea..7224c376c318 100644
@@ -1,14 +1,15 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ */
 
 #include "imx6q.dtsi"
 #include "imx6qdl-tqma6b.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };
-
arch/arm/dts/imx6q.dtsi +21 -15
index c37484dce35f..9caba4529c71 100644
@@ -9,7 +9,6 @@
 / {
 	aliases {
 		ipu1 = &ipu2;
-		video1 = &ipu2;
 		spi4 = &ecspi5;
 	};
 
@@ -50,6 +49,8 @@
 			arm-supply = <&reg_arm>;
 			pu-supply = <&reg_pu>;
 			soc-supply = <&reg_soc>;
+			nvmem-cells = <&cpu_speed_grade>;
+			nvmem-cell-names = "speed_grade";
 		};
 
 		cpu1: cpu@1 {
@@ -74,6 +75,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -108,6 +110,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -142,6 +145,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -173,15 +177,11 @@
 					clocks = <&clks IMX6Q_CLK_ECSPI5>,
 						 <&clks IMX6Q_CLK_ECSPI5>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
+					dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
 			};
-
-			iomuxc: iomuxc@20e0000 {
-				compatible = "fsl,imx6q-iomuxc";
-			};
 		};
 
 		sata: sata@2200000 {
@@ -406,23 +406,29 @@
 &hdmi {
 	compatible = "fsl,imx6q-hdmi";
 
-	port@2 {
-		reg = <2>;
+	ports {
+		port@2 {
+			reg = <2>;
 
-		hdmi_mux_2: endpoint {
-			remote-endpoint = <&ipu2_di0_hdmi>;
+			hdmi_mux_2: endpoint {
+				remote-endpoint = <&ipu2_di0_hdmi>;
+			};
 		};
-	};
 
-	port@3 {
-		reg = <3>;
+		port@3 {
+			reg = <3>;
 
-		hdmi_mux_3: endpoint {
-			remote-endpoint = <&ipu2_di1_hdmi>;
+			hdmi_mux_3: endpoint {
+				remote-endpoint = <&ipu2_di1_hdmi>;
+			};
 		};
 	};
 };
 
+&iomuxc {
+	compatible = "fsl,imx6q-iomuxc";
+};
+
 &ipu1_csi1 {
 	ipu1_csi1_from_mipi_vc1: endpoint {
 		remote-endpoint = <&mipi_vc1_to_ipu1_csi1>;
arch/arm/dts/imx6qdl-aristainetos2-common.dtsi +1 -0
index 570143694e8a..dd683dc2ca38 100644
@@ -344,6 +344,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	status = "okay";
arch/arm/dts/imx6qdl-cubox-i.dtsi +3 -2
index e3be453d8a4a..1e530d892b76 100644
@@ -55,12 +55,12 @@
 		pinctrl-0 = <&pinctrl_cubox_i_ir>;
 	};
 
-	pwmleds {
+	led-controller {
 		compatible = "pwm-leds";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
 
-		front {
+		led-1 {
 			active-low;
 			label = "imx6:red:front";
 			max-brightness = <248>;
@@ -233,6 +233,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +5 -1
index bf6b3a5ce07d..fe72650295a5 100644
@@ -5,9 +5,9 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/input/input.h>
 
 / {
 	chosen {
@@ -263,6 +263,10 @@
 	status = "okay";
 };
 
+&usbh1 {
+	disable-over-current;
+};
+
 &usdhc2 { /* SD card */
 	status = "okay";
 };
arch/arm/dts/imx6qdl-dhcom-som.dtsi +5 -3
index 5d10c40313cb..5befbe13d1a3 100644
@@ -132,14 +132,15 @@
 		#size-cells = <0>;
 
 		ethphy0: ethernet-phy@0 { /* SMSC LAN8710Ai */
-			compatible = "ethernet-phy-ieee802.3-c22";
+			compatible = "ethernet-phy-id0007.c0f0",
+				     "ethernet-phy-ieee802.3-c22";
 			interrupt-parent = <&gpio4>;
 			interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
 			pinctrl-0 = <&pinctrl_ethphy0>;
 			pinctrl-names = "default";
 			reg = <0>;
-			reset-assert-us = <1000>;
-			reset-deassert-us = <1000>;
+			reset-assert-us = <500>;
+			reset-deassert-us = <500>;
 			reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 			smsc,disable-energy-detect; /* Make plugin detection reliable */
 		};
@@ -728,6 +729,7 @@
 	pinctrl_usbh1: usbh1-grp {
 		fsl,pins = <
 			MX6QDL_PAD_EIM_D31__GPIO3_IO31		0x120b0
+			MX6QDL_PAD_EIM_D30__USB_H1_OC		0x1b0b1
 		>;
 	};
 
arch/arm/dts/imx6qdl-gw51xx.dtsi +2 -5
index 812acf7ab824..069c27fab432 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -129,8 +129,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -452,7 +450,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw52xx.dtsi +2 -8
index 81a9ce38b9b1..b1df2beb2832 100644
@@ -13,11 +13,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -33,8 +32,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -195,8 +192,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -547,7 +542,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw53xx.dtsi +3 -19
index 77ac103c2d9f..a0710d562766 100644
@@ -13,11 +13,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -33,8 +32,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -137,8 +134,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -189,8 +185,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -545,14 +539,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -602,7 +593,6 @@
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
 			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -723,12 +713,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw54xx.dtsi +3 -19
index 98c81e9c9b5b..cda48bf2f168 100644
@@ -14,11 +14,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -34,8 +33,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -146,8 +143,7 @@
 			regulator-name = "usb_h1_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
+			regulator-always-on;
 		};
 
 		reg_usb_otg_vbus: regulator@3 {
@@ -226,8 +222,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -615,14 +609,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -680,7 +671,6 @@
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
 			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -818,12 +808,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_SD1_DAT0__GPIO1_IO16		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw551x.dtsi +2 -5
index c0ffea16d81e..435dec6338fe 100644
@@ -57,8 +57,8 @@
 		led0 = &led0;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -67,8 +67,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -536,7 +534,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw552x.dtsi +4 -25
index b853399aec67..2e61102ae694 100644
@@ -14,8 +14,8 @@
 		led1 = &led1;
 		led2 = &led2;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -24,8 +24,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -120,15 +118,7 @@
 		regulator-name = "5P0V";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-	};
-
-	reg_usb_h1_vbus: regulator-usbh1-vbus {
-		compatible = "regulator-fixed";
-		regulator-name = "usb_h1_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 };
 
@@ -399,13 +389,9 @@
 &uart5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart5>;
-	status = "okay";
-};
+	status = "okay"; };
 
 &usbh1 {
-	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -414,7 +400,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
@@ -520,12 +505,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID	0x13059
arch/arm/dts/imx6qdl-gw553x.dtsi +2 -3
index b15c2818524f..4662408b225a 100644
@@ -55,8 +55,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -509,7 +509,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw560x.dtsi +3 -11
index 1e95267c974f..4bc4371e6bae 100644
@@ -55,11 +55,9 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc2;
-		mmc1 = &usdhc3;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -93,8 +91,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -221,8 +217,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -280,8 +275,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -661,7 +654,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5903.dtsi +0 -6
index 6ebf6aef2f7d..1fdb7ba630f1 100644
@@ -75,8 +75,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -223,9 +221,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -534,7 +529,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5904.dtsi +8 -19
index 286c7a9924c2..612b6e068e28 100644
@@ -55,9 +55,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -73,8 +72,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -176,8 +173,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -201,9 +197,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 
 	fixed-link {
@@ -474,6 +467,11 @@
 		};
 	};
 
+	crypto@60 {
+		compatible = "atmel,atecc508a";
+		reg = <0x60>;
+	};
+
 	imu@6a {
 		compatible = "st,lsm9ds1-imu";
 		reg = <0x6a>;
@@ -588,14 +586,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbotg>;
 	status = "okay";
 };
 
@@ -756,12 +751,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw5907.dtsi +2 -7
index a36b6e7048c7..fcd3bdfd6182 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -23,8 +23,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -131,8 +129,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -380,7 +376,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5910.dtsi +0 -7
index 446c1043a768..68e5ab2e27e2 100644
@@ -13,7 +13,6 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 	};
 
 	chosen {
@@ -27,8 +26,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -146,9 +143,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -402,7 +396,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5912.dtsi +3 -19
index 8fd8fdb5147c..0415bcb41640 100644
@@ -13,10 +13,9 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -25,8 +24,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -120,8 +117,7 @@
 		regulator-name = "usb_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio4 5 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 };
 
@@ -142,9 +138,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -381,8 +374,6 @@
 
 &usbh1 {
 	vbus-supply = <&reg_usb_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -432,7 +423,6 @@
 			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -563,12 +553,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_19__GPIO4_IO05		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x13059
arch/arm/dts/imx6qdl-gw5913.dtsi +2 -8
index c2c1c2b160d4..8e23cec7149e 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -23,8 +23,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -121,9 +119,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <100>;
 	status = "okay";
 };
 
@@ -346,7 +341,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-hummingboard2.dtsi +1 -1
index e4231331f04e..eb1ad28946d3 100644
@@ -203,7 +203,7 @@
 &ecspi2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>;
-	cs-gpios = <&gpio2 26 0>;
+	cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-icore.dtsi +17 -2
index 7814f1ef0804..23c318d9636f 100644
@@ -150,10 +150,23 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
 	clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
 	phy-mode = "rmii";
+	phy-handle = <&eth_phy>;
 	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		eth_phy: ethernet-phy@0 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <0>;
+			reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <4000>;
+			reset-deassert-us = <4000>;
+		};
+	};
 };
 
 &gpmi {
@@ -232,6 +245,7 @@
 };
 
 &pwm3 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm3>;
 	status = "okay";
@@ -384,7 +398,7 @@
 
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
-			MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
+			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
 		>;
 	};
 
@@ -396,6 +410,7 @@
 			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
 			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
 			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
+			MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0
 		>;
 	};
 
arch/arm/dts/imx6qdl-mba6.dtsi +464 -135

424 lines not on this page · raw message

arch/arm/dts/imx6qdl-mba6a.dtsi +13 -22
index d8b4d00d8537..df8fa169e9f6 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-mba6b.dtsi +22 -18
index 7489b48d82d5..7d1cd7454c7f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-nitrogen6x.dtsi +678 -55

733 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-mira.dtsi +27 -5
index 9ebd438dce7d..120d6e997a4c 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +27 -3
index 77d871340eb7..28a805384668 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-pico.dtsi +215 -11

226 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabreauto.dtsi +86 -33

119 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabrelite.dtsi +634 -240

874 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi +6 -0
index 45f02b19c7ee..8cd34a794c62 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-sabresd.dtsi +162 -52

214 lines not on this page · raw message

arch/arm/dts/imx6qdl-sr-som-ti.dtsi +1 -0
index 44a97ba93a95..352ac585ca6b 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-sr-som.dtsi +19 -3
index b06577808ff4..f86efd0ccc40 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-tqma6.dtsi +165 -161

326 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6a.dtsi +36 -10

46 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6b.dtsi +17 -11
index 682f55370122..dd0925766440 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-udoo.dtsi +2 -0
index 2d0d102661bd..ccfa8e320be6 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-wandboard-revd1.dtsi +0 -2
index 93909796885a..bf86b639fdac 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-wandboard.dtsi +92 -10

102 lines not on this page · raw message

arch/arm/dts/imx6qdl.dtsi +120 -70

190 lines not on this page · raw message

arch/arm/dts/imx6qp-sabreauto.dts +6 -1
index d4caeeb0af70..2bb3bfb18ec3 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qp-sabresd.dts +9 -1
index f1b9cb104fdd..f69eec18d865 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qp.dtsi +1 -2
index 93b89dc1f53b..050365513836 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6sl-evk.dts +100 -83

183 lines not on this page · raw message

arch/arm/dts/imx6sl.dtsi +213 -135

348 lines not on this page · raw message

arch/arm/dts/imx6sll-evk.dts +327 -552

879 lines not on this page · raw message

arch/arm/dts/imx6sll.dtsi +211 -234

445 lines not on this page · raw message

arch/arm/dts/imx6sx-sabreauto.dts +476 -147

623 lines not on this page · raw message

arch/arm/dts/imx6sx-sdb.dts +4 -4
index 5a63ca615722..969cfe920d25 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6sx-sdb.dtsi +49 -7

56 lines not on this page · raw message

arch/arm/dts/imx6sx-softing-vining-2000.dts +21 -29

50 lines not on this page · raw message

arch/arm/dts/imx6sx-udoo-neo.dtsi +74 -0

74 lines not on this page · raw message

arch/arm/dts/imx6sx.dtsi +79 -48

127 lines not on this page · raw message

arch/arm/dts/imx6ul-14x14-evk.dtsi +139 -22

161 lines not on this page · raw message

arch/arm/dts/imx6ul-geam.dts +321 -42

363 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot-emmc.dts +2 -40

42 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot-nand.dts +6 -39

45 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot.dtsi +276 -54

330 lines not on this page · raw message

arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi +2 -16
index 4682a79f5b23..770f59b23102 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi +14 -16
index e9ec6b78919d..09a83dbdf651 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-litesom.dtsi +1 -0
index 8f775f6974d1..8d6893210842 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-opos6ul.dtsi +4 -190

194 lines not on this page · raw message

arch/arm/dts/imx6ul-opos6uldev.dts +8 -379

387 lines not on this page · raw message

arch/arm/dts/imx6ul-phytec-phycore-som.dtsi +18 -3
index c2a7c7877948..3cddc68917a0 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +2 -0
index 699dfcbf9a60..607eddc5030f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-phytec-segin.dtsi +2 -44

46 lines not on this page · raw message

arch/arm/dts/imx6ul-pico-hobbit.dts +1 -1
index 39eeeddac39e..09f7ffa9ad8c 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-pico-pi.dts +2 -2
index de07357b27fc..6cd7d5877d20 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul-pico.dtsi +16 -24
index de9f83189ba8..357ffb2f5ad6 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ul.dtsi +123 -63

186 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri.dtsi +240 -187

427 lines not on this page · raw message

arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts +1 -1
index 2fd69da02843..79cc45728cd2 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts +1 -0
index 9648d4ecaf58..8e2a4c5d7765 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull-phytec-segin.dtsi +0 -7
index c1595fc785f7..e287a0453b5f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull.dtsi +14 -0
index f224e20bda92..9bf67490ac49 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ulz.dtsi +0 -1
index aeb2ddc540e1..0b5f1a763567 100644

Lines of this file are not shown. View the raw message.

include/dt-bindings/clock/imx6qdl-clock.h +9 -5
index 29050337d9d5..e20c43cc36f6 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#7 lore raw
Quoted 9 lines · Fabio Estevam

Hi Marcel,

Quoted 4 lines · Marcel Ziswiler

Messing with all those so late in the game does not seem like too good of an idea. Therefore, I suggest reverting just that one PWM node for now. We may (and really should) properly synchronise all i.MX 6 DTs again in the next cycle.

Quoted 8 lines

I did an attempt to sync the imx6 dts with Linux and generated the attached patch.

It builds the dtb's cleanly.

Boot tested only on a imx6q-sabresd.

I can send it after 2022.07 is released.

We're in rc1, there is still time to get things synced for 2022.07, so just send it.

#8 lore raw
Quoted 13 lines · Marek Vasut
Quoted 12 lines · Fabio Estevam

Hi Marcel,

Quoted 4 lines · Marcel Ziswiler

Messing with all those so late in the game does not seem like too good of an idea. Therefore, I suggest reverting just that one PWM node for now. We may (and really should) properly synchronise all i.MX 6 DTs again in the next cycle.

I did an attempt to sync the imx6 dts with Linux and generated the attached patch.

Quoted 8 lines
Quoted 5 lines

It builds the dtb's cleanly.

Boot tested only on a imx6q-sabresd.

I can send it after 2022.07 is released.

We're in rc1, there is still time to get things synced for 2022.07, so just send it.

Yes, please! These dts files should be getting re-synced regularly.

Signature · 1 line
Tom