Message ID | 1496246386-61447-9-git-send-email-philipp.tomsich@theobroma-systems.com |
---|---|
State | Accepted |
Commit | 876c1d0fb18ef54dca621041a06fd9789fd7c6bd |
Delegated to: | Anatolij Gustschin |
Headers | show |
On 31 May 2017 at 09:59, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > This commit enables HDMI output in the DTS by adding the necessary > nodes to vopl/vopb and by adding the HDMI node. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > Changes in v4: None > Changes in v3: None > Changes in v2: None > > arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org>
On Wed, 31 May 2017 17:59:35 +0200 Philipp Tomsich philipp.tomsich@theobroma-systems.com wrote: > This commit enables HDMI output in the DTS by adding the necessary > nodes to vopl/vopb and by adding the HDMI node. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > Changes in v4: None > Changes in v3: None > Changes in v2: None > > arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) applied to u-boot-video/master, thanks! -- Anatolij
Hi Anatolij, On 2 June 2017 at 07:24, Anatolij Gustschin <agust@denx.de> wrote: > On Wed, 31 May 2017 17:59:35 +0200 > Philipp Tomsich philipp.tomsich@theobroma-systems.com wrote: > >> This commit enables HDMI output in the DTS by adding the necessary >> nodes to vopl/vopb and by adding the HDMI node. >> >> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> >> --- >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 39 insertions(+) > > applied to u-boot-video/master, thanks! > I cannot see this patch there. Can you please point me to it? I'd like to bring in some more patches but they depend on this series. Regards, Simon
Hi Simon, On Wed, 7 Jun 2017 06:51:19 -0600 Simon Glass sjg@chromium.org wrote: ... > I cannot see this patch there. Can you please point me to it? I'd like > to bring in some more patches but they depend on this series. it is here http://patchwork.ozlabs.org/patch/769240/ I applied patches 1-8 here: http://git.denx.de/?p=u-boot/u-boot-video.git;a=shortlog;h=refs/heads/merge But patch 9 depends on changes in u-boot-rockchip.git. I can rebase when u-boot-rockchip.git is merged in u-boot.git/master and then also can add patch 9. Or you can merge this series into u-boot-rockchip if it is easier. Thanks, Anatolij
Hi Anatolij, On 7 June 2017 at 07:05, Anatolij Gustschin <agust@denx.de> wrote: > Hi Simon, > > On Wed, 7 Jun 2017 06:51:19 -0600 > Simon Glass sjg@chromium.org wrote: > ... >> I cannot see this patch there. Can you please point me to it? I'd like >> to bring in some more patches but they depend on this series. > > it is here http://patchwork.ozlabs.org/patch/769240/ > > I applied patches 1-8 here: > > http://git.denx.de/?p=u-boot/u-boot-video.git;a=shortlog;h=refs/heads/merge > > But patch 9 depends on changes in u-boot-rockchip.git. I can rebase when > u-boot-rockchip.git is merged in u-boot.git/master and then also can add > patch 9. Or you can merge this series into u-boot-rockchip if it is easier. OK I will go ahead and merge them again to rockchip since I have other patches that rely on these. This is getting tricky! Regards, Simon
Hi Simon, On Wed, 7 Jun 2017 21:30:15 -0600 Simon Glass sjg@chromium.org wrote: ... > > But patch 9 depends on changes in u-boot-rockchip.git. I can rebase when > > u-boot-rockchip.git is merged in u-boot.git/master and then also can add > > patch 9. Or you can merge this series into u-boot-rockchip if it is easier. > > OK I will go ahead and merge them again to rockchip since I have other > patches that rely on these. This is getting tricky! OK, thanks! -- Anatolij
diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index f3d3f53..7f1fc50 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -1419,6 +1419,11 @@ reg = <3>; remote-endpoint = <&mipi_in_vopl>; }; + + vopl_out_hdmi: endpoint@1 { + reg = <1>; + remote-endpoint = <&hdmi_in_vopl>; + }; }; }; @@ -1440,6 +1445,40 @@ reg = <3>; remote-endpoint = <&mipi_in_vopb>; }; + + vopb_out_hdmi: endpoint@1 { + reg = <1>; + remote-endpoint = <&hdmi_in_vopb>; + }; + }; + }; + + hdmi: hdmi@ff940000 { + compatible = "rockchip,rk3399-dw-hdmi"; + reg = <0x0 0xff940000 0x0 0x20000>; + reg-io-width = <4>; + rockchip,grf = <&grf>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_i2c_xfer>; + power-domains = <&power RK3399_PD_HDCP>; + interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, <&cru PLL_VPLL>, <&cru PCLK_VIO_GRF>; + clock-names = "iahb", "isfr", "vpll", "grf"; + status = "disabled"; + + ports { + hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in_vopb: endpoint@0 { + reg = <0>; + remote-endpoint = <&vopb_out_hdmi>; + }; + hdmi_in_vopl: endpoint@1 { + reg = <1>; + remote-endpoint = <&vopl_out_hdmi>; + }; + }; }; };
This commit enables HDMI output in the DTS by adding the necessary nodes to vopl/vopb and by adding the HDMI node. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)