[PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node

[PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node

[Enric Balletbo i Serra]

From: Yakir Yang <ykk@rock-chips.com>

The pclk_vio_grf supply power for VIO GRF IOs, if it is disabled,
driver would failed to operate the VIO GRF registers.

The clock is optional but one of the side effects of don't have this clk
is that the Samsung Chromebook Plus fails to recover display after a
suspend/resume with following errors:

    rockchip-dp ff970000.edp: Input stream clock not detected.
    rockchip-dp ff970000.edp: Timeout of video streamclk ok
    rockchip-dp ff970000.edp: unable to config video

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 9551e773ff78..beef28f7309d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1741,8 +1741,8 @@
 		compatible = "rockchip,rk3399-edp";
 		reg = <0x0 0xff970000 0x0 0x8000>;
 		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>;
-		clock-names = "dp", "pclk";
+		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
+		clock-names = "dp", "pclk", "grf";
 		pinctrl-names = "default";
 		pinctrl-0 = <&edp_hpd>;
 		power-domains = <&power RK3399_PD_EDP>;
-- 
2.15.1

[PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399.

[Enric Balletbo i Serra]

From: Chris Zhong <zyw@rock-chips.com>

Add a node for the cdn DP controller which is embedded in the rk3399
SoC.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index beef28f7309d..2f2dee0e2f3c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -457,6 +457,46 @@
 		};
 	};
 
+        cdn_dp: dp@fec00000 {
+                compatible = "rockchip,rk3399-cdn-dp";
+                reg = <0x0 0xfec00000 0x0 0x100000>;
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru SCLK_DP_CORE>, <&cru PCLK_DP_CTRL>,
+                         <&cru SCLK_SPDIF_REC_DPTX>, <&cru PCLK_VIO_GRF>;
+                clock-names = "core-clk", "pclk", "spdif", "grf";
+                assigned-clocks = <&cru SCLK_DP_CORE>;
+                assigned-clock-rates = <100000000>;
+                power-domains = <&power RK3399_PD_HDCP>;
+                phys = <&tcphy0_dp>, <&tcphy1_dp>;
+                resets = <&cru SRST_DPTX_SPDIF_REC>, <&cru SRST_P_UPHY0_DPTX>,
+                         <&cru SRST_P_UPHY0_APB>, <&cru SRST_DP_CORE>;
+                reset-names = "spdif", "dptx", "apb", "core";
+                rockchip,grf = <&grf>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                #sound-dai-cells = <1>;
+                status = "disabled";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        dp_in: port {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                dp_in_vopb: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&vopb_out_dp>;
+                                };
+
+                                dp_in_vopl: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint = <&vopl_out_dp>;
+                                };
+                        };
+                };
+        };
+
 	gic: interrupt-controller@fee00000 {
 		compatible = "arm,gic-v3";
 		#interrupt-cells = <4>;
@@ -1549,6 +1589,11 @@
 				reg = <3>;
 				remote-endpoint = <&mipi1_in_vopl>;
 			};
+
+                        vopl_out_dp: endpoint@4 {
+                                reg = <4>;
+                                remote-endpoint = <&dp_in_vopl>;
+                        };
 		};
 	};
 
@@ -1601,6 +1646,11 @@
 				reg = <3>;
 				remote-endpoint = <&mipi1_in_vopb>;
 			};
+
+                        vopb_out_dp: endpoint@4 {
+                                reg = <4>;
+                                remote-endpoint = <&dp_in_vopb>;
+                        };
 		};
 	};
 
-- 
2.15.1

Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399.

[Heiko Stuebner]

Hi Enric,

Am Mittwoch, 7. Februar 2018, 17:31:49 CET schrieb Enric Balletbo i Serra:
> From: Chris Zhong <zyw@rock-chips.com>
> 
> Add a node for the cdn DP controller which is embedded in the rk3399
> SoC.
> 
> Signed-off-by: Chris Zhong <zyw@rock-chips.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 50 ++++++++++++++++++++++++++++++++

It looks like there is no binding document at all for cdn-dp? At least
I couldn't find one and the original series also didn't seem to include one.

And while I don't see anything problematic right with the used properties
right now, I'd think we should really have a binding and give dt-maintainers
a chance to complain, before adding devicetree nodes based on it.

I'd guess a mostly usable binding doc should already sit in the chromeos
tree, which you could base a v2 of this series on?


Thanks
Heiko

Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399.

[Enric Balletbo i Serra]

Hi Heiko,

On 10/02/18 17:16, Heiko Stuebner wrote:
> Hi Enric,
> 
> Am Mittwoch, 7. Februar 2018, 17:31:49 CET schrieb Enric Balletbo i Serra:
>> From: Chris Zhong <zyw@rock-chips.com>
>>
>> Add a node for the cdn DP controller which is embedded in the rk3399
>> SoC.
>>
>> Signed-off-by: Chris Zhong <zyw@rock-chips.com>
>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>> ---
>>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 50 ++++++++++++++++++++++++++++++++
> 
> It looks like there is no binding document at all for cdn-dp? At least
> I couldn't find one and the original series also didn't seem to include one.
> 
> And while I don't see anything problematic right with the used properties
> right now, I'd think we should really have a binding and give dt-maintainers
> a chance to complain, before adding devicetree nodes based on it.
> 
> I'd guess a mostly usable binding doc should already sit in the chromeos
> tree, which you could base a v2 of this series on?
> 
> 

Sure, I'll send a v2 for this series. Thanks.

  Enric

> Thanks
> Heiko
> 

Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399.

[Enric Balletbo Serra]

2018-02-13 11:42 GMT+01:00 Enric Balletbo i Serra
<enric.balletbo@collabora.com>:
> Hi Heiko,
>
> On 10/02/18 17:16, Heiko Stuebner wrote:
>> Hi Enric,
>>
>> Am Mittwoch, 7. Februar 2018, 17:31:49 CET schrieb Enric Balletbo i Serra:
>>> From: Chris Zhong <zyw@rock-chips.com>
>>>
>>> Add a node for the cdn DP controller which is embedded in the rk3399
>>> SoC.
>>>
>>> Signed-off-by: Chris Zhong <zyw@rock-chips.com>
>>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>>> ---
>>>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 50 ++++++++++++++++++++++++++++++++
>>
>> It looks like there is no binding document at all for cdn-dp? At least
>> I couldn't find one and the original series also didn't seem to include one.
>>
>> And while I don't see anything problematic right with the used properties
>> right now, I'd think we should really have a binding and give dt-maintainers
>> a chance to complain, before adding devicetree nodes based on it.
>>
>> I'd guess a mostly usable binding doc should already sit in the chromeos
>> tree, which you could base a v2 of this series on?
>>
>>
>
> Sure, I'll send a v2 for this series. Thanks.
>
>   Enric
>

So seems that the binding was already discussed and accepted here [1]
but for some reason never landed. So I think that I'll send v2 just
including the binding patch so all can land together. Sounds good?

[1] https://patchwork.kernel.org/patch/9278077/

Cheers,
 Enric


>> Thanks
>> Heiko
>>

Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399.

[Heiko Stübner]

Hi Enric,

Am Dienstag, 13. Februar 2018, 12:36:47 CET schrieb Enric Balletbo Serra:
> 2018-02-13 11:42 GMT+01:00 Enric Balletbo i Serra
> 
> <enric.balletbo@collabora.com>:
> > Hi Heiko,
> > 
> > On 10/02/18 17:16, Heiko Stuebner wrote:
> >> Hi Enric,
> >> 
> >> Am Mittwoch, 7. Februar 2018, 17:31:49 CET schrieb Enric Balletbo i 
Serra:
> >>> From: Chris Zhong <zyw@rock-chips.com>
> >>> 
> >>> Add a node for the cdn DP controller which is embedded in the rk3399
> >>> SoC.
> >>> 
> >>> Signed-off-by: Chris Zhong <zyw@rock-chips.com>
> >>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> >>> ---
> >>> 
> >>>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 50
> >>>  ++++++++++++++++++++++++++++++++>> 
> >> It looks like there is no binding document at all for cdn-dp? At least
> >> I couldn't find one and the original series also didn't seem to include
> >> one.
> >> 
> >> And while I don't see anything problematic right with the used properties
> >> right now, I'd think we should really have a binding and give
> >> dt-maintainers a chance to complain, before adding devicetree nodes
> >> based on it.
> >> 
> >> I'd guess a mostly usable binding doc should already sit in the chromeos
> >> tree, which you could base a v2 of this series on?
> > 
> > Sure, I'll send a v2 for this series. Thanks.
> > 
> >   Enric
> 
> So seems that the binding was already discussed and accepted here [1]
> but for some reason never landed. So I think that I'll send v2 just
> including the binding patch so all can land together. Sounds good?
> 
> [1] https://patchwork.kernel.org/patch/9278077/

Nice find and yep, just resending binding + your patches 2+3
is enough then :-)


Heiko

[PATCH 3/3] arm64: dts: rockchip: enable DP for gru.

[Enric Balletbo i Serra]

From: Chris Zhong <zyw@rock-chips.com>

Enable cdn_dp and create a cdn-dp-sound for the DP audio. Delete the
endpoints between dp and vopL for gru, since we want the DP only use
VOP big, which can support 4K mode.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 03f195025390..d05e8a52ec3c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -515,7 +515,23 @@
 		compatible = "rockchip,rk3399-gru-sound";
 		rockchip,cpu = <&i2s0 &i2s2>;
 		rockchip,codec = <&max98357a &headsetcodec
-				  &codec &wacky_spi_audio>;
+				  &codec &wacky_spi_audio &cdn_dp>;
+	};
+};
+
+/* Don't use vopl for dp, save it for edp */
+/delete-node/ &vopl_out_dp;
+/delete-node/ &dp_in_vopl;
+
+&cdn_dp {
+	status = "okay";
+	extcon = <&usbc_extcon0>, <&usbc_extcon1>;
+
+	ports {
+		/* Don't use vopl for dp, save it for edp */
+		dp_in: port {
+			/delete-node/ endpoint@1;
+		};
 	};
 };
 
-- 
2.15.1

Re: [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node

[Heiko Stuebner]

Am Mittwoch, 7. Februar 2018, 17:31:48 CET schrieb Enric Balletbo i Serra:
> From: Yakir Yang <ykk@rock-chips.com>
> 
> The pclk_vio_grf supply power for VIO GRF IOs, if it is disabled,
> driver would failed to operate the VIO GRF registers.
> 
> The clock is optional but one of the side effects of don't have this clk
> is that the Samsung Chromebook Plus fails to recover display after a
> suspend/resume with following errors:
> 
>     rockchip-dp ff970000.edp: Input stream clock not detected.
>     rockchip-dp ff970000.edp: Timeout of video streamclk ok
>     rockchip-dp ff970000.edp: unable to config video
> 
> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

as you said in IRC that his should also fix the failures when rockchip-drm
is build as module, I've applied this patch as fix for 4.16


Thanks
Heiko