Skip to contentSkip to conversation

xilinx: dts: Update various DT files

PATCH New Michal Simek 1 participant 10 messages Feb 13, 2019

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

cover xilinx: dts: Update various DT files

Hi,

just put together some DT changes and send me all. Most of these patches are coming from Linux kernel.

Thanks,
Michal

Amit Kucheria (1):
arm64: dts: Fix various entry-method properties to reflect
documentation

Luis Araneda (2):
ARM: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
ARM: dts: zynq: correct and improve the model property of dt files

Michal Simek (3):
ARM: dts: Use mmc@ instead sdhci@
xilinx: dts: Remove additional empty lines
arm64: zynqmp: Remove autodetected devices without description

Mounika Grace Akula (1):
arm64: zynqmp: Add reset-on-timeout for all boards and modify default
timeout value

Shubhrajyoti Datta (1):
arm64: zynqmp: Fix i2c boot warning

Venkatesh Yadav Abbarapu (1):
arm64: zynqmp: Change the spi-rx-bus-width property to x1

 arch/arm/dts/zynq-7000.dtsi         |  4 ++--
 arch/arm/dts/zynq-cc108.dts         |  2 +-
 arch/arm/dts/zynq-microzed.dts      |  2 +-
 arch/arm/dts/zynq-zc702.dts         |  2 +-
 arch/arm/dts/zynq-zc706.dts         |  2 +-
 arch/arm/dts/zynq-zc770-xm010.dts   |  3 +--
 arch/arm/dts/zynq-zc770-xm011.dts   |  2 +-
 arch/arm/dts/zynq-zc770-xm012.dts   |  2 +-
 arch/arm/dts/zynq-zc770-xm013.dts   |  2 +-
 arch/arm/dts/zynq-zed.dts           |  4 ++--
 arch/arm/dts/zynq-zybo.dts          |  2 +-
 arch/arm/dts/zynqmp-zc1275-revB.dts |  2 +-
 arch/arm/dts/zynqmp-zcu100-revC.dts |  2 --
 arch/arm/dts/zynqmp-zcu102-revA.dts | 16 ----------------
 arch/arm/dts/zynqmp-zcu106-revA.dts | 20 --------------------
 arch/arm/dts/zynqmp-zcu111-revA.dts | 20 --------------------
 arch/arm/dts/zynqmp.dtsi            |  5 +++--
 17 files changed, 17 insertions(+), 75 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/9 ARM: dts: Use mmc@ instead sdhci@

mmc name is recommended based on devicetree specification.

---

 arch/arm/dts/zynq-7000.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynq-7000.dtsi +2 -2
index 286059d56e61..e1b0816a3459 100644
@@ -235,7 +235,7 @@
 			#size-cells = <0>;
 		};
 
-		sdhci0: sdhci at e0100000 {
+		sdhci0: mmc at e0100000 {
 			compatible = "arasan,sdhci-8.9a";
 			status = "disabled";
 			clock-names = "clk_xin", "clk_ahb";
@@ -245,7 +245,7 @@
 			reg = <0xe0100000 0x1000>;
 		};
 
-		sdhci1: sdhci at e0101000 {
+		sdhci1: mmc at e0101000 {
 			compatible = "arasan,sdhci-8.9a";
 			status = "disabled";
 			clock-names = "clk_xin", "clk_ahb";
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/9 ARM: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards

In reply to Michal Simek

From: Luis Araneda <[email protected]>

Both boards are made by Avnet, Inc. So add an additional value to the compatible property

---

 arch/arm/dts/zynq-microzed.dts | 2 +-
 arch/arm/dts/zynq-zed.dts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynq-microzed.dts +1 -1
index 79f878eab229..230244ff77a2 100644
@@ -9,7 +9,7 @@
 
 / {
 	model = "Zynq MicroZED Board";
-	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+	compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-700
 
 	aliases {
 		serial0 = &uart1;
arch/arm/dts/zynq-zed.dts +1 -1
index 9c505fb7b872..c54515d5366c 100644
@@ -8,7 +8,7 @@
 
 / {
 	model = "Zynq Zed Development Board";
-	compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+	compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
 
 	aliases {
 		ethernet0 = &gem0;
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/9 ARM: dts: zynq: correct and improve the model property of dt files

In reply to Michal Simek

From: Luis Araneda <[email protected]>

Replace the current value of the model property by a more accurate description of each board (which includes the manufacturer), as some of the boards had the same value ("Xilinx Zynq")

---

 arch/arm/dts/zynq-cc108.dts       | 2 +-
 arch/arm/dts/zynq-zc702.dts       | 2 +-
 arch/arm/dts/zynq-zc706.dts       | 2 +-
 arch/arm/dts/zynq-zc770-xm010.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm011.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm012.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm013.dts | 2 +-
 arch/arm/dts/zynq-zed.dts         | 2 +-
 arch/arm/dts/zynq-zybo.dts        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/dts/zynq-cc108.dts +1 -1
index 5f8a0d255529..64d73ecbc592 100644
@@ -12,8 +12,8 @@
 /include/ "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx CC108 board";
 	compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem0;
arch/arm/dts/zynq-zc702.dts +1 -1
index 12e35618f874..54231cd5801a 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZC702 Development Board";
+	model = "Xilinx ZC702 board";
 	compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
 
 	aliases {
arch/arm/dts/zynq-zc706.dts +1 -1
index f24364b3853a..84729e9feba2 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZC706 Development Board";
+	model = "Xilinx ZC706 board";
 	compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
 
 	aliases {
arch/arm/dts/zynq-zc770-xm010.dts +1 -1
index a779672f3add..b7c7649d5d80 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM010 board";
 	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem0;
arch/arm/dts/zynq-zc770-xm011.dts +1 -1
index 3fe6eb559ea7..1123bfc74392 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM011 board";
 	compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		i2c0 = &i2c1;
arch/arm/dts/zynq-zc770-xm012.dts +1 -1
index 19d5b275ae06..0d001c91610d 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM012 board";
 	compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		i2c0 = &i2c0;
arch/arm/dts/zynq-zc770-xm013.dts +1 -1
index efd0833eab91..05a49982cc4b 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM013 board";
 	compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem1;
arch/arm/dts/zynq-zed.dts +1 -1
index c54515d5366c..d2b7fc2c994b 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq Zed Development Board";
+	model = "Avnet ZedBoard board";
 	compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
 
 	aliases {
arch/arm/dts/zynq-zybo.dts +1 -1
index 38448223055c..0ac54ebbdc8b 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZYBO Development Board";
+	model = "Digilent Zybo board";
 	compatible = "digilent,zynq-zybo", "xlnx,zynq-7000";
 
 	aliases {
Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/9 arm64: zynqmp: Add reset-on-timeout for all boards and modify default timeout value

In reply to Michal Simek

From: Mounika Grace Akula <[email protected]>

This patch adds reset-on-timeout to FPD WDT which will trigger an interrupt to PMU when watchdog expiry happens and PMU takes the necessary action. If this property is not enabled, reason will not be known when watchdog expiry happens.
This patch also modifies the default timeout to 60 seconds. Reason is that if u-boot enables WDT, it will set the timeout to 10 seconds and this is not enough to boot till Linux and start the WDT application in Linux. 60 seconds is the maximum safest value to boot till Linux and start the WDT application.

Users need to change this timeout value to fit their needs.

---

 arch/arm/dts/zynqmp-zcu100-revC.dts | 1 -
 arch/arm/dts/zynqmp.dtsi            | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynqmp-zcu100-revC.dts +0 -1
index 05491e9bbc0c..0d9ad86029aa 100644
@@ -332,7 +332,6 @@
 
 &watchdog0 {
 	status = "okay";
-	reset-on-timeout;
 };
 
 &xilinx_ams {
arch/arm/dts/zynqmp.dtsi +2 -1
index 831d6e1ecc4d..b28e75732f1e 100644
@@ -884,7 +884,8 @@
 			interrupt-parent = <&gic>;
 			interrupts = <0 113 1>;
 			reg = <0x0 0xfd4d0000 0x0 0x1000>;
-			timeout-sec = <10>;
+			timeout-sec = <60>;
+			reset-on-timeout;
 		};
 
 		xilinx_ams: ams at ffa50000 {
Signature · 1 line
1.9.1
#5 lore raw

PATCH 5/9 xilinx: dts: Remove additional empty lines

In reply to Michal Simek

Trivial fix.

---

 arch/arm/dts/zynq-zc770-xm010.dts   | 1 -
 arch/arm/dts/zynqmp-zcu100-revC.dts | 1 -
 arch/arm/dts/zynqmp-zcu102-revA.dts | 1 -
 3 files changed, 3 deletions(-)
arch/arm/dts/zynq-zc770-xm010.dts +0 -1
index b7c7649d5d80..e1f34653ec3c 100644
@@ -58,7 +58,6 @@
 		compatible = "atmel,24c02";
 		reg = <0x52>;
 	};
-
 };
 
 &qspi {
arch/arm/dts/zynqmp-zcu100-revC.dts +0 -1
index 0d9ad86029aa..5285f62d1a30 100644
@@ -296,7 +296,6 @@
 		compatible = "ti,wl1831-st";
 		enable-gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 	};
-
 };
 
 &uart1 {
arch/arm/dts/zynqmp-zcu102-revA.dts +0 -1
index 1b28d331ff5e..ba099712aa9d 100644
@@ -361,7 +361,6 @@
 				status = "disabled"; /* unreachable */
 				reg = <0x20>;
 			};
-
 			max20751 at 72 { /* u95 */
 				compatible = "maxim,max20751";
 				reg = <0x72>;
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/9 arm64: dts: Fix various entry-method properties to reflect documentation

In reply to Michal Simek

From: Amit Kucheria <[email protected]>

The idle-states binding documentation[1] mentions that the 'entry-method' property is required on 64-bit platforms and must be set to "psci".

Linux commit a13f18f59d26 ("Documentation: arm: Fix typo in the idle-states bindings examples") attempted to fix this earlier but clearly more is needed.

Linux docs:
Documentation/devicetree/bindings/arm/idle-states.txt (see idle-states node)

---

 arch/arm/dts/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp.dtsi +1 -1
index b28e75732f1e..dfb6ebc64ce5 100644
@@ -58,7 +58,7 @@
 		};
 
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
Signature · 1 line
1.9.1
#7 lore raw

PATCH 7/9 arm64: zynqmp: Remove autodetected devices without description

In reply to Michal Simek

It will never reach mainline that's why remove it.

---

 arch/arm/dts/zynqmp-zcu106-revA.dts | 20 --------------------
 arch/arm/dts/zynqmp-zcu111-revA.dts | 20 --------------------
 2 files changed, 40 deletions(-)
arch/arm/dts/zynqmp-zcu106-revA.dts +0 -20
index 3d5c99ad628c..00f6e30ef34d 100644
@@ -463,26 +463,6 @@
 			#size-cells = <0>;
 			reg = <3>;
 			/* DDR4 SODIMM */
-			dev at 19 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x19>;
-			};
-			dev at 30 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x30>;
-			};
-			dev at 35 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x35>;
-			};
-			dev at 36 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x36>;
-			};
-			dev at 51 { /* u-boot detection - maybe SPD */
-				compatible = "xxx";
-				reg = <0x51>;
-			};
 		};
 		i2c at 4 {
 			#address-cells = <1>;
arch/arm/dts/zynqmp-zcu111-revA.dts +0 -20
index f7d6fe0073b2..58021be9bfda 100644
@@ -400,26 +400,6 @@
 			#size-cells = <0>;
 			reg = <3>;
 			/* DDR4 SODIMM */
-			dev at 19 { /* u-boot detection FIXME */
-				compatible = "xxx";
-				reg = <0x19>;
-			};
-			dev at 30 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x30>;
-			};
-			dev at 35 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x35>;
-			};
-			dev at 36 { /* u-boot detection */
-				compatible = "xxx";
-				reg = <0x36>;
-			};
-			dev at 51 { /* u-boot detection - maybe SPD */
-				compatible = "xxx";
-				reg = <0x51>;
-			};
 		};
 		i2c at 4 {
 			#address-cells = <1>;
Signature · 1 line
1.9.1
#8 lore raw

PATCH 8/9 arm64: zynqmp: Fix i2c boot warning

In reply to Michal Simek

From: Shubhrajyoti Datta <[email protected]>

Fix the below warning as the core looks for the compatible string.

[    5.198919] i2c i2c-18: of_i2c: modalias failure on
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 19
[    5.207454] i2c i2c-18: Failed to create I2C device for
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 19
[    5.216394] i2c i2c-18: of_i2c: modalias failure on
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 30
[    5.224986] i2c i2c-18: Failed to create I2C device for
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 30
[    5.233927] i2c i2c-18: of_i2c: modalias failure on
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 35
[    5.242527] i2c i2c-18: Failed to create I2C device for
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 35
[    5.263880] i2c i2c-18: of_i2c: modalias failure on
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 36
[    5.272477] i2c i2c-18: Failed to create I2C device for
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 36
[    5.281415] i2c i2c-18: of_i2c: modalias failure on
/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 51
[    5.290008] i2c i2c-18: Failed to create I2C device for

/amba/i2c at ff030000/i2c-mux at 75/i2c at 3/dev at 51

---

 arch/arm/dts/zynqmp-zcu102-revA.dts | 15 ---------------
 1 file changed, 15 deletions(-)
arch/arm/dts/zynqmp-zcu102-revA.dts +0 -15
index ba099712aa9d..0e96a3618821 100644
@@ -485,21 +485,6 @@
 			#size-cells = <0>;
 			reg = <3>;
 			/* DDR4 SODIMM */
-			dev at 19 {
-				reg = <0x19>;
-			};
-			dev at 30 {
-				reg = <0x30>;
-			};
-			dev at 35 {
-				reg = <0x35>;
-			};
-			dev at 36 {
-				reg = <0x36>;
-			};
-			dev at 51 {
-				reg = <0x51>;
-			};
 		};
 		i2c at 4 {
 			#address-cells = <1>;
Signature · 1 line
1.9.1
#9 lore raw

PATCH 9/9 arm64: zynqmp: Change the spi-rx-bus-width property to x1

In reply to Michal Simek

From: Venkatesh Yadav Abbarapu <[email protected]>

As per the zc1275 design x1 mode is enabled so changing the spi-rx-bus-width property to x1.

---

 arch/arm/dts/zynqmp-zc1275-revB.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-zc1275-revB.dts +1 -1
index 027ff83562f8..d7685d2e6d82 100644
@@ -62,7 +62,7 @@
 		#size-cells = <1>;
 		reg = <0x0>;
 		spi-tx-bus-width = <1>;
-		spi-rx-bus-width = <4>;
+		spi-rx-bus-width = <1>;
 		spi-max-frequency = <108000000>; /* Based on DC1 spec */
 		partition at qspi-fsbl-uboot { /* for testing purpose */
 			label = "qspi-fsbl-uboot";
Signature · 1 line
1.9.1