[PATCH v2 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes
From: Neil Armstrong <hidden>
Date: 2016-11-30 16:07:17
Also in:
dri-devel, linux-amlogic, linux-devicetree, lkml
On 11/30/2016 05:02 PM, Laurent Pinchart wrote:
Hi Neil, Thank you for the patch. On Wednesday 30 Nov 2016 16:43:43 Neil Armstrong wrote:quoted
Add Video Processing Unit and CVBS Output nodes, and enable CVBS on selected boards. Signed-off-by: Neil Armstrong <redacted> --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 19 ++++++++++++++++ .../arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 15 +++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 15 +++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts | 15 +++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 15 +++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++ 8 files changed, 91 insertions(+)diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsib/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index fc033c0..a27f881 100644--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi@@ -356,5 +356,24 @@ status = "disabled"; }; }; + + vpu: vpu at d0100000 { + compatible = "amlogic,meson-gx-vpu"; + reg = <0x0 0xd0100000 0x0 0x100000>, + <0x0 0xc883c000 0x0 0x1000>, + <0x0 0xc8838000 0x0 0x1000>; + reg-names = "vpu", "hhi", "dmc"; + interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>; + #address-cells = <1>; + #size-cells = <0>; + + /* CVBS VDAC output port */ + port at 0 { + reg = <0>; + + cvbs_vdac_out: endpoint { + };Endpoints require a remote-endpoint property. You should move the endpoint to board DT files.
OK, I was wondering, it looked dirty to me.
quoted
+ }; + }; }; };diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtsb/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 9696820..390f7db 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts@@ -142,6 +142,17 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + cvbs-connector { + compatible = "composite-video-connector"; + label = "cvbs";Unless the board has a label for the connector (either on the board, on the casing or in the user manual) I'd leave this out. Same comment for the other boards.
OK, Thanks, Neil
Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>quoted
+ + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; }; &uart_AO {@@ -229,3 +240,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&cvbs_vdac_out { + remote-endpoint = <&cvbs_connector_in>; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsib/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 203be28..44bdebf 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi@@ -125,6 +125,17 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + cvbs-connector { + compatible = "composite-video-connector"; + label = "cvbs"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; }; /* This UART is brought out to the DB9 connector */@@ -234,3 +245,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&cvbs_vdac_out { + remote-endpoint = <&cvbs_connector_in>; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsib/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index ac5ad3b..5353a20 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi@@ -506,3 +506,7 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; + +&vpu { + compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dtsb/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts index e99101a..7bd0538 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts@@ -117,6 +117,17 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + cvbs-connector { + compatible = "composite-video-connector"; + label = "cvbs"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; }; &uart_AO {@@ -203,3 +214,7 @@ clocks = <&clkc CLKID_FCLK_DIV4>; clock-names = "clkin0"; }; + +&cvbs_vdac_out { + remote-endpoint = <&cvbs_connector_in>; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsib/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 9f89b99..5c7a8fa 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi@@ -299,3 +299,7 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; + +&vpu { + compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtsb/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index d320727..5b99749 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts@@ -90,6 +90,17 @@ compatible = "mmc-pwrseq-emmc"; reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; }; + + cvbs-connector { + compatible = "composite-video-connector"; + label = "cvbs"; + + port { + cvbs_connector_in: endpoint { + remote-endpoint = <&cvbs_vdac_out>; + }; + }; + }; }; /* This UART is brought out to the DB9 connector */@@ -167,3 +178,7 @@ max-speed = <1000>; }; }; + +&cvbs_vdac_out { + remote-endpoint = <&cvbs_connector_in>; +};diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsib/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi index c1974bb..eb2f0c3 100644--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi@@ -112,3 +112,7 @@ }; }; }; + +&vpu { + compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu"; +};