* [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node @ 2018-02-07 16:31 Enric Balletbo i Serra [not found] ` <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 0 siblings, 1 reply; 8+ messages in thread From: Enric Balletbo i Serra @ 2018-02-07 16:31 UTC (permalink / raw) To: Heiko Stuebner Cc: Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, groeck, devicetree, linux-rockchip, linux-kernel, Yakir Yang 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>]
* [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399. [not found] ` <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> @ 2018-02-07 16:31 ` Enric Balletbo i Serra [not found] ` <20180207163150.16332-2-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2018-02-07 16:31 ` [PATCH 3/3] arm64: dts: rockchip: enable DP for gru Enric Balletbo i Serra 2018-02-09 9:45 ` [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node Heiko Stuebner 2 siblings, 1 reply; 8+ messages in thread From: Enric Balletbo i Serra @ 2018-02-07 16:31 UTC (permalink / raw) To: Heiko Stuebner Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Catalin Marinas, Chris Zhong, Brian Norris, Will Deacon, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Rob Herring, groeck-F7+t8E8rja9g9hUCZPvPmw From: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Add a node for the cdn DP controller which is embedded in the rk3399 SoC. Signed-off-by: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> --- 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <20180207163150.16332-2-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>]
* Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399. [not found] ` <20180207163150.16332-2-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> @ 2018-02-10 16:16 ` Heiko Stuebner 2018-02-13 10:42 ` Enric Balletbo i Serra 0 siblings, 1 reply; 8+ messages in thread From: Heiko Stuebner @ 2018-02-10 16:16 UTC (permalink / raw) To: Enric Balletbo i Serra Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Catalin Marinas, Chris Zhong, Brian Norris, Will Deacon, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Rob Herring, groeck-F7+t8E8rja9g9hUCZPvPmw Hi Enric, Am Mittwoch, 7. Februar 2018, 17:31:49 CET schrieb Enric Balletbo i Serra: > From: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > > Add a node for the cdn DP controller which is embedded in the rk3399 > SoC. > > Signed-off-by: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> > --- > 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399. 2018-02-10 16:16 ` Heiko Stuebner @ 2018-02-13 10:42 ` Enric Balletbo i Serra 2018-02-13 11:36 ` Enric Balletbo Serra 0 siblings, 1 reply; 8+ messages in thread From: Enric Balletbo i Serra @ 2018-02-13 10:42 UTC (permalink / raw) To: Heiko Stuebner Cc: Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, groeck-F7+t8E8rja9g9hUCZPvPmw, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Chris Zhong 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-TNX95d0MmH7DzftRWevZcw@public.gmane.org> >> >> Add a node for the cdn DP controller which is embedded in the rk3399 >> SoC. >> >> Signed-off-by: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> >> Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> >> --- >> 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 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399. 2018-02-13 10:42 ` Enric Balletbo i Serra @ 2018-02-13 11:36 ` Enric Balletbo Serra 2018-02-13 11:52 ` Heiko Stübner 0 siblings, 1 reply; 8+ messages in thread From: Enric Balletbo Serra @ 2018-02-13 11:36 UTC (permalink / raw) To: Enric Balletbo i Serra Cc: Heiko Stuebner, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, Guenter Roeck, devicetree, open list:ARM/Rockchip SoC..., linux-kernel, Chris Zhong 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 >> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399. 2018-02-13 11:36 ` Enric Balletbo Serra @ 2018-02-13 11:52 ` Heiko Stübner 0 siblings, 0 replies; 8+ messages in thread From: Heiko Stübner @ 2018-02-13 11:52 UTC (permalink / raw) To: Enric Balletbo Serra Cc: Enric Balletbo i Serra, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, Guenter Roeck, devicetree, open list:ARM/Rockchip SoC..., linux-kernel, Chris Zhong 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] arm64: dts: rockchip: enable DP for gru. [not found] ` <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2018-02-07 16:31 ` [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399 Enric Balletbo i Serra @ 2018-02-07 16:31 ` Enric Balletbo i Serra 2018-02-09 9:45 ` [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Enric Balletbo i Serra @ 2018-02-07 16:31 UTC (permalink / raw) To: Heiko Stuebner Cc: Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, groeck-F7+t8E8rja9g9hUCZPvPmw, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Chris Zhong From: Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 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-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> --- 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node [not found] ` <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2018-02-07 16:31 ` [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399 Enric Balletbo i Serra 2018-02-07 16:31 ` [PATCH 3/3] arm64: dts: rockchip: enable DP for gru Enric Balletbo i Serra @ 2018-02-09 9:45 ` Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Heiko Stuebner @ 2018-02-09 9:45 UTC (permalink / raw) To: Enric Balletbo i Serra Cc: Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Brian Norris, groeck-F7+t8E8rja9g9hUCZPvPmw, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Yakir Yang Am Mittwoch, 7. Februar 2018, 17:31:48 CET schrieb Enric Balletbo i Serra: > From: Yakir Yang <ykk-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > > 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-TNX95d0MmH7DzftRWevZcw@public.gmane.org> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-02-13 11:52 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-02-07 16:31 [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node Enric Balletbo i Serra [not found] ` <20180207163150.16332-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2018-02-07 16:31 ` [PATCH 2/3] arm64: dts: rockchip: add cdn-dp node for rk3399 Enric Balletbo i Serra [not found] ` <20180207163150.16332-2-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2018-02-10 16:16 ` Heiko Stuebner 2018-02-13 10:42 ` Enric Balletbo i Serra 2018-02-13 11:36 ` Enric Balletbo Serra 2018-02-13 11:52 ` Heiko Stübner 2018-02-07 16:31 ` [PATCH 3/3] arm64: dts: rockchip: enable DP for gru Enric Balletbo i Serra 2018-02-09 9:45 ` [PATCH 1/3] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node Heiko Stuebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).