Skip to contentSkip to conversation

arm64: zymqmp: DT alignments

PATCH Applied Michal Simek 1 participant 6 messages Dec 19, 2023 – Jan 4, 2024

Subsystems (2)
lore
Share & tools
lore

Michal Simek

author maintainer
#0 lore raw

cover arm64: zymqmp: DT alignments

Hi,

sending couple of patches to get in sync with Linux kernel and they are already in linux-next.
The last patch is based on the latest proposed update in dt binding. When dt binding is reviewed this patch can be merged to U-Boot too but I want to make it available earlier.

Thanks,
Michal

Michal Simek (4):
arm64: zynqmp: Move fixed clock to / for kv260
arm64: zynqmp: Fix clock node name in kv260 cards
arm64: zynqmp: Remove mt25qu512a compatible string from SOM
arm64: zynqmp: Rename i2c?-gpio to i2c?-gpio-grp

 arch/arm/dts/zynq-zc702.dts                |  2 +-
 arch/arm/dts/zynqmp-sc-revB.dts            |  4 +-
 arch/arm/dts/zynqmp-sck-kd-g-revA.dtso     |  2 +-
 arch/arm/dts/zynqmp-sck-kr-g-revA.dtso     |  2 +-
 arch/arm/dts/zynqmp-sck-kr-g-revB.dtso     |  2 +-
 arch/arm/dts/zynqmp-sck-kv-g-revA.dtso     | 52 ++++++++++-----------
 arch/arm/dts/zynqmp-sck-kv-g-revB.dtso     | 54 +++++++++++-----------
 arch/arm/dts/zynqmp-sm-k26-revA.dts        |  2 +-
 arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts |  4 +-
 arch/arm/dts/zynqmp-vpk120-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts   |  2 +-
 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts   |  2 +-
 arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts   |  4 +-
 arch/arm/dts/zynqmp-zcu100-revC.dts        |  2 +-
 arch/arm/dts/zynqmp-zcu102-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu104-revA.dts        |  2 +-
 arch/arm/dts/zynqmp-zcu104-revC.dts        |  2 +-
 arch/arm/dts/zynqmp-zcu106-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu111-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu208-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu216-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu670-revA.dts        |  4 +-
 arch/arm/dts/zynqmp-zcu670-revB.dts        |  4 +-
 23 files changed, 83 insertions(+), 87 deletions(-)
Signature · 1 line
2.36.1
author maintainer
#1 lore raw

PATCH 1/4 arm64: zynqmp: Move fixed clock to / for kv260

fixed clock nodes can't be on the bus because they are missing reg property. That's why move them to root.
And because it is root it is good to have it as the first node in a file.

---

 arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 38 ++++++++++++------------
 arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 40 ++++++++++++--------------
 2 files changed, 37 insertions(+), 41 deletions(-)
arch/arm/dts/zynqmp-sck-kv-g-revA.dtso +18 -20
index f43c159cdca9..3db420cc94bb 100644
@@ -27,27 +27,7 @@
 		     "xlnx,zynqmp-sk-kv260-revZ",
 		     "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
 	model = "ZynqMP KV260 revA";
-};
-
-&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
-	#address-cells = <1>;
-	#size-cells = <0>;
-	pinctrl-names = "default", "gpio";
-	pinctrl-0 = <&pinctrl_i2c1_default>;
-	pinctrl-1 = <&pinctrl_i2c1_gpio>;
-	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-	u14: ina260@40 { /* u14 */
-		compatible = "ti,ina260";
-		#io-channel-cells = <1>;
-		label = "ina260-u14";
-		reg = <0x40>;
-	};
-	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
-};
 
-&amba {
 	ina260-u14 {
 		compatible = "iio-hwmon";
 		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
@@ -90,6 +70,24 @@
 	};
 };
 
+&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default", "gpio";
+	pinctrl-0 = <&pinctrl_i2c1_default>;
+	pinctrl-1 = <&pinctrl_i2c1_gpio>;
+	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+	u14: ina260@40 { /* u14 */
+		compatible = "ti,ina260";
+		#io-channel-cells = <1>;
+		label = "ina260-u14";
+		reg = <0x40>;
+	};
+	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
+};
+
 /* DP/USB 3.0 and SATA */
 &psgtr {
 	status = "okay";
arch/arm/dts/zynqmp-sck-kv-g-revB.dtso +19 -21
index 3643569cc7c8..6756fdbdfe9d 100644
@@ -22,28 +22,7 @@
 		     "xlnx,zynqmp-sk-kv260-revB",
 		     "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
 	model = "ZynqMP KV260 revB";
-};
-
-&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
-	#address-cells = <1>;
-	#size-cells = <0>;
-	pinctrl-names = "default", "gpio";
-	pinctrl-0 = <&pinctrl_i2c1_default>;
-	pinctrl-1 = <&pinctrl_i2c1_gpio>;
-	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-	u14: ina260@40 { /* u14 */
-		compatible = "ti,ina260";
-		#io-channel-cells = <1>;
-		label = "ina260-u14";
-		reg = <0x40>;
-	};
-	/* u43 - 0x2d - USB hub */
-	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
-};
 
-&amba {
 	ina260-u14 {
 		compatible = "iio-hwmon";
 		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
@@ -86,6 +65,25 @@
 	};
 };
 
+&i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default", "gpio";
+	pinctrl-0 = <&pinctrl_i2c1_default>;
+	pinctrl-1 = <&pinctrl_i2c1_gpio>;
+	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+	u14: ina260@40 { /* u14 */
+		compatible = "ti,ina260";
+		#io-channel-cells = <1>;
+		label = "ina260-u14";
+		reg = <0x40>;
+	};
+	/* u43 - 0x2d - USB hub */
+	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
+};
+
 /* DP/USB 3.0 */
 &psgtr {
 	status = "okay";
Signature · 1 line
2.36.1
author maintainer
#2 lore raw

PATCH 2/4 arm64: zynqmp: Fix clock node name in kv260 cards

In reply to Michal Simek

node name shouldn't use '_' that's why convert it to '-'.

---

 arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 12 ++++++------
 arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/dts/zynqmp-sck-kv-g-revA.dtso +6 -6
index 3db420cc94bb..04ae59290a0b 100644
@@ -33,37 +33,37 @@
 		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
 	};
 
-	si5332_0: si5332_0 { /* u17 */
+	si5332_0: si5332-0 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <125000000>;
 	};
 
-	si5332_1: si5332_1 { /* u17 */
+	si5332_1: si5332-1 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <25000000>;
 	};
 
-	si5332_2: si5332_2 { /* u17 */
+	si5332_2: si5332-2 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <48000000>;
 	};
 
-	si5332_3: si5332_3 { /* u17 */
+	si5332_3: si5332-3 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <24000000>;
 	};
 
-	si5332_4: si5332_4 { /* u17 */
+	si5332_4: si5332-4 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <26000000>;
 	};
 
-	si5332_5: si5332_5 { /* u17 */
+	si5332_5: si5332-5 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <27000000>;
arch/arm/dts/zynqmp-sck-kv-g-revB.dtso +6 -6
index 6756fdbdfe9d..adf3511ad313 100644
@@ -28,37 +28,37 @@
 		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
 	};
 
-	si5332_0: si5332_0 { /* u17 */
+	si5332_0: si5332-0 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <125000000>;
 	};
 
-	si5332_1: si5332_1 { /* u17 */
+	si5332_1: si5332-1 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <25000000>;
 	};
 
-	si5332_2: si5332_2 { /* u17 */
+	si5332_2: si5332-2 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <48000000>;
 	};
 
-	si5332_3: si5332_3 { /* u17 */
+	si5332_3: si5332-3 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <24000000>;
 	};
 
-	si5332_4: si5332_4 { /* u17 */
+	si5332_4: si5332-4 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <26000000>;
 	};
 
-	si5332_5: si5332_5 { /* u17 */
+	si5332_5: si5332-5 { /* u17 */
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <27000000>;
Signature · 1 line
2.36.1
author maintainer
#3 lore raw

PATCH 3/4 arm64: zynqmp: Remove mt25qu512a compatible string from SOM

In reply to Michal Simek

mt25qu512a is not documented in DT binding that's why remove it.

---

 arch/arm/dts/zynqmp-sm-k26-revA.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-sm-k26-revA.dts +1 -1
index 1d62c48e062e..5859e6cd8c23 100644
@@ -144,7 +144,7 @@
 &qspi { /* MIO 0-5 - U143 */
 	status = "okay";
 	spi_flash: flash@0 { /* MT25QU512A */
-		compatible = "mt25qu512a", "jedec,spi-nor"; /* 64MB */
+		compatible = "jedec,spi-nor"; /* 64MB */
 		reg = <0>;
 		spi-tx-bus-width = <4>;
 		spi-rx-bus-width = <4>;
Signature · 1 line
2.36.1
author maintainer
#4 lore raw

PATCH 4/4 arm64: zynqmp: Rename i2c?-gpio to i2c?-gpio-grp

In reply to Michal Simek

Anything ending with gpio/gpios is taken as gpio phande/description which is reported as the issue coming from gpio-consumer.yaml schema. That's why rename the gpio suffix to gpio-grp to avoid name collision.

---

Dt binding change has been sent here.
https://lore.kernel.org/r/2e3a1f1f57cf929bd05115bc081e6d01d5a53443.1702996859.git.michal.simek@amd.com

---
 arch/arm/dts/zynq-zc702.dts                | 2 +-
 arch/arm/dts/zynqmp-sc-revB.dts            | 4 ++--
 arch/arm/dts/zynqmp-sck-kd-g-revA.dtso     | 2 +-
 arch/arm/dts/zynqmp-sck-kr-g-revA.dtso     | 2 +-
 arch/arm/dts/zynqmp-sck-kr-g-revB.dtso     | 2 +-
 arch/arm/dts/zynqmp-sck-kv-g-revA.dtso     | 2 +-
 arch/arm/dts/zynqmp-sck-kv-g-revB.dtso     | 2 +-
 arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 4 ++--
 arch/arm/dts/zynqmp-vpk120-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts   | 2 +-
 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts   | 2 +-
 arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts   | 4 ++--
 arch/arm/dts/zynqmp-zcu100-revC.dts        | 2 +-
 arch/arm/dts/zynqmp-zcu102-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu104-revA.dts        | 2 +-
 arch/arm/dts/zynqmp-zcu104-revC.dts        | 2 +-
 arch/arm/dts/zynqmp-zcu106-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu111-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu208-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu216-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu670-revA.dts        | 4 ++--
 arch/arm/dts/zynqmp-zcu670-revB.dts        | 4 ++--
 22 files changed, 33 insertions(+), 33 deletions(-)
arch/arm/dts/zynq-zc702.dts +1 -1
index 6083f99dc8d4..7864b4b8bbbd 100644
@@ -294,7 +294,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_50_grp", "gpio0_51_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-sc-revB.dts +2 -2
index e0b554c9c545..f7349fdc3b4c 100644
@@ -344,7 +344,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_34_grp", "gpio0_35_grp";
 			function = "gpio0";
@@ -371,7 +371,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-sck-kd-g-revA.dtso +1 -1
index 298e80265e2a..766f78303eee 100644
@@ -225,7 +225,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-sck-kr-g-revA.dtso +1 -1
index 95b1dc5aa571..57cd9ba13e78 100644
@@ -274,7 +274,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-sck-kr-g-revB.dtso +1 -1
index e2387a2abb8f..21187396326b 100644
@@ -274,7 +274,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-sck-kv-g-revA.dtso +1 -1
index 04ae59290a0b..6d0d5c487d2e 100644
@@ -248,7 +248,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-sck-kv-g-revB.dtso +1 -1
index adf3511ad313..a4b4465d2038 100644
@@ -235,7 +235,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		conf {
 			groups = "gpio0_24_grp", "gpio0_25_grp";
 			slew-rate = <SLEW_RATE_SLOW>;
arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts +2 -2
index 9ab8f5bfffe4..088545c87cee 100644
@@ -400,7 +400,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_34_grp", "gpio0_35_grp";
 			function = "gpio0";
@@ -427,7 +427,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_36_grp", "gpio0_37_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-vpk120-revA.dts +2 -2
index ce76e0b3db36..fa6046eb95c4 100644
@@ -536,7 +536,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_34_grp", "gpio0_35_grp";
 			function = "gpio0";
@@ -563,7 +563,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_36_grp", "gpio0_37_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +1 -1
index e72ed50b1cb2..27b38e981a05 100644
@@ -148,7 +148,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_36_grp", "gpio0_37_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +1 -1
index 160c6c58b36d..ff7069bc1249 100644
@@ -273,7 +273,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_6_grp", "gpio0_7_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts +2 -2
index b1857e17ab7e..53aa3dca1dca 100644
@@ -125,7 +125,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_74_grp", "gpio0_75_grp";
 			function = "gpio0";
@@ -152,7 +152,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_76_grp", "gpio0_77_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu100-revC.dts +1 -1
index 44d1b24677d1..49d5cdbba585 100644
@@ -284,7 +284,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_4_grp", "gpio0_5_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu102-revA.dts +2 -2
index e166c9555069..3132fa533b8e 100644
@@ -708,7 +708,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -735,7 +735,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -1
index cdfeea2fdd84..31effbf27a8e 100644
@@ -272,7 +272,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -1
index 4b942acd4132..999b2431bdf2 100644
@@ -284,7 +284,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu106-revA.dts +2 -2
index b90ff61d2416..ba3989cad3e4 100644
@@ -719,7 +719,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -746,7 +746,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu111-revA.dts +2 -2
index ba9e4891fccc..787cf0d87f9f 100644
@@ -589,7 +589,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -616,7 +616,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu208-revA.dts +2 -2
index 22ad8d33a116..b4e24745a9a6 100644
@@ -600,7 +600,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -627,7 +627,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu216-revA.dts +2 -2
index 575ff5b1b77b..6f593e80841f 100644
@@ -610,7 +610,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -637,7 +637,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu670-revA.dts +2 -2
index edbbf0b30e7b..76410de1edca 100644
@@ -573,7 +573,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -600,7 +600,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
arch/arm/dts/zynqmp-zcu670-revB.dts +2 -2
index 97599c5658fb..c2dd9f696bf0 100644
@@ -573,7 +573,7 @@
 		};
 	};
 
-	pinctrl_i2c0_gpio: i2c0-gpio {
+	pinctrl_i2c0_gpio: i2c0-gpio-grp {
 		mux {
 			groups = "gpio0_14_grp", "gpio0_15_grp";
 			function = "gpio0";
@@ -600,7 +600,7 @@
 		};
 	};
 
-	pinctrl_i2c1_gpio: i2c1-gpio {
+	pinctrl_i2c1_gpio: i2c1-gpio-grp {
 		mux {
 			groups = "gpio0_16_grp", "gpio0_17_grp";
 			function = "gpio0";
Signature · 1 line
2.36.1
author maintainer Applied
#5 lore raw
In reply to Michal Simek
Quoted 34 lines · Michal Simek

Hi,

sending couple of patches to get in sync with Linux kernel and they are already in linux-next.
The last patch is based on the latest proposed update in dt binding. When dt binding is reviewed this patch can be merged to U-Boot too but I want to make it available earlier.

Thanks,
Michal

Michal Simek (4):
arm64: zynqmp: Move fixed clock to / for kv260
arm64: zynqmp: Fix clock node name in kv260 cards
arm64: zynqmp: Remove mt25qu512a compatible string from SOM
arm64: zynqmp: Rename i2c?-gpio to i2c?-gpio-grp

  arch/arm/dts/zynq-zc702.dts                |  2 +-
  arch/arm/dts/zynqmp-sc-revB.dts            |  4 +-
  arch/arm/dts/zynqmp-sck-kd-g-revA.dtso     |  2 +-
  arch/arm/dts/zynqmp-sck-kr-g-revA.dtso     |  2 +-
  arch/arm/dts/zynqmp-sck-kr-g-revB.dtso     |  2 +-
  arch/arm/dts/zynqmp-sck-kv-g-revA.dtso     | 52 ++++++++++-----------
  arch/arm/dts/zynqmp-sck-kv-g-revB.dtso     | 54 +++++++++++-----------
  arch/arm/dts/zynqmp-sm-k26-revA.dts        |  2 +-
  arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts |  4 +-
  arch/arm/dts/zynqmp-vpk120-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts   |  2 +-
  arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts   |  2 +-
  arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts   |  4 +-
  arch/arm/dts/zynqmp-zcu100-revC.dts        |  2 +-
  arch/arm/dts/zynqmp-zcu102-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu104-revA.dts        |  2 +-
Quoted 9 lines
  arch/arm/dts/zynqmp-zcu104-revC.dts        |  2 +-
  arch/arm/dts/zynqmp-zcu106-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu111-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu208-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu216-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu670-revA.dts        |  4 +-
  arch/arm/dts/zynqmp-zcu670-revB.dts        |  4 +-
  23 files changed, 83 insertions(+), 87 deletions(-)

Applied.
M