Hi Neil,
On Tuesday 29 Nov 2016 21:16:17 Laurent Pinchart wrote:
> On Tuesday 29 Nov 2016 11:47:47 Neil Armstrong wrote:
> > Add Video Processing Unit and CVBS Output nodes, and enable CVBS on
> > selected boards.
> >
> > Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
> > ---
> >
> > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 46 +++++++++++++++++
> > .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 ++
> > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 4 ++
> > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 ++++
> > .../boot/dts/amlogic/meson-gxl-nexbox-a95x.dts | 4 ++
> > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 ++++
> > .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 ++
> > arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 8 ++++
> > 8 files changed, 86 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> > b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index fc033c0..644d5f6 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> > @@ -153,6 +153,27 @@
> > };
> > };
> >
> > + venc_cvbs: venc-cvbs {
> > + compatible = "amlogic,meson-gx-cvbs";
> > + status = "disabled";
>
> Still no registers here ?
Or is this the internal video encoder, not the HHI VDAC ? If so, haven't we
decided when discussing the previous version that there's no need for a DT
node to model the video encoder as it's part of the VPU ?
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + venc_cvbs_in: port@0 {
>
> Nitpicking, you don't need a label here as ports are never referenced by
> phandle. Same for the vpu node below.
>
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + reg = <0>;
> > +
> > + venc_cvbs_in_vpu: endpoint@0 {
> > + reg = <0>;
>
> And there's no requirement to number the endpoint if there's a single one of
> them (but it's not forbidden either).
>
> > + remote-endpoint =
>
> <&vpu_out_venc_cvbs>;
>
> > + };
> > + };
> > + };
> > + };
> > +
> >
> > soc {
Shouldn't the above node be placed inside the soc ?
> > compatible = "simple-bus";
> > #address-cells = <2>;
> >
> > @@ -356,5 +377,30 @@
> >
> > status = "disabled";
> >
> > };
> >
> > };
> >
> > +
> > + vpu: vpu@d0100000 {
> > + compatible = "amlogic,meson-gx-vpu";
> > + reg = <0x0 0xd0100000 0x0 0x100000>,
> > + <0x0 0xc883c000 0x0 0x1000>,
> > + <0x0 0xc8838000 0x0 0x1000>;
> > + reg-names = "base", "hhi", "dmc";
> > + interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + vpu_out: port@1 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + reg = <1>;
> > +
> > + vpu_out_venc_cvbs: endpoint@0 {
> > + reg = <0>;
> > + remote-endpoint =
>
> <&venc_cvbs_in_vpu>;
>
> > + };
> > + };
> > + };
> > + };
> >
> > };
> >
> > };
> >
> > 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
> > 9696820..a55d1cf 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> > @@ -229,3 +229,7 @@
> >
> > clocks = <&clkc CLKID_FCLK_DIV4>;
> > clock-names = "clkin0";
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + status = "okay";
> > +};
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> > b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 5e5e2de..3c09bd1
> > 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> > @@ -266,3 +266,7 @@
> >
> > clocks = <&clkc CLKID_FCLK_DIV4>;
> > clock-names = "clkin0";
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + status = "okay";
> > +};
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> > b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index ac5ad3b..1a321c8f
> > 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> > @@ -506,3 +506,11 @@
> >
> > <&clkc CLKID_FCLK_DIV2>;
> >
> > clock-names = "core", "clkin0", "clkin1";
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + compatible = "amlogic,meson-gxbb-cvbs", "amlogic,meson-gx-cvbs";
> > +};
> > +
> > +&vpu {
> > + compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
> > +};
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
> > b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts index
> > e99101a..2a9b46f 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
> > @@ -203,3 +203,7 @@
> >
> > clocks = <&clkc CLKID_FCLK_DIV4>;
> > clock-names = "clkin0";
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + status = "okay";
> > +};
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> > b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 3af54dc..b60c5ce 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> > @@ -299,3 +299,11 @@
> >
> > <&clkc CLKID_FCLK_DIV2>;
> >
> > clock-names = "core", "clkin0", "clkin1";
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + compatible = "amlogic,meson-gxl-cvbs", "amlogic,meson-gx-cvbs";
> > +};
> > +
> > +&vpu {
> > + compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
> > +};
> > 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
> > d320727..1ae2451 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> > @@ -167,3 +167,7 @@
> >
> > max-speed = <1000>;
> >
> > };
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + status = "okay";
> > +};
> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
> > b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi index c1974bb..fecd8c2 100644
> > --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
> > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
> > @@ -112,3 +112,11 @@
> >
> > };
> >
> > };
> >
> > };
> >
> > +
> > +&venc_cvbs {
> > + compatible = "amlogic,meson-gxm-cvbs", "amlogic,meson-gx-cvbs";
> > +};
> > +
> > +&vpu {
> > + compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
> > +};
--
Regards,
Laurent Pinchart
