<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From df749cdb015011e9ed8b60ebb84b4e76a9f35735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= &lt;marek.behun@nic.cz&gt;
Date: Thu, 30 Apr 2020 10:06:24 +0200
Subject: [PATCH] arm64: dts: marvell: armada-37xx: Move PCIe comphy handle
 property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the comphy handle property of the PCIe node from board specific
device tree files (EspressoBin and Turris Mox) to the generic
armada-37xx.dtsi.

This is correct since this is the only possible PCIe PHY configuration
on Armada 37xx, so when PCIe is enabled on any board, this handle is
correct.

Signed-off-by: Marek BehÃºn &lt;marek.behun@nic.cz&gt;
Tested-by: Tomasz Maciej Nowak &lt;tmn505@gmail.com&gt;
Acked-by: Thomas Petazzoni &lt;thomas.petazzoni@bootlin.com&gt;
Signed-off-by: Gregory CLEMENT &lt;gregory.clement@bootlin.com&gt;
---
 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 1 -
 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts   | 1 -
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi             | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -56,7 +56,6 @@
 /* J9 */
 &amp;pcie0 {
 	status = "okay";
-	phys = &lt;&amp;comphy1 0&gt;;
 	pinctrl-names = "default";
 	pinctrl-0 = &lt;&amp;pcie_reset_pins &amp;pcie_clkreq_pins&gt;;
 	reset-gpios = &lt;&amp;gpiosb 3 GPIO_ACTIVE_LOW&gt;;
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -137,7 +137,6 @@
 	status = "okay";
 	max-link-speed = &lt;2&gt;;
 	reset-gpios = &lt;&amp;gpiosb 3 GPIO_ACTIVE_LOW&gt;;
-	phys = &lt;&amp;comphy1 0&gt;;
 	/*
 	 * U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property
 	 * contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -501,6 +501,7 @@
 					&lt;0 0 0 2 &amp;pcie_intc 1&gt;,
 					&lt;0 0 0 3 &amp;pcie_intc 2&gt;,
 					&lt;0 0 0 4 &amp;pcie_intc 3&gt;;
+			phys = &lt;&amp;comphy1 0&gt;;
 			pcie_intc: interrupt-controller {
 				interrupt-controller;
 				#interrupt-cells = &lt;1&gt;;
</pre></body></html>