]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 21 Jul 2020 14:40:38 +0000 (15:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Aug 2020 07:58:40 +0000 (09:58 +0200)
[ 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>
arch/arm/boot/dts/armada-38x.dtsi

index e038abc0c6b406ce5430a1ed5f7908b5a6fd7443..420ae26e846b601d12c8469fc6b4f907e42a8f92 100644 (file)
 
                        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>;