Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752865AbdDDIKh (ORCPT ); Tue, 4 Apr 2017 04:10:37 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:36365 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbdDDIKd (ORCPT ); Tue, 4 Apr 2017 04:10:33 -0400 Subject: Re: [PATCH v2 09/13] ARM64: dts: meson-gx: Add support for HDMI output To: airlied@linux.ie References: <1490109950-21421-1-git-send-email-narmstrong@baylibre.com> <1490109950-21421-10-git-send-email-narmstrong@baylibre.com> Cc: dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org From: Neil Armstrong Organization: Baylibre Message-ID: Date: Tue, 4 Apr 2017 10:10:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1490109950-21421-10-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9098 Lines: 334 On 03/21/2017 04:25 PM, Neil Armstrong wrote: > Add HDMI output and connector nodes. > > Signed-off-by: Neil Armstrong > --- > .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 39 ++++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 32 ++++++++++++++++++ > .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 23 +++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 23 +++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 +++++++ > .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 23 +++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 13 ++++++++ > .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 23 +++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 3 ++ > 9 files changed, 191 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > index 7a078be..a84e276 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > @@ -98,6 +98,27 @@ > clocks = <&wifi32k>; > clock-names = "ext_clock"; > }; > + > + cvbs-connector { > + compatible = "composite-video-connector"; > + > + port { > + cvbs_connector_in: endpoint { > + remote-endpoint = <&cvbs_vdac_out>; > + }; > + }; > + }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi_tx_tmds_out>; > + }; > + }; > + }; > }; > > /* This UART is brought out to the DB9 connector */ > @@ -188,3 +209,21 @@ > ðmac { > status = "okay"; > }; > + > +&cvbs_vdac_port { > + cvbs_vdac_out: endpoint { > + remote-endpoint = <&cvbs_connector_in>; > + }; > +}; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > index 94c6f95..0dda058 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -465,6 +465,38 @@ > cvbs_vdac_port: port@0 { > reg = <0>; > }; > + > + /* HDMI-TX output port */ > + hdmi_tx_port: port@1 { > + reg = <1>; > + > + hdmi_tx_out: endpoint { > + remote-endpoint = <&hdmi_tx_in>; > + }; > + }; > + }; > + > + hdmi_tx: hdmi-tx@c883a000 { > + compatible = "amlogic,meson-gx-dw-hdmi"; > + reg = <0x0 0xc883a000 0x0 0x1c>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "disabled"; > + > + /* VPU VENC Input */ > + hdmi_tx_venc_port: port@0 { > + reg = <0>; > + > + hdmi_tx_in: endpoint { > + remote-endpoint = <&hdmi_tx_out>; > + }; > + }; > + > + /* TMDS Output */ > + hdmi_tx_tmds_port: port@1 { > + reg = <1>; > + }; > }; > }; > }; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts > index 4cbd626..a2c999f 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts > @@ -152,6 +152,17 @@ > }; > }; > }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi_tx_tmds_out>; > + }; > + }; > + }; > }; > > &uart_AO { > @@ -245,3 +256,15 @@ > remote-endpoint = <&cvbs_connector_in>; > }; > }; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > index 4a96e0f..1c96fc8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > @@ -135,6 +135,17 @@ > }; > }; > }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi_tx_tmds_out>; > + }; > + }; > + }; > }; > > /* This UART is brought out to the DB9 connector */ > @@ -250,3 +261,15 @@ > remote-endpoint = <&cvbs_connector_in>; > }; > }; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index 04b3324..9716e65 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -524,3 +524,15 @@ > &vpu { > compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; > }; > + > +&hdmi_tx { > + compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; > + resets = <&reset RESET_HDMITX_CAPB3>, > + <&reset RESET_HDMI_SYSTEM_RESET>, > + <&reset RESET_HDMI_TX>; > + reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; > + clocks = <&clkc CLKID_HDMI_PCLK>, > + <&clkc CLKID_CLK81>, > + <&clkc CLKID_GCLK_VENCI_INT0>; > + clock-names = "isfr", "iahb", "venci"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts > index cea4a3e..8873c05 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts > @@ -127,6 +127,17 @@ > }; > }; > }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi_tx_tmds_out>; > + }; > + }; > + }; > }; > > &uart_AO { > @@ -219,3 +230,15 @@ > remote-endpoint = <&cvbs_connector_in>; > }; > }; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > index fe11b5f..9dcac25 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > @@ -44,6 +44,7 @@ > #include "meson-gx.dtsi" > #include > #include > +#include > > / { > compatible = "amlogic,meson-gxl"; > @@ -381,3 +382,15 @@ > &vpu { > compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; > }; > + > +&hdmi_tx { > + compatible = "amlogic,meson-gxl-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; > + resets = <&reset RESET_HDMITX_CAPB3>, > + <&reset RESET_HDMI_SYSTEM_RESET>, > + <&reset RESET_HDMI_TX>; > + reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; > + clocks = <&clkc CLKID_HDMI_PCLK>, > + <&clkc CLKID_CLK81>, > + <&clkc CLKID_GCLK_VENCI_INT0>; > + clock-names = "isfr", "iahb", "venci"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > index 5a337d3..0e68c62e 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > @@ -100,6 +100,17 @@ > }; > }; > }; > + > + hdmi-connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi_tx_tmds_out>; > + }; > + }; > + }; > }; > > /* This UART is brought out to the DB9 connector */ > @@ -183,3 +194,15 @@ > remote-endpoint = <&cvbs_connector_in>; > }; > }; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > index ddea730..fe451cc 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > @@ -130,3 +130,6 @@ > compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu"; > }; > > +&hdmi_tx { > + compatible = "amlogic,meson-gxm-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; > +}; > Hi Kevin, Please take this one for the amlogic arm-soc DT tree. It may need a rebase, please tell me then I'll repost this one rebased on your 4.12/dt64 branch. Thanks, Neil