diff mbox

[v2,5/7] ARM: dts: Update DP controller DT Node for Exynos5 based SoCs

Message ID 1375183178-8201-6-git-send-email-vikas.sajjan@linaro.org
State New
Headers show

Commit Message

Vikas C Sajjan July 30, 2013, 11:19 a.m. UTC 
Moves the properties of DP controller to exynos5.dtsi which are common
across exynos5 SoCs like Exynos5250 and Exynos5420.

The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch at
https://patchwork.linuxtv.org/patch/19189/

Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
---
 arch/arm/boot/dts/exynos5.dtsi            |   11 +++++++++++
 arch/arm/boot/dts/exynos5250-arndale.dts  |    3 ++-
 arch/arm/boot/dts/exynos5250-smdk5250.dts |    3 ++-
 arch/arm/boot/dts/exynos5250.dtsi         |   21 +++++++++------------
 4 files changed, 24 insertions(+), 14 deletions(-)

Comments

Jingoo Han Aug. 26, 2013, 2:57 a.m. UTC | #1 
On Tuesday, July 30, 2013 8:20 PM, Vikas Sajjan wrote:
>
> Moves the properties of DP controller to exynos5.dtsi which are common
> across exynos5 SoCs like Exynos5250 and Exynos5420.
> 
> The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch at
> https://patchwork.linuxtv.org/patch/19189/
> 
> Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
> ---
>  arch/arm/boot/dts/exynos5.dtsi            |   11 +++++++++++
>  arch/arm/boot/dts/exynos5250-arndale.dts  |    3 ++-
>  arch/arm/boot/dts/exynos5250-smdk5250.dts |    3 ++-
>  arch/arm/boot/dts/exynos5250.dtsi         |   21 +++++++++------------
>  4 files changed, 24 insertions(+), 14 deletions(-)
>  

[....]

> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index 238bdb2..1c017dc 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -614,20 +614,17 @@
>  		interrupts = <0 94 0>;
>  	};
> 
> -	dp-controller {
> -		compatible = "samsung,exynos5-dp";
> -		reg = <0x145b0000 0x1000>;
> -		interrupts = <10 3>;
> -		interrupt-parent = <&combiner>;
> +	dp_phy: video-phy@10040720 {
> +		compatible = "samsung,exynos5250-dp-video-phy";
> +		reg = <0x10040720 4>;
> +		#phy-cells = <0>;
> +	};

Oops!!!

This patch should be reverted.
Or, fix patch should be re-sent.
'dp phy' driver is not yet merged to mainline kernel.


> +
> +	dp-controller@145b0000 {
>  		clocks = <&clock 342>;
>  		clock-names = "dp";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -
> -		dptx-phy {
> -			reg = <0x10040720>;
> -			samsung,enable-mask = <1>;
> -		};
> +		phys = <&dp_phy>;
> +		phy-names = "dp";
>  	};

Thus, 'dptx-phy' node should be used until dp phy driver is merged.

Vikas Sajjan,
Please test your patch on real boards when you send your patch.


Best regards,
Jingoo Han
Vikas C Sajjan Aug. 26, 2013, 6:05 a.m. UTC | #2 
Hi Mr. Jingoo Han,

On 26 August 2013 08:27, Jingoo Han <jg1.han@samsung.com> wrote:
> On Tuesday, July 30, 2013 8:20 PM, Vikas Sajjan wrote:
>>
>> Moves the properties of DP controller to exynos5.dtsi which are common
>> across exynos5 SoCs like Exynos5250 and Exynos5420.
>>
>> The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch at
>> https://patchwork.linuxtv.org/patch/19189/
>>
>> Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
>> ---
>>  arch/arm/boot/dts/exynos5.dtsi            |   11 +++++++++++
>>  arch/arm/boot/dts/exynos5250-arndale.dts  |    3 ++-
>>  arch/arm/boot/dts/exynos5250-smdk5250.dts |    3 ++-
>>  arch/arm/boot/dts/exynos5250.dtsi         |   21 +++++++++------------
>>  4 files changed, 24 insertions(+), 14 deletions(-)
>>
>
> [....]
>
>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
>> index 238bdb2..1c017dc 100644
>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>> @@ -614,20 +614,17 @@
>>               interrupts = <0 94 0>;
>>       };
>>
>> -     dp-controller {
>> -             compatible = "samsung,exynos5-dp";
>> -             reg = <0x145b0000 0x1000>;
>> -             interrupts = <10 3>;
>> -             interrupt-parent = <&combiner>;
>> +     dp_phy: video-phy@10040720 {
>> +             compatible = "samsung,exynos5250-dp-video-phy";
>> +             reg = <0x10040720 4>;
>> +             #phy-cells = <0>;
>> +     };
>
> Oops!!!
>
> This patch should be reverted.
> Or, fix patch should be re-sent.
> 'dp phy' driver is not yet merged to mainline kernel.
>

As you suggest, since the DP-PHY driver is NOT yet in mainline, we may
have to keep this patch reverted till your patch series gets merged to
have DP working on exynos5 .

>
>> +
>> +     dp-controller@145b0000 {
>>               clocks = <&clock 342>;
>>               clock-names = "dp";
>> -             #address-cells = <1>;
>> -             #size-cells = <0>;
>> -
>> -             dptx-phy {
>> -                     reg = <0x10040720>;
>> -                     samsung,enable-mask = <1>;
>> -             };
>> +             phys = <&dp_phy>;
>> +             phy-names = "dp";
>>       };
>
> Thus, 'dptx-phy' node should be used until dp phy driver is merged.
>
> Vikas Sajjan,
> Please test your patch on real boards when you send your patch.
>

I tested the patch before sending on Exynos5250-SMDK5250 using  Kishon
Vijay Abraham's series at http://lwn.net/Articles/559487/
 which contains DP-PHY driver posted by you
 1.  phy: Add driver for Exynos DP PHY
 2.  video: exynos_dp: remove non-DT support for Exynos Display Port
 3.  video: exynos_dp: Use the generic PHY driver


 >
> Best regards,
> Jingoo Han
>
>
>
Kukjin Kim Sept. 12, 2013, 10:36 a.m. UTC | #3 
Vikas Sajjan wrote:
> 
> Hi Mr. Jingoo Han,
> 
> On 26 August 2013 08:27, Jingoo Han <jg1.han@samsung.com> wrote:
> > On Tuesday, July 30, 2013 8:20 PM, Vikas Sajjan wrote:
> >>
> >> Moves the properties of DP controller to exynos5.dtsi which are common
> >> across exynos5 SoCs like Exynos5250 and Exynos5420.
> >>
> >> The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch at
> >> https://patchwork.linuxtv.org/patch/19189/
> >>
> >> Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
> >> ---
> >>  arch/arm/boot/dts/exynos5.dtsi            |   11 +++++++++++
> >>  arch/arm/boot/dts/exynos5250-arndale.dts  |    3 ++-
> >>  arch/arm/boot/dts/exynos5250-smdk5250.dts |    3 ++-
> >>  arch/arm/boot/dts/exynos5250.dtsi         |   21 +++++++++------------
> >>  4 files changed, 24 insertions(+), 14 deletions(-)
> >>
> >
> > [....]
> >
> >> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
> b/arch/arm/boot/dts/exynos5250.dtsi
> >> index 238bdb2..1c017dc 100644
> >> --- a/arch/arm/boot/dts/exynos5250.dtsi
> >> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> >> @@ -614,20 +614,17 @@
> >>               interrupts = <0 94 0>;
> >>       };
> >>
> >> -     dp-controller {
> >> -             compatible = "samsung,exynos5-dp";
> >> -             reg = <0x145b0000 0x1000>;
> >> -             interrupts = <10 3>;
> >> -             interrupt-parent = <&combiner>;
> >> +     dp_phy: video-phy@10040720 {
> >> +             compatible = "samsung,exynos5250-dp-video-phy";
> >> +             reg = <0x10040720 4>;
> >> +             #phy-cells = <0>;
> >> +     };
> >
> > Oops!!!
> >
> > This patch should be reverted.
> > Or, fix patch should be re-sent.
> > 'dp phy' driver is not yet merged to mainline kernel.
> >
> 
> As you suggest, since the DP-PHY driver is NOT yet in mainline, we may
> have to keep this patch reverted till your patch series gets merged to
> have DP working on exynos5 .
> 
OK, got it. Please send patch fixing this issue for v3.12. Of course, we
need this from v3.13 which will be including the DP-PHY driver.

Thanks,
Kukjin

> >
> >> +
> >> +     dp-controller@145b0000 {
> >>               clocks = <&clock 342>;
> >>               clock-names = "dp";
> >> -             #address-cells = <1>;
> >> -             #size-cells = <0>;
> >> -
> >> -             dptx-phy {
> >> -                     reg = <0x10040720>;
> >> -                     samsung,enable-mask = <1>;
> >> -             };
> >> +             phys = <&dp_phy>;
> >> +             phy-names = "dp";
> >>       };
> >
> > Thus, 'dptx-phy' node should be used until dp phy driver is merged.
> >
> > Vikas Sajjan,
> > Please test your patch on real boards when you send your patch.
> >
> 
> I tested the patch before sending on Exynos5250-SMDK5250 using  Kishon
> Vijay Abraham's series at http://lwn.net/Articles/559487/
>  which contains DP-PHY driver posted by you
>  1.  phy: Add driver for Exynos DP PHY
>  2.  video: exynos_dp: remove non-DT support for Exynos Display Port
>  3.  video: exynos_dp: Use the generic PHY driver
Jingoo Han Sept. 12, 2013, 10:56 a.m. UTC | #4 
On Thursday, September 12, 2013 7:37 PM, Kukjin Kim wrote:
> 
> Vikas Sajjan wrote:
> >
> > Hi Mr. Jingoo Han,
> >
> > On 26 August 2013 08:27, Jingoo Han <jg1.han@samsung.com> wrote:

[.....]

> > >
> > > Oops!!!
> > >
> > > This patch should be reverted.
> > > Or, fix patch should be re-sent.
> > > 'dp phy' driver is not yet merged to mainline kernel.
> > >
> >
> > As you suggest, since the DP-PHY driver is NOT yet in mainline, we may
> > have to keep this patch reverted till your patch series gets merged to
> > have DP working on exynos5 .
> >
> OK, got it. Please send patch fixing this issue for v3.12. Of course, we
> need this from v3.13 which will be including the DP-PHY driver.
> 

I already sent the patch fixing this.
([PATCH V2] ARM: dts: Remove DP PHY node from exynos5250.dtsi)
Please refer to the following. :-)

http://www.spinics.net/lists/linux-samsung-soc/msg22023.html

Best regards,
Jingoo Han
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index d464b6c..213a2d8 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -118,4 +118,15 @@ 
 		status = "disabled";
 	};
 
+	dp-controller@145b0000 {
+		compatible = "samsung,exynos5-dp";
+		reg = <0x145b0000 0x1000>;
+		interrupts = <10 3>;
+		interrupt-parent = <&combiner>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+
 };
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 76825ef..ce74400 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -509,13 +509,14 @@ 
 		};
 	};
 
-	dp-controller {
+	dp-controller@145b0000 {
 		samsung,color-space = <0>;
 		samsung,dynamic-range = <0>;
 		samsung,ycbcr-coeff = <0>;
 		samsung,color-depth = <1>;
 		samsung,link-rate = <0x0a>;
 		samsung,lane-count = <4>;
+		status = "okay";
 	};
 
 	fimd: fimd@14400000 {
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index d176dbb..f9ab99c 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -250,7 +250,7 @@ 
 		samsung,vbus-gpio = <&gpx2 6 0>;
 	};
 
-	dp-controller {
+	dp-controller@145b0000 {
 		samsung,color-space = <0>;
 		samsung,dynamic-range = <0>;
 		samsung,ycbcr-coeff = <0>;
@@ -260,6 +260,7 @@ 
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&dp_hpd>;
+		status = "okay";
 	};
 
 	fimd@14400000 {
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 238bdb2..1c017dc 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -614,20 +614,17 @@ 
 		interrupts = <0 94 0>;
 	};
 
-	dp-controller {
-		compatible = "samsung,exynos5-dp";
-		reg = <0x145b0000 0x1000>;
-		interrupts = <10 3>;
-		interrupt-parent = <&combiner>;
+	dp_phy: video-phy@10040720 {
+		compatible = "samsung,exynos5250-dp-video-phy";
+		reg = <0x10040720 4>;
+		#phy-cells = <0>;
+	};
+
+	dp-controller@145b0000 {
 		clocks = <&clock 342>;
 		clock-names = "dp";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		dptx-phy {
-			reg = <0x10040720>;
-			samsung,enable-mask = <1>;
-		};
+		phys = <&dp_phy>;
+		phy-names = "dp";
 	};
 
 	fimd@14400000 {