| Message ID | 1494013716-25091-5-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Superseded |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
Hi Philipp, On 5 May 2017 at 13:48, 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 v3: > - enable both hdmi and vopb (as both VOPs are now disabled by default) > > Changes in v2: None > > arch/arm/dts/rk3399-puma.dts | 9 +++++++++ > arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 48 insertions(+) Acked-by: Simon Glass <sjg@chromium.org> Normally would split the generic rk3399.dtsi change into its own patch, since the other one is board-specific.
diff --git a/arch/arm/dts/rk3399-puma.dts b/arch/arm/dts/rk3399-puma.dts index 312d70e..bcc8cb8 100644 --- a/arch/arm/dts/rk3399-puma.dts +++ b/arch/arm/dts/rk3399-puma.dts @@ -192,3 +192,12 @@ &spi5 { status = "okay"; }; + +&vopb { + status = "okay"; +}; + +&hdmi { + status = "okay"; +}; + 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 v3: - enable both hdmi and vopb (as both VOPs are now disabled by default) Changes in v2: None arch/arm/dts/rk3399-puma.dts | 9 +++++++++ arch/arm/dts/rk3399.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)