[PATCH] ARM: dts: Remove outdated usb2 phy entry from exynos5250.dtsi

[PATCH] ARM: dts: Remove outdated usb2 phy entry from exynos5250.dtsi

[Sjoerd Simons]

The exynos5250.dtsi has two entries for describing the usb2 phy. One for
the newer driver using the generic PHY framework and one for its
predecessor. The older node is only referenced by the arndale dts, which
seems redundant given starting from dba2f05880c the common dtsi also
includes the phy entries.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---
 arch/arm/boot/dts/exynos5250-arndale.dts |  4 ----
 arch/arm/boot/dts/exynos5250.dtsi        | 15 ---------------
 2 files changed, 19 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index d0de1f5..dad8f9b 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -570,8 +570,4 @@
 			connect-gpios = <&gpd1 7 1>;
 		};
 	};
-
-	usb@12110000 {
-		usb-phy = <&usb2_phy>;
-	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 834fb5a..7c545d50 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -600,21 +600,6 @@
 		};
 	};
 
-	usb2_phy: usbphy@12130000 {
-		compatible = "samsung,exynos5250-usb2phy";
-		reg = <0x12130000 0x100>;
-		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USB2>;
-		clock-names = "ext_xtal", "usbhost";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		usbphy-sys {
-			reg = <0x10040704 0x8>,
-			      <0x10050230 0x4>;
-		};
-	};
-
 	usb2_phy_gen: phy@12130000 {
 		compatible = "samsung,exynos5250-usb2-phy";
 		reg = <0x12130000 0x100>;
-- 
2.0.0

Re: [PATCH] ARM: dts: Remove outdated usb2 phy entry from exynos5250.dtsi

[Andreas Färber]

+ kgene, devicetree

Am 27.06.2014 17:04, schrieb Sjoerd Simons:
> The exynos5250.dtsi has two entries for describing the usb2 phy. One for
> the newer driver using the generic PHY framework and one for its
> predecessor. The older node is only referenced by the arndale dts, which
> seems redundant given starting from dba2f05880c the common dtsi also
> includes the phy entries.
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> ---
>  arch/arm/boot/dts/exynos5250-arndale.dts |  4 ----
>  arch/arm/boot/dts/exynos5250.dtsi        | 15 ---------------
>  2 files changed, 19 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index d0de1f5..dad8f9b 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -570,8 +570,4 @@
>  			connect-gpios = <&gpd1 7 1>;
>  		};
>  	};
> -
> -	usb@12110000 {
> -		usb-phy = <&usb2_phy>;
> -	};
>  };
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index 834fb5a..7c545d50 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -600,21 +600,6 @@
>  		};
>  	};
>  
> -	usb2_phy: usbphy@12130000 {
> -		compatible = "samsung,exynos5250-usb2phy";
> -		reg = <0x12130000 0x100>;
> -		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USB2>;
> -		clock-names = "ext_xtal", "usbhost";
> -		#address-cells = <1>;
> -		#size-cells = <1>;
> -		ranges;
> -
> -		usbphy-sys {
> -			reg = <0x10040704 0x8>,
> -			      <0x10050230 0x4>;
> -		};
> -	};
> -
>  	usb2_phy_gen: phy@12130000 {
>  		compatible = "samsung,exynos5250-usb2-phy";
>  		reg = <0x12130000 0x100>;

I've stumbled over the same duplication in the .dtsi, LGTM,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg