Skip to contentSkip to conversation

arm64: zynqmp: DT syncup patches next

PATCH Applied Michal Simek 2 participants 9 messages Jun 7, 2021 – Jun 14, 2021

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

cover arm64: zynqmp: DT syncup patches next

Hi,

this is the next series which is trying to clean and sync DTS files. At the end we want to have all these files be in sync with the Linux kernel based on DT binding available in the Linux kernel.

Thanks,
Michal

Michal Simek (6):
xilinx: Convert xlnx,eeprom property to nvmem alias
arm64: zynqmp: Remove si5328 and si5382 nodes
arm64: zynqmp: Remove can aliases from zc1751
arm64: zynqmp: Remove unused property from SD/USB
arm64: zynqmp: Remove information about dma clock on zcu106
arm64: zynqmp: Sync psgtr location on zcu104/zcu111/zc1751-dc1

Srinivas Neeli (1):
arm64: zynqmp: rtc: Update rtc calibration value

 ...ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts |  2 +-
 arch/arm/dts/zynq-syzygy-hub.dts              |  2 +-
 arch/arm/dts/zynqmp-a2197-revA.dts            |  3 ++-
 arch/arm/dts/zynqmp-e-a2197-00-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-g-a2197-00-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-01-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-02-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-03-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-p-a2197-00-revA.dts       |  3 +--
 arch/arm/dts/zynqmp-sm-k26-revA.dts           |  4 ++--
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts      | 14 +++++------
 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts      |  2 --
 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts      |  2 --
 arch/arm/dts/zynqmp-zcu102-revA.dts           | 12 ++--------
 arch/arm/dts/zynqmp-zcu104-revA.dts           | 20 ++++++++--------
 arch/arm/dts/zynqmp-zcu104-revC.dts           | 21 ++++++++---------
 arch/arm/dts/zynqmp-zcu106-revA.dts           | 23 ++-----------------
 arch/arm/dts/zynqmp-zcu111-revA.dts           | 21 ++++++++---------
 arch/arm/dts/zynqmp-zcu208-revA.dts           |  2 +-
 arch/arm/dts/zynqmp-zcu216-revA.dts           |  2 +-
 arch/arm/dts/zynqmp.dtsi                      | 10 +-------
 21 files changed, 53 insertions(+), 100 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH 1/7 arm64: zynqmp: rtc: Update rtc calibration value

From: Srinivas Neeli <[email protected]>

As per the design specification
"The 16-bit Seconds Calibration Value represents the number of
Oscillator Ticks that are required to measure the largest time period that is less than or equal to 1 second.
For an oscillator that is 32.768 KHz, this value will be 0x7FFF."

---

 arch/arm/dts/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp.dtsi +1 -1
index 47ffdf1b1650..d7e551630d6f 100644
@@ -691,7 +691,7 @@
 			interrupt-parent = <&gic>;
 			interrupts = <0 26 4>, <0 27 4>;
 			interrupt-names = "alarm", "sec";
-			calibration = <0x8000>;
+			calibration = <0x7FFF>;
 		};
 
 		sata: ahci@fd0c0000 {
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/7 xilinx: Convert xlnx,eeprom property to nvmem alias

In reply to Michal Simek

Convert all boards to use nvmem alias instead of xlnx,eeprom. The change is done based on discussion in the link below.

---

Information about board is shown as:

Model: ZynqMP ZCU102 Rev1.0
Board: Xilinx ZynqMP
DRAM:  4 GiB

PMUFW: v1.1
Xilinx I2C Legacy format at nvmem0:
Board name: zcu102
Board rev: 1.0
Board SN: 847316301727-67998
Ethernet mac: 00:0a:35:03:70:f6
EL Level: EL2
Chip ID: zu9eg

WDT:   Started with servicing (60s timeout)
NAND:  0 MiB
---
 arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts | 2 +-
 arch/arm/dts/zynq-syzygy-hub.dts                              | 2 +-
 arch/arm/dts/zynqmp-a2197-revA.dts                            | 3 ++-
 arch/arm/dts/zynqmp-e-a2197-00-revA.dts                       | 2 +-
 arch/arm/dts/zynqmp-g-a2197-00-revA.dts                       | 2 +-
 arch/arm/dts/zynqmp-m-a2197-01-revA.dts                       | 2 +-
 arch/arm/dts/zynqmp-m-a2197-02-revA.dts                       | 2 +-
 arch/arm/dts/zynqmp-m-a2197-03-revA.dts                       | 2 +-
 arch/arm/dts/zynqmp-p-a2197-00-revA.dts                       | 3 +--
 arch/arm/dts/zynqmp-sm-k26-revA.dts                           | 4 ++--
 arch/arm/dts/zynqmp-zcu102-revA.dts                           | 2 +-
 arch/arm/dts/zynqmp-zcu104-revA.dts                           | 1 +
 arch/arm/dts/zynqmp-zcu104-revC.dts                           | 2 +-
 arch/arm/dts/zynqmp-zcu106-revA.dts                           | 2 +-
 arch/arm/dts/zynqmp-zcu111-revA.dts                           | 2 +-
 arch/arm/dts/zynqmp-zcu208-revA.dts                           | 2 +-
 arch/arm/dts/zynqmp-zcu216-revA.dts                           | 2 +-
 17 files changed, 19 insertions(+), 18 deletions(-)
arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts +1 -1
index 85ab9e9e29ab..6d1448e8697a 100644
@@ -15,10 +15,10 @@
 		     "xlnx,zynqmp";
 	chosen {
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 	aliases {
 		ethernet0 = &gem3;
+		nvmem0 = &eeprom;
 		serial0 = &uart0;
 	};
 };
arch/arm/dts/zynq-syzygy-hub.dts +1 -1
index 55f8e8a2da43..cb878b0d0dc5 100644
@@ -16,6 +16,7 @@
 		ethernet0 = &gem0;
 		serial0 = &uart0;
 		mmc0 = &sdhci0;
+		nvmem0 = &eeprom;
 		i2c0 = &i2c1;
 	};
 
@@ -27,7 +28,6 @@
 	chosen {
 		bootargs = "";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	usb_phy0: phy0 {
arch/arm/dts/zynqmp-a2197-revA.dts +2 -1
index 27a9c60949a7..89c3a281d0d9 100644
@@ -18,13 +18,14 @@
 
 	aliases {
 		i2c0 = &i2c0;
+		nvmem0 = &eeprom1;
+		nvmem1 = &eeprom0;
 		serial0 = &uart0;
 	};
 
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom1 &eeprom0 &eeprom0>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-e-a2197-00-revA.dts +1 -1
index 32982020ff48..bd0ba557e072 100644
@@ -23,6 +23,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &dcc;
@@ -31,7 +32,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-g-a2197-00-revA.dts +1 -1
index 004c4cb784d9..ee530ba3e147 100644
@@ -21,6 +21,7 @@
 		ethernet0 = &gem0;
 		i2c0 = &i2c0;
 		mmc0 = &sdhci0;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &dcc;
@@ -30,7 +31,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +1 -1
index 0645ce931a23..86f2ccf4d951 100644
@@ -23,6 +23,7 @@
 		i2c1 = &i2c1;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-m-a2197-02-revA.dts +1 -1
index 93bda86636bc..e980fb07fc30 100644
@@ -23,6 +23,7 @@
 		i2c1 = &i2c1;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-m-a2197-03-revA.dts +1 -1
index 39962eb0cdcb..c8c5100672fe 100644
@@ -23,6 +23,7 @@
 		i2c1 = &i2c1;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +1 -2
index 244662dab62c..d50b335e674d 100644
@@ -24,6 +24,7 @@
 		i2c1 = &i2c1;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -35,8 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
-		/* xlnx,fmc-eeprom = FIXME */
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-sm-k26-revA.dts +2 -2
index ec0569452acf..b8a2249be426 100644
@@ -26,6 +26,8 @@
 		i2c1 = &i2c1;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
+		nvmem0 = &eeprom;
+		nvmem1 = &eeprom_cc;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -35,8 +37,6 @@
 		spi2 = &spi1;
 		usb0 = &usb0;
 		usb1 = &usb1;
-		nvmem0 = &eeprom;
-		nvmem1 = &eeprom_cc;
 	};
 
 	chosen {
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -1
index cad0c62d084e..daf945702508 100644
@@ -25,6 +25,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -36,7 +37,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -0
index 9663ee8b49a6..d10ff419b07c 100644
@@ -23,6 +23,7 @@
 		ethernet0 = &gem3;
 		i2c0 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -1
index fd015fdef1af..e70b66c90b6e 100644
@@ -23,6 +23,7 @@
 		ethernet0 = &gem3;
 		i2c0 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -34,7 +35,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -1
index aa45470a7aef..cafac6ba6814 100644
@@ -25,6 +25,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &uart1;
@@ -36,7 +37,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -1
index d020ed9e9130..4cf27ed1549c 100644
@@ -25,6 +25,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &dcc;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-zcu208-revA.dts +1 -1
index bd04f902b7c9..d3e20ae85d7e 100644
@@ -25,6 +25,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &dcc;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = &eeprom;
 	};
 
 	memory@0 {
arch/arm/dts/zynqmp-zcu216-revA.dts +1 -1
index d7513cd20eb0..ae7c18196894 100644
@@ -25,6 +25,7 @@
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		mmc0 = &sdhci1;
+		nvmem0 = &eeprom;
 		rtc0 = &rtc;
 		serial0 = &uart0;
 		serial1 = &dcc;
@@ -35,7 +36,6 @@
 	chosen {
 		bootargs = "earlycon";
 		stdout-path = "serial0:115200n8";
-		xlnx,eeprom = <&eeprom>;
 	};
 
 	memory@0 {
Signature · 1 line
2.31.1
#3 lore raw

PATCH 3/7 arm64: zynqmp: Remove si5328 and si5382 nodes

In reply to Michal Simek

There are no drivers for these devices that's why remove that nodes completely. This change is done based on Linux kernel.

---

 arch/arm/dts/zynqmp-zcu102-revA.dts | 10 +---------
 arch/arm/dts/zynqmp-zcu104-revA.dts |  5 +----
 arch/arm/dts/zynqmp-zcu104-revC.dts |  5 +----
 arch/arm/dts/zynqmp-zcu106-revA.dts | 20 +-------------------
 arch/arm/dts/zynqmp-zcu111-revA.dts |  5 +----
 5 files changed, 5 insertions(+), 40 deletions(-)
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -9
index daf945702508..c1af5fc635ee 100644
@@ -604,15 +604,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <4>;
-			si5328: clock-generator@69 {/* SI5328 - u20 */
-				compatible = "silabs,si5328";
-				reg = <0x69>;
-				/*
-				 * Chip has interrupt present connected to PL
-				 * interrupt-parent = <&>;
-				 * interrupts = <>;
-				 */
-			};
+			/* SI5328 - u20 */
 		};
 		/* 5 - 7 unconnected */
 	};
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -4
index d10ff419b07c..1564057cf792 100644
@@ -165,10 +165,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <1>;
-			clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */
-				compatible = "idt,8t49n287";
-				reg = <0x6c>;
-			};
+			/* 8T49N287 - u182 */
 		};
 
 		i2c@2 {
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -4
index e70b66c90b6e..9ed27ec4f8e6 100644
@@ -189,10 +189,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <1>;
-			clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */
-				compatible = "idt,8t49n287";
-				reg = <0x6c>;
-			};
+			/* 8T49N287 - u182 */
 		};
 
 		i2c@2 {
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -19
index cafac6ba6814..26c530d81685 100644
@@ -594,25 +594,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <4>;
-			si5328: clock-generator@69 {/* SI5328 - u20 */
-				reg = <0x69>;
-				/*
-				 * Chip has interrupt present connected to PL
-				 * interrupt-parent = <&>;
-				 * interrupts = <>;
-				 */
-				#address-cells = <1>;
-				#size-cells = <0>;
-				#clock-cells = <1>;
-				clocks = <&refhdmi>;
-				clock-names = "xtal";
-				clock-output-names = "si5328";
-
-				si5328_clk: clk0@0 {
-					reg = <0>;
-					clock-frequency = <27000000>;
-				};
-			};
+			/* SI5328 - u20 */
 		};
 		i2c@5 {
 			#address-cells = <1>;
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -4
index 4cf27ed1549c..2cf6421da3c5 100644
@@ -480,10 +480,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <4>;
-			si5382: clock-generator@69 { /* SI5382 - u48 */
-				compatible = "silabs,si5382";
-				reg = <0x69>;
-			};
+			/* SI5382 - u48 */
 		};
 		i2c@5 {
 			#address-cells = <1>;
Signature · 1 line
2.31.1
#4 lore raw

PATCH 4/7 arm64: zynqmp: Remove can aliases from zc1751

In reply to Michal Simek

Networking subsystem is not using aliases that's why remove them for CAN devices. There is also no any other Xilinx ZynqMP DT file with them.

---

 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 --
 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 --
 2 files changed, 4 deletions(-)
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +0 -2
index e9924674ab45..4225a9547c58 100644
@@ -19,8 +19,6 @@
 	compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
 
 	aliases {
-		can0 = &can0;
-		can1 = &can1;
 		ethernet0 = &gem2;
 		i2c0 = &i2c0;
 		rtc0 = &rtc;
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +0 -2
index d31582a979be..f420f83ad208 100644
@@ -17,8 +17,6 @@
 	compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
 
 	aliases {
-		can0 = &can0;
-		can1 = &can1;
 		ethernet0 = &gem0;
 		ethernet1 = &gem1;
 		ethernet2 = &gem2;
Signature · 1 line
2.31.1
#5 lore raw

PATCH 5/7 arm64: zynqmp: Remove unused property from SD/USB

In reply to Michal Simek

Linux kernel is not using these properties that's why they can be removed.

---

 arch/arm/dts/zynqmp.dtsi | 8 --------
 1 file changed, 8 deletions(-)
arch/arm/dts/zynqmp.dtsi +0 -8
index d7e551630d6f..7de7166bd7fb 100644
@@ -719,8 +719,6 @@
 			xlnx,device_id = <0>;
 			#stream-id-cells = <1>;
 			iommus = <&smmu 0x870>;
-			nvmem-cells = <&soc_revision>;
-			nvmem-cell-names = "soc_revision";
 			#clock-cells = <1>;
 			clock-output-names = "clk_out_sd0", "clk_in_sd0";
 			power-domains = <&zynqmp_firmware PD_SD_0>;
@@ -737,8 +735,6 @@
 			xlnx,device_id = <1>;
 			#stream-id-cells = <1>;
 			iommus = <&smmu 0x871>;
-			nvmem-cells = <&soc_revision>;
-			nvmem-cell-names = "soc_revision";
 			#clock-cells = <1>;
 			clock-output-names = "clk_out_sd1", "clk_in_sd1";
 			power-domains = <&zynqmp_firmware PD_SD_1>;
@@ -853,8 +849,6 @@
 			clock-names = "bus_clk", "ref_clk";
 			power-domains = <&zynqmp_firmware PD_USB_0>;
 			ranges;
-			nvmem-cells = <&soc_revision>;
-			nvmem-cell-names = "soc_revision";
 
 			dwc3_0: dwc3@fe200000 {
 				compatible = "snps,dwc3";
@@ -879,8 +873,6 @@
 			clock-names = "bus_clk", "ref_clk";
 			power-domains = <&zynqmp_firmware PD_USB_1>;
 			ranges;
-			nvmem-cells = <&soc_revision>;
-			nvmem-cell-names = "soc_revision";
 
 			dwc3_1: dwc3@fe300000 {
 				compatible = "snps,dwc3";
Signature · 1 line
2.31.1
#6 lore raw

PATCH 6/7 arm64: zynqmp: Remove information about dma clock on zcu106

In reply to Michal Simek

Clock setting is not static anymore that's why it depends on firmware setup that's why remove this comment.

---

 arch/arm/dts/zynqmp-zcu106-revA.dts | 1 -
 1 file changed, 1 deletion(-)
arch/arm/dts/zynqmp-zcu106-revA.dts +0 -1
index 26c530d81685..ac6689c16730 100644
@@ -162,7 +162,6 @@
 	status = "okay";
 };
 
-/* fpd_dma clk 667MHz, lpd_dma 500MHz */
 &fpd_dma_chan1 {
 	status = "okay";
 };
Signature · 1 line
2.31.1
#7 lore raw

PATCH 7/7 arm64: zynqmp: Sync psgtr location on zcu104/zcu111/zc1751-dc1

In reply to Michal Simek

psgtr node should be below pinctrl for easier comparion among dts files. That's why move that nodes to different location.

---

 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 14 +++++++-------
 arch/arm/dts/zynqmp-zcu104-revA.dts      | 14 +++++++-------
 arch/arm/dts/zynqmp-zcu104-revC.dts      | 14 +++++++-------
 arch/arm/dts/zynqmp-zcu111-revA.dts      | 14 +++++++-------
 4 files changed, 28 insertions(+), 28 deletions(-)
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +7 -7
index e59342361397..f7dc0f7fb6f6 100644
@@ -59,13 +59,6 @@
 	};
 };
 
-&psgtr {
-	status = "okay";
-	/* dp, usb3, sata */
-	clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>;
-	clock-names = "ref1", "ref2", "ref3";
-};
-
 &fpd_dma_chan1 {
 	status = "okay";
 };
@@ -344,6 +337,13 @@
 	};
 };
 
+&psgtr {
+	status = "okay";
+	/* dp, usb3, sata */
+	clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>;
+	clock-names = "ref1", "ref2", "ref3";
+};
+
 &qspi {
 	status = "okay";
 	flash@0 {
arch/arm/dts/zynqmp-zcu104-revA.dts +7 -7
index 1564057cf792..7e5eca82fdaa 100644
@@ -420,6 +420,13 @@
 	};
 };
 
+&psgtr {
+	status = "okay";
+	/* nc, sata, usb3, dp */
+	clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>;
+	clock-names = "ref1", "ref2", "ref3";
+};
+
 &qspi {
 	status = "okay";
 	flash@0 {
@@ -449,13 +456,6 @@
 	};
 };
 
-&psgtr {
-	status = "okay";
-	/* nc, sata, usb3, dp */
-	clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>;
-	clock-names = "ref1", "ref2", "ref3";
-};
-
 &rtc {
 	status = "okay";
 };
arch/arm/dts/zynqmp-zcu104-revC.dts +7 -7
index 9ed27ec4f8e6..f4ebcbb318b4 100644
@@ -432,6 +432,13 @@
 	};
 };
 
+&psgtr {
+	status = "okay";
+	/* nc, sata, usb3, dp */
+	clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>;
+	clock-names = "ref1", "ref2", "ref3";
+};
+
 &qspi {
 	status = "okay";
 	flash@0 {
@@ -465,13 +472,6 @@
 	status = "okay";
 };
 
-&psgtr {
-	status = "okay";
-	/* nc, sata, usb3, dp */
-	clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>;
-	clock-names = "ref1", "ref2", "ref3";
-};
-
 &sata {
 	status = "okay";
 	/* SATA OOB timing settings */
arch/arm/dts/zynqmp-zcu111-revA.dts +7 -7
index 2cf6421da3c5..8d57ca2b3bf3 100644
@@ -769,6 +769,13 @@
 	};
 };
 
+&psgtr {
+	status = "okay";
+	/* nc, dp, usb3, sata */
+	clocks = <&si5341 0 0>, <&si5341 0 2>, <&si5341 0 3>;
+	clock-names = "ref1", "ref2", "ref3";
+};
+
 &qspi {
 	status = "okay";
 	is-dual = <1>;
@@ -799,13 +806,6 @@
 	};
 };
 
-&psgtr {
-	status = "okay";
-	/* nc, dp, usb3, sata */
-	clocks = <&si5341 0 0>, <&si5341 0 2>, <&si5341 0 3>;
-	clock-names = "ref1", "ref2", "ref3";
-};
-
 &rtc {
 	status = "okay";
 };
Signature · 1 line
2.31.1
Applied
#8 lore raw
In reply to Michal Simek

po 7. 6. 2021 v 12:15 odesílatel Michal Simek <[email protected]> napsal:

Quoted 45 lines

Hi,

this is the next series which is trying to clean and sync DTS files. At the end we want to have all these files be in sync with the Linux kernel based on DT binding available in the Linux kernel.

Thanks,
Michal

Michal Simek (6):
xilinx: Convert xlnx,eeprom property to nvmem alias
arm64: zynqmp: Remove si5328 and si5382 nodes
arm64: zynqmp: Remove can aliases from zc1751
arm64: zynqmp: Remove unused property from SD/USB
arm64: zynqmp: Remove information about dma clock on zcu106
arm64: zynqmp: Sync psgtr location on zcu104/zcu111/zc1751-dc1

Srinivas Neeli (1):
arm64: zynqmp: rtc: Update rtc calibration value

 ...ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts |  2 +-
 arch/arm/dts/zynq-syzygy-hub.dts              |  2 +-
 arch/arm/dts/zynqmp-a2197-revA.dts            |  3 ++-
 arch/arm/dts/zynqmp-e-a2197-00-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-g-a2197-00-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-01-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-02-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-m-a2197-03-revA.dts       |  2 +-
 arch/arm/dts/zynqmp-p-a2197-00-revA.dts       |  3 +--
 arch/arm/dts/zynqmp-sm-k26-revA.dts           |  4 ++--
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts      | 14 +++++------
 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts      |  2 --
 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts      |  2 --
 arch/arm/dts/zynqmp-zcu102-revA.dts           | 12 ++--------
 arch/arm/dts/zynqmp-zcu104-revA.dts           | 20 ++++++++--------
 arch/arm/dts/zynqmp-zcu104-revC.dts           | 21 ++++++++---------
 arch/arm/dts/zynqmp-zcu106-revA.dts           | 23 ++-----------------
 arch/arm/dts/zynqmp-zcu111-revA.dts           | 21 ++++++++---------
 arch/arm/dts/zynqmp-zcu208-revA.dts           |  2 +-
 arch/arm/dts/zynqmp-zcu216-revA.dts           |  2 +-
 arch/arm/dts/zynqmp.dtsi                      | 10 +-------
 21 files changed, 53 insertions(+), 100 deletions(-)
Quoted 3 lines

--
2.31.1

Applied.
M

Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs