ARM: dts: update exynos usb2 phy nodes to match mainline driver

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I9ac4bcd37e965b10d0add3030038635ec2d00130

8 files changed, 56 insertions, 32 deletions

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index d97dd98eb6e..931a5ad71e7 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -105,11 +105,16 @@
 		reg = <0x10440000 0x1000>;
 	};
 
-	sys_reg: sysreg {
+	sys_reg: syscon@10010000 {
 		compatible = "samsung,exynos4-sysreg", "syscon";
 		reg = <0x10010000 0x400>;
 	};
 
+	pmu_system_controller: system-controller@10020000 {
+		compatible = "samsung,exynos4210-pmu", "syscon";
+		reg = <0x10020000 0x4000>;
+	};
+
 	cache-controller@0x10502000 {
 		compatible = "arm,pl310-cache";
 		reg = <0x10502000 0x1000>;
@@ -278,6 +283,16 @@
 		status = "disabled";
 	};
 
+	exynos_usbphy: exynos-usbphy@125B0000 {
+		compatible = "samsung,exynos4210-usb2-phy";
+		reg = <0x125B0000 0x100>;
+		samsung,pmureg-phandle = <&pmu_system_controller>;
+		clocks = <&clock 305>, <&clock 2>;
+		clock-names = "phy", "ref";
+		#phy-cells = <1>;
+		status = "disabled";
+	};
+
 	rotator@12810000 {
 		compatible = "samsung,exynos4210-rotator";
 		reg = <0x12810000 0x1000>;
@@ -530,6 +545,28 @@
 		clocks = <&clock 304>, <&clock 305>;
 		clock-names = "usbhost", "otg";
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+		    reg = <0>;
+		    phys = <&exynos_usbphy 1>;
+		    phy-names = "host";
+		    status = "disabled";
+		};
+		port@1 {
+		    reg = <1>;
+		    phys = <&exynos_usbphy 2>;
+		    phy-names = "hsic0";
+		    status = "disabled";
+		};
+		port@2 {
+		    reg = <2>;
+		    phys = <&exynos_usbphy 3>;
+		    phy-names = "hsic1";
+		    status = "disabled";
+		};
 	};
 
 	i2s0: i2s@03830000 {
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index afe1e22e627..b9386d845b8 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -527,7 +527,6 @@
 		status = "okay";
 		vusb_d-supply = <&vusb_reg>;
 		vusb_a-supply = <&vusbdac_reg>;
-		status = "okay";
 	};
 
 	fixed-rate-clocks {
@@ -703,10 +702,11 @@
 
 	ehci@12580000 {
 		status = "okay";
-		phys = <&exynos_usbphy 1>;
-		phy-names = "host";
 		vusb_d-supply = <&vusb_reg>;
 		vusb_a-supply = <&vusbdac_reg>;
+		port@0 {
+			status = "okay";
+		};
 	};
 
 	exynos-usbphy@125B0000 {
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 6ec9943ea47..be9486fcfcd 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -480,10 +480,11 @@
 
 	ehci@12580000 {
 		status = "okay";
-		phys = <&exynos_usbphy 1>;
-		phy-names = "host";
 		vusb_d-supply = <&ldo3_reg>;
 		vusb_a-supply = <&ldo8_reg>;
+		port@0 {
+			status = "okay";
+		};
 	};
 
 	exynos-usbphy@125B0000 {
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 3fdfaf3d182..f6989aa634d 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -235,14 +235,4 @@
 		phy-names = "hdmiphy";
 		compatible = "samsung,exynos4210-hdmi";
 	};
-
-	exynos_usbphy: exynos-usbphy@125B0000 {
-		compatible = "samsung,exynos4210-usbphy";
-		reg = <0x125B0000 0x100 0x10020704 0x0c 0x1001021c 0x4>;
-		clocks = <&clock 305>, <&clock 2>, <&clock 2>, <&clock 2>,
-								<&clock 2>;
-		clock-names = "phy", "device", "host", "hsic0", "hsic1";
-		status = "disabled";
-		#phy-cells = <1>;
-	};
 };
diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index be45cfffc22..2fcebd04ddc 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -488,7 +488,6 @@
 		};
 	};
 
-
 	hsotg@12480000 {
 		status = "okay";
 		vusb_d-supply = <&ldo15_reg>;
@@ -499,8 +498,9 @@
 		status = "okay";
 		vusb_d-supply = <&ldo15_reg>;
 		vusb_a-supply = <&ldo12_reg>;
-		phys = <&exynos_usbphy 2>;
-		phy-names = "hsic0";
+		port@1 {
+			status = "okay";
+		};
 	};
 
 	exynos-usbphy@125B0000 {
diff --git a/arch/arm/boot/dts/exynos4412-slp_pq.dts b/arch/arm/boot/dts/exynos4412-slp_pq.dts
index 75663671fa4..d81ab457e7d 100644
--- a/arch/arm/boot/dts/exynos4412-slp_pq.dts
+++ b/arch/arm/boot/dts/exynos4412-slp_pq.dts
@@ -1075,8 +1075,9 @@
 		status = "okay";
 		vusb_d-supply = <&ldo15_reg>;
 		vusb_a-supply = <&ldo12_reg>;
-		phys = <&exynos_usbphy 2>;
-		phy-names = "hsic0";
+		port@1 {
+			status = "okay";
+		};
 	};
 
 	spi_1: spi@13930000 {
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index d7699a3f25a..219687ca92d 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -1134,8 +1134,9 @@
 		status = "okay";
 		vusb_d-supply = <&ldo15_reg>;
 		vusb_a-supply = <&ldo12_reg>;
-		phys = <&exynos_usbphy 2>;
-		phy-names = "hsic0";
+		port@1 {
+			status = "okay";
+		};
 	};
 
 	spi_1: spi@13930000 {
@@ -1438,7 +1439,6 @@
 		status = "okay";
 	};
 
-
 	exynos-usbphy@125B0000 {
 		status = "okay";
 	};
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index f7b96ba30cd..b3c105b1f74 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -194,14 +194,9 @@
 		status = "ok";
 	};
 
-	exynos_usbphy: exynos-usbphy@125B0000 {
-		compatible = "samsung,exynos4212-usbphy";
-		reg = <0x125B0000 0x100>, <0x10020704 0x0c>, <0x1001021c 0x4>;
-		clocks = <&clock 305>, <&clock 2>, <&clock 2>, <&clock 2>,
-								<&clock 2>;
-		clock-names = "phy", "device", "host", "hsic0", "hsic1";
-		status = "disabled";
-		#phy-cells = <1>;
+	exynos-usbphy@125B0000 {
+		compatible = "samsung,exynos4x12-usb2-phy";
+		samsung,sysreg-phandle = <&sys_reg>;
 	};
 
 	camera {