From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 23 Nov 2021 09:03:33 +0000 (+0100)
Subject: ARM: dts: BCM5301X: use non-deprecated USB 2.0 PHY binding
X-Git-Tag: howlett/maple/20220722_2~1529^2~4^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a46061a2a4130a08841941ce6dcaa32be2ce312;p=users%2Fjedix%2Flinux-maple.git

ARM: dts: BCM5301X: use non-deprecated USB 2.0 PHY binding

The new binding covers a single reg and uses syscon to reference shared
register.

References: 55b9b741712d ("dt-bindings: phy: brcm,ns-usb2-phy: bind just a PHY block")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index e1cffef4935a..588e57db6859 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -148,15 +148,6 @@
 		};
 	};
 
-	usb2_phy: usb2-phy@1800c000 {
-		compatible = "brcm,ns-usb2-phy";
-		reg = <0x1800c000 0x1000>;
-		reg-names = "dmu";
-		#phy-cells = <0>;
-		clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;
-		clock-names = "phy-ref-clk";
-	};
-
 	axi@18000000 {
 		compatible = "brcm,bus-axi";
 		reg = <0x18000000 0x1000>;
@@ -448,7 +439,16 @@
 						     "sata1", "sata2";
 			};
 
-			syscon@180 {
+			usb2_phy: phy@164 {
+				compatible = "brcm,ns-usb2-phy";
+				reg = <0x164 0x4>;
+				brcm,syscon-clkset = <&cru_clkset>;
+				clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;
+				clock-names = "phy-ref-clk";
+				#phy-cells = <0>;
+			};
+
+			cru_clkset: syscon@180 {
 				compatible = "brcm,cru-clkset", "syscon";
 				reg = <0x180 0x4>;
 			};