* [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes [not found] ` <1480416469-9655-1-git-send-email-narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> @ 2016-11-29 10:47 ` Neil Armstrong 2016-11-29 19:16 ` Laurent Pinchart 2016-11-29 10:47 ` [PATCH 3/4] dt-bindings: display: add Amlogic Meson DRM Bindings Neil Armstrong 1 sibling, 1 reply; 4+ messages in thread From: Neil Armstrong @ 2016-11-29 10:47 UTC (permalink / raw) To: airlied-cv59FeDIM0c, khilman-rdvid1DuHRBWk0Htik3J/w, carlo-KA+7E9HrN00dnm+yROfE0A Cc: Neil Armstrong, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, victor.wan-LpR1jeaWuhtBDgjK7y7TUQ, jerry.cao-LpR1jeaWuhtBDgjK7y7TUQ, Xing.Xu-LpR1jeaWuhtBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw, daniel-/w4YWyX8dFk Add Video Processing Unit and CVBS Output nodes, and enable CVBS on selected boards. Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> --- 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"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + venc_cvbs_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + venc_cvbs_in_vpu: endpoint@0 { + reg = <0>; + remote-endpoint = <&vpu_out_venc_cvbs>; + }; + }; + }; + }; + 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"; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes 2016-11-29 10:47 ` [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes Neil Armstrong @ 2016-11-29 19:16 ` Laurent Pinchart 2016-11-29 19:19 ` Laurent Pinchart 0 siblings, 1 reply; 4+ messages in thread From: Laurent Pinchart @ 2016-11-29 19:16 UTC (permalink / raw) To: Neil Armstrong Cc: devicetree, Xing.Xu, victor.wan, khilman, linux-kernel, dri-devel, jerry.cao, carlo, linux-amlogic, linux-arm-kernel Hi Neil, Thank you for the patch. 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 <narmstrong@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 ? > + > + 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 { > 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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes 2016-11-29 19:16 ` Laurent Pinchart @ 2016-11-29 19:19 ` Laurent Pinchart 0 siblings, 0 replies; 4+ messages in thread From: Laurent Pinchart @ 2016-11-29 19:19 UTC (permalink / raw) To: Neil Armstrong Cc: airlied-cv59FeDIM0c, khilman-rdvid1DuHRBWk0Htik3J/w, carlo-KA+7E9HrN00dnm+yROfE0A, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, victor.wan-LpR1jeaWuhtBDgjK7y7TUQ, jerry.cao-LpR1jeaWuhtBDgjK7y7TUQ, Xing.Xu-LpR1jeaWuhtBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA, daniel-/w4YWyX8dFk 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 <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> > > --- > > > > 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/4] dt-bindings: display: add Amlogic Meson DRM Bindings [not found] ` <1480416469-9655-1-git-send-email-narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2016-11-29 10:47 ` [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes Neil Armstrong @ 2016-11-29 10:47 ` Neil Armstrong 1 sibling, 0 replies; 4+ messages in thread From: Neil Armstrong @ 2016-11-29 10:47 UTC (permalink / raw) To: airlied-cv59FeDIM0c, khilman-rdvid1DuHRBWk0Htik3J/w, carlo-KA+7E9HrN00dnm+yROfE0A Cc: Neil Armstrong, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, victor.wan-LpR1jeaWuhtBDgjK7y7TUQ, jerry.cao-LpR1jeaWuhtBDgjK7y7TUQ, Xing.Xu-LpR1jeaWuhtBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw, daniel-/w4YWyX8dFk Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> --- .../bindings/display/meson/meson-drm.txt | 134 +++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/meson/meson-drm.txt diff --git a/Documentation/devicetree/bindings/display/meson/meson-drm.txt b/Documentation/devicetree/bindings/display/meson/meson-drm.txt new file mode 100644 index 0000000..cf241be --- /dev/null +++ b/Documentation/devicetree/bindings/display/meson/meson-drm.txt @@ -0,0 +1,134 @@ +Amlogic Meson Display Controller +================================ + +The Amlogic Meson Display controller is composed of several components +that are going to be documented below: + +DMC|---------------VPU (Video Processing Unit)----------------|------HHI------| + | vd1 _______ _____________ _________________ | | +D |-------| |----| | | | | HDMI PLL | +D | vd2 | VIU | | Video Post | | Video Encoders |<---|-----VCLK | +R |-------| |----| Processing | | | | | + | osd2 | | | |---| Enci ----------|----|-----VDAC------| +R |-------| CSC |----| Scalers | | Encp ----------|----|----HDMI-TX----| +A | osd1 | | | Blenders | | Encl ----------|----|---------------| +M |-------|______|----|____________| |________________| | | +___|__________________________________________________________|_______________| + + +VIU: Video Input Unit +--------------------- + +The Video Input Unit is in charge of the pixel scanout from the DDR memory. +It fetches the frames addresses, stride and parameters from the "Canvas" memory. +This part is also in charge of the CSC (Colorspace Conversion). +It can handle 2 OSD Planes and 2 Video Planes. + +VPP: Video Post Processing +-------------------------- + +The Video Post Processing is in charge of the scaling and blending of the +various planes into a single pixel stream. +There is a special "pre-blending" used by the video planes with a dedicated +scaler and a "post-blending" to merge with the OSD Planes. +The OSD planes also have a dedicated scaler for one of the OSD. + +VENC: Video Encoders +-------------------- + +The VENC is composed of the multiple pixel encoders : + - ENCI : Interlace Video encoder for CVBS and Interlace HDMI + - ENCP : Progressive Video Encoder for HDMI + - ENCL : LCD LVDS Encoder +The VENC Unit gets a Pixel Clocks (VCLK) from a dedicated HDMI PLL and clock +tree and provides the scanout clock to the VPP and VIU. +The ENCI is connected to a single VDAC for Composite Output. +The ENCI and ENCP are connected to an on-chip HDMI Transceiver. + +Device Tree Bindings: +--------------------- + +VPU: Video Processing Unit +-------------------------- + +Required properties: +- compatible: value should be different for each SoC family as : + - GXBB (S905) : "amlogic,meson-gxbb-vpu" + - GXL (S905X, S905D) : "amlogic,meson-gxl-vpu" + - GXM (S912) : "amlogic,meson-gxm-vpu" + followed by the common "amlogic,meson-gx-vpu" +- reg: base address and size of he following memory-mapped regions : + - vpu + - hhi + - dmc +- reg-names: should contain the names of the previous memory regions +- interrupts: should contain the VENC Vsync interrupt number + +- ports: A ports node with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + second port should be the output endpoints for VENC connectors. + +CBVS Output +----------- + +The VENC can output Composite/CVBS output via a dedicated VDAC, usage of such +Composite output is optional. + +Required properties: +- compatible: value should be different for each SoC family as : + - GXBB (S905) : "amlogic,meson-gxbb-cvbs" + - GXL (S905X, S905D) : "amlogic,meson-gxl-cvbs" + - GXM (S912) : "amlogic,meson-gxm-cvbs" + followed by the common "amlogic,meson-gx-cvbs" + +- ports: A ports node with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + first port should be the input endpoints, connected ot the VPU node. + +Example: + +venc_cvbs: venc-cvbs { + compatible = "amlogic,meson-gxbb-cvbs"; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + enc_cvbs_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + venc_cvbs_in_vpu: endpoint@0 { + reg = <0>; + remote-endpoint = <&vpu_out_venc_cvbs>; + }; + }; + }; +}; + +vpu: vpu@d0100000 { + compatible = "amlogic,meson-gxbb-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>; + }; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-29 19:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1480416469-9655-1-git-send-email-narmstrong@baylibre.com>
[not found] ` <1480416469-9655-1-git-send-email-narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
2016-11-29 10:47 ` [PATCH 2/4] ARM64: dts: meson-gx: Add Graphic Controller nodes Neil Armstrong
2016-11-29 19:16 ` Laurent Pinchart
2016-11-29 19:19 ` Laurent Pinchart
2016-11-29 10:47 ` [PATCH 3/4] dt-bindings: display: add Amlogic Meson DRM Bindings Neil Armstrong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).