Re: [PATCH v2 09/13] ARM64: dts: meson-gx: Add support for HDMI output

2017-04-04 Thread Kevin Hilman
Neil Armstrong  writes:

> On 03/21/2017 04:25 PM, Neil Armstrong wrote:
>> Add HDMI output and connector nodes.
>> 
>> Signed-off-by: Neil Armstrong 

[...]

>
> Hi Kevin,
>
> Please take this one for the amlogic arm-soc DT tree.
>

Applied to v4.12/dt64,

Kevin
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH v2 09/13] ARM64: dts: meson-gx: Add support for HDMI output

2017-04-04 Thread Neil Armstrong
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 = <>;
>   clock-names = "ext_clock";
>   };
> +
> + cvbs-connector {
> + compatible = "composite-video-connector";
> +
> + port {
> + cvbs_connector_in: endpoint {
> + remote-endpoint = <_vdac_out>;
> + };
> + };
> + };
> +
> + hdmi-connector {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi_connector_in: endpoint {
> + remote-endpoint = <_tx_tmds_out>;
> + };
> + };
> + };
>  };
>  
>  /* This UART is brought out to the DB9 connector */
> @@ -188,3 +209,21 @@
>   {
>   status = "okay";
>  };
> +
> +_vdac_port {
> + cvbs_vdac_out: endpoint {
> + remote-endpoint = <_connector_in>;
> + };
> +};
> +
> +_tx {
> + status = "okay";
> + pinctrl-0 = <_hpd_pins>, <_i2c_pins>;
> + pinctrl-names = "default";
> +};
> +
> +_tx_tmds_port {
> + hdmi_tx_tmds_out: endpoint {
> + remote-endpoint = <_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 = <_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 = <_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 = <_tx_tmds_out>;
> + };
> + };
> + };
>  };
>  
>  _AO {
> @@ -245,3 +256,15 @@
>   remote-endpoint = <_connector_in>;
>   };
>  };
> +
> +_tx {
> + status = "okay";
> + pinctrl-0 = <_hpd_pins>, <_i2c_pins>;
> + pinctrl-names = "default";
> +};
> +
> +_tx_tmds_port {
> + hdmi_tx_tmds_out: endpoint {
> + remote-endpoint = <_connector_in>;
> + };
> +};
> diff --git