[PATCH] ARM: dts: rockchip: move rk3288 edp phy under the GRF

[PATCH] ARM: dts: rockchip: move rk3288 edp phy under the GRF

[Heiko Stübner]

The edp-phy control is a part of the General Register Files and
with a recent patch in 4.6 the phy driver can now also handle this
correctly, so move the dts node under the GRF as well.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/boot/dts/rk3288.dtsi | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 180eb97..9068189 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -201,15 +201,6 @@
 		#clock-cells = <0>;
 	};
 
-	edp_phy: edp-phy {
-		compatible = "rockchip,rk3288-dp-phy";
-		clocks = <&cru SCLK_EDP_24M>;
-		clock-names = "24m";
-		rockchip,grf = <&grf>;
-		#phy-cells = <0>;
-		status = "disabled";
-	};
-
 	timer {
 		compatible = "arm,armv7-timer";
 		arm,cpu-registers-not-fw-configured;
@@ -756,6 +747,14 @@
 	grf: syscon at ff770000 {
 		compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
 		reg = <0xff770000 0x1000>;
+
+		edp_phy: edp-phy {
+			compatible = "rockchip,rk3288-dp-phy";
+			clocks = <&cru SCLK_EDP_24M>;
+			clock-names = "24m";
+			#phy-cells = <0>;
+			status = "disabled";
+		};
 	};
 
 	wdt: watchdog at ff800000 {
-- 
2.7.0

[PATCH] ARM: dts: rockchip: move rk3288 edp phy under the GRF

[Heiko Stübner]

Am Samstag, 16. April 2016, 02:49:14 schrieb Heiko St?bner:
> The edp-phy control is a part of the General Register Files and
> with a recent patch in 4.6 the phy driver can now also handle this
> correctly, so move the dts node under the GRF as well.
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>

the change in the phy-driver has made it into Greg's usb tree as fix for 4.6, 
so I've picked this patch for 4.7 now.

[PATCH] ARM: dts: rockchip: move rk3288 edp phy under the GRF

[Brian Norris]

On Fri, Apr 22, 2016 at 03:56:27PM +0200, Heiko Stuebner wrote:
> Am Samstag, 16. April 2016, 02:49:14 schrieb Heiko St?bner:
> > The edp-phy control is a part of the General Register Files and
> > with a recent patch in 4.6 the phy driver can now also handle this
> > correctly, so move the dts node under the GRF as well.
> > 
> > Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> 
> the change in the phy-driver has made it into Greg's usb tree as fix for 4.6, 
> so I've picked this patch for 4.7 now.

Not sure if it's intentional, but the phy binding change (which is in
4.6) broke the DP support in 4.6/rk3288.dtsi, and this patch is
necessary to bring it back. Shouldn't this DTS change have gone to 4.7
too? Or (when convincing ourselves we're not breaking the DT ABI here),
could we just claim that eDP wasn't supported in 4.6, and 4.7 will just
be bug-fixing the rk3288 DTS?

Brian

[PATCH] ARM: dts: rockchip: move rk3288 edp phy under the GRF

[Brian Norris]

On Wed, May 04, 2016 at 06:11:12PM -0700, Brian Norris wrote:
> On Fri, Apr 22, 2016 at 03:56:27PM +0200, Heiko Stuebner wrote:
> > Am Samstag, 16. April 2016, 02:49:14 schrieb Heiko St?bner:
> > > The edp-phy control is a part of the General Register Files and
> > > with a recent patch in 4.6 the phy driver can now also handle this
> > > correctly, so move the dts node under the GRF as well.
> > > 
> > > Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> > 
> > the change in the phy-driver has made it into Greg's usb tree as fix for 4.6, 
> > so I've picked this patch for 4.7 now.
> 
> Not sure if it's intentional, but the phy binding change (which is in
> 4.6) broke the DP support in 4.6/rk3288.dtsi, and this patch is
> necessary to bring it back. Shouldn't this DTS change have gone to 4.7
> too? Or (when convincing ourselves we're not breaking the DT ABI here),
> could we just claim that eDP wasn't supported in 4.6, and 4.7 will just
> be bug-fixing the rk3288 DTS?

Oops, my bad. The eDP PHY didn't show up at all in the v4.6/rk3288.dtsi.
So no breakage. Sorry for the false alarm.

Brian