From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 21 Jul 2020 14:40:38 +0000 (+0100)
Subject: ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
X-Git-Tag: v5.4.56~53
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9a1d0084cbe17cb1b919e48edb854983eafe02fc;p=users%2Fdwmw2%2Flinux.git

ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds

[ Upstream commit 09781ba0395c46b1c844f47e405e3ce7856f5989 ]

To support the change in "phy: armada-38x: fix NETA lockup when
repeatedly switching speeds" we need to update the DT with the
additional register.

Fixes: 14dc100b4411 ("phy: armada38x: add common phy support")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 3f4bb44d85f00..669da3a33d82c 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -339,7 +339,8 @@
 
 			comphy: phy@18300 {
 				compatible = "marvell,armada-380-comphy";
-				reg = <0x18300 0x100>;
+				reg-names = "comphy", "conf";
+				reg = <0x18300 0x100>, <0x18460 4>;
 				#address-cells = <1>;
 				#size-cells = <0>;