* [PATCH 0/3] arm64: dts: meson: add the video decoder nodes
@ 2019-07-26 12:46 Maxime Jourdan
2019-07-26 12:46 ` [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible Maxime Jourdan
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Maxime Jourdan @ 2019-07-26 12:46 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-kernel, linux-arm-kernel, linux-amlogic, devicetree
This series adds the dts nodes for the Amlogic video decoder for the
GXBB (S905), GXL (S905X) and GXM (S912) SoCs.
It also includes two misc. fixes for the bindings documentation:
a missing generic compatible and changing the example node's type
to something more conventional.
Maxime Jourdan (3):
dt-bindings: media: amlogic,vdec: add default compatible
arm64: dts: meson-gx: add video decoder entry
arm64: dts: meson: add video decoder entries
.../devicetree/bindings/media/amlogic,vdec.txt | 5 +++--
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 14 ++++++++++++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +++++++++++
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 +++++++++++
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++
5 files changed, 43 insertions(+), 2 deletions(-)
--
2.22.0
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible 2019-07-26 12:46 [PATCH 0/3] arm64: dts: meson: add the video decoder nodes Maxime Jourdan @ 2019-07-26 12:46 ` Maxime Jourdan 2019-07-29 13:06 ` Neil Armstrong 2019-07-26 12:46 ` [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry Maxime Jourdan 2019-07-26 12:46 ` [PATCH 3/3] arm64: dts: meson: add video decoder entries Maxime Jourdan 2 siblings, 1 reply; 7+ messages in thread From: Maxime Jourdan @ 2019-07-26 12:46 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-kernel, linux-arm-kernel, linux-amlogic, devicetree The first version of the bindings is missing a generic compatible that is used by the base node (GX), and then extended by the SoC device trees (GXBB, GXL, GXM) Also change the example to use "video-codec" instead of "video-decoder", as the former is the one used in almost all cases when it comes to video decode/encode accelerators. Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> --- Documentation/devicetree/bindings/media/amlogic,vdec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/media/amlogic,vdec.txt b/Documentation/devicetree/bindings/media/amlogic,vdec.txt index aabdd01bcf32..9b6aace86ca7 100644 --- a/Documentation/devicetree/bindings/media/amlogic,vdec.txt +++ b/Documentation/devicetree/bindings/media/amlogic,vdec.txt @@ -26,6 +26,7 @@ Required properties: - GXBB (S905) : "amlogic,gxbb-vdec" - GXL (S905X, S905D) : "amlogic,gxl-vdec" - GXM (S912) : "amlogic,gxm-vdec" + followed by the common "amlogic,gx-vdec" - reg: base address and size of he following memory-mapped regions : - dos - esparser @@ -47,8 +48,8 @@ Required properties: Example: -vdec: video-decoder@c8820000 { - compatible = "amlogic,gxbb-vdec"; +vdec: video-codec@c8820000 { + compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; reg = <0x0 0xc8820000 0x0 0x10000>, <0x0 0xc110a580 0x0 0xe4>; reg-names = "dos", "esparser"; -- 2.22.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible 2019-07-26 12:46 ` [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible Maxime Jourdan @ 2019-07-29 13:06 ` Neil Armstrong 0 siblings, 0 replies; 7+ messages in thread From: Neil Armstrong @ 2019-07-29 13:06 UTC (permalink / raw) To: Maxime Jourdan, Kevin Hilman Cc: linux-amlogic, linux-kernel, linux-arm-kernel, devicetree On 26/07/2019 14:46, Maxime Jourdan wrote: > The first version of the bindings is missing a generic compatible that > is used by the base node (GX), and then extended by the SoC device trees > (GXBB, GXL, GXM) > > Also change the example to use "video-codec" instead of "video-decoder", > as the former is the one used in almost all cases when it comes to video > decode/encode accelerators. > > Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> > --- > Documentation/devicetree/bindings/media/amlogic,vdec.txt | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/amlogic,vdec.txt b/Documentation/devicetree/bindings/media/amlogic,vdec.txt > index aabdd01bcf32..9b6aace86ca7 100644 > --- a/Documentation/devicetree/bindings/media/amlogic,vdec.txt > +++ b/Documentation/devicetree/bindings/media/amlogic,vdec.txt > @@ -26,6 +26,7 @@ Required properties: > - GXBB (S905) : "amlogic,gxbb-vdec" > - GXL (S905X, S905D) : "amlogic,gxl-vdec" > - GXM (S912) : "amlogic,gxm-vdec" > + followed by the common "amlogic,gx-vdec" > - reg: base address and size of he following memory-mapped regions : > - dos > - esparser > @@ -47,8 +48,8 @@ Required properties: > > Example: > > -vdec: video-decoder@c8820000 { > - compatible = "amlogic,gxbb-vdec"; > +vdec: video-codec@c8820000 { > + compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; > reg = <0x0 0xc8820000 0x0 0x10000>, > <0x0 0xc110a580 0x0 0xe4>; > reg-names = "dos", "esparser"; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry 2019-07-26 12:46 [PATCH 0/3] arm64: dts: meson: add the video decoder nodes Maxime Jourdan 2019-07-26 12:46 ` [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible Maxime Jourdan @ 2019-07-26 12:46 ` Maxime Jourdan 2019-07-29 13:05 ` Neil Armstrong 2019-07-26 12:46 ` [PATCH 3/3] arm64: dts: meson: add video decoder entries Maxime Jourdan 2 siblings, 1 reply; 7+ messages in thread From: Maxime Jourdan @ 2019-07-26 12:46 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-kernel, linux-arm-kernel, linux-amlogic, devicetree Add the base video decoder node compatible with the meson vdec driver, for GX* chips. Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 74d03fc706be..86e26ed551e0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -437,6 +437,20 @@ }; }; + vdec: video-codec@c8820000 { + compatible = "amlogic,gx-vdec"; + reg = <0x0 0xc8820000 0x0 0x10000>, + <0x0 0xc110a580 0x0 0xe4>; + reg-names = "dos", "esparser"; + + interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "vdec", "esparser"; + + amlogic,ao-sysctrl = <&sysctrl_AO>; + amlogic,canvas = <&canvas>; + }; + periphs: periphs@c8834000 { compatible = "simple-bus"; reg = <0x0 0xc8834000 0x0 0x2000>; -- 2.22.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry 2019-07-26 12:46 ` [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry Maxime Jourdan @ 2019-07-29 13:05 ` Neil Armstrong 0 siblings, 0 replies; 7+ messages in thread From: Neil Armstrong @ 2019-07-29 13:05 UTC (permalink / raw) To: Maxime Jourdan, Kevin Hilman Cc: linux-amlogic, linux-kernel, linux-arm-kernel, devicetree On 26/07/2019 14:46, Maxime Jourdan wrote: > Add the base video decoder node compatible with the meson vdec driver, > for GX* chips. > > Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> > --- > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > index 74d03fc706be..86e26ed551e0 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -437,6 +437,20 @@ > }; > }; > > + vdec: video-codec@c8820000 { > + compatible = "amlogic,gx-vdec"; > + reg = <0x0 0xc8820000 0x0 0x10000>, > + <0x0 0xc110a580 0x0 0xe4>; > + reg-names = "dos", "esparser"; > + > + interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>; > + interrupt-names = "vdec", "esparser"; > + > + amlogic,ao-sysctrl = <&sysctrl_AO>; > + amlogic,canvas = <&canvas>; > + }; > + > periphs: periphs@c8834000 { > compatible = "simple-bus"; > reg = <0x0 0xc8834000 0x0 0x2000>; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] arm64: dts: meson: add video decoder entries 2019-07-26 12:46 [PATCH 0/3] arm64: dts: meson: add the video decoder nodes Maxime Jourdan 2019-07-26 12:46 ` [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible Maxime Jourdan 2019-07-26 12:46 ` [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry Maxime Jourdan @ 2019-07-26 12:46 ` Maxime Jourdan 2019-07-29 13:05 ` Neil Armstrong 2 siblings, 1 reply; 7+ messages in thread From: Maxime Jourdan @ 2019-07-26 12:46 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-kernel, linux-arm-kernel, linux-amlogic, devicetree This enables the video decoder for GXBB, GXL and GXM chips Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +++++++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 +++++++++++ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index f734faaf7b78..0cb40326b0d3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -845,3 +845,14 @@ compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; power-domains = <&pwrc_vpu>; }; + +&vdec { + compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; + clocks = <&clkc CLKID_DOS_PARSER>, + <&clkc CLKID_DOS>, + <&clkc CLKID_VDEC_1>, + <&clkc CLKID_VDEC_HEVC>; + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; + resets = <&reset RESET_PARSER>; + reset-names = "esparser"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index c959456bacc6..a09c53aaa0e8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -848,3 +848,14 @@ compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; power-domains = <&pwrc_vpu>; }; + +&vdec { + compatible = "amlogic,gxl-vdec", "amlogic,gx-vdec"; + clocks = <&clkc CLKID_DOS_PARSER>, + <&clkc CLKID_DOS>, + <&clkc CLKID_VDEC_1>, + <&clkc CLKID_VDEC_HEVC>; + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; + resets = <&reset RESET_PARSER>; + reset-names = "esparser"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi index 7a85a82bf65d..a0e677d5a8f7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi @@ -144,3 +144,7 @@ &dwc3 { phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>; }; + +&vdec { + compatible = "amlogic,gxm-vdec", "amlogic,gx-vdec"; +}; -- 2.22.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] arm64: dts: meson: add video decoder entries 2019-07-26 12:46 ` [PATCH 3/3] arm64: dts: meson: add video decoder entries Maxime Jourdan @ 2019-07-29 13:05 ` Neil Armstrong 0 siblings, 0 replies; 7+ messages in thread From: Neil Armstrong @ 2019-07-29 13:05 UTC (permalink / raw) To: Maxime Jourdan, Kevin Hilman Cc: linux-amlogic, linux-kernel, linux-arm-kernel, devicetree On 26/07/2019 14:46, Maxime Jourdan wrote: > This enables the video decoder for GXBB, GXL and GXM chips > > Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> > --- > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 +++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++ > 3 files changed, 26 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index f734faaf7b78..0cb40326b0d3 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -845,3 +845,14 @@ > compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; > power-domains = <&pwrc_vpu>; > }; > + > +&vdec { > + compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; > + clocks = <&clkc CLKID_DOS_PARSER>, > + <&clkc CLKID_DOS>, > + <&clkc CLKID_VDEC_1>, > + <&clkc CLKID_VDEC_HEVC>; > + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; > + resets = <&reset RESET_PARSER>; > + reset-names = "esparser"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > index c959456bacc6..a09c53aaa0e8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > @@ -848,3 +848,14 @@ > compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; > power-domains = <&pwrc_vpu>; > }; > + > +&vdec { > + compatible = "amlogic,gxl-vdec", "amlogic,gx-vdec"; > + clocks = <&clkc CLKID_DOS_PARSER>, > + <&clkc CLKID_DOS>, > + <&clkc CLKID_VDEC_1>, > + <&clkc CLKID_VDEC_HEVC>; > + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; > + resets = <&reset RESET_PARSER>; > + reset-names = "esparser"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > index 7a85a82bf65d..a0e677d5a8f7 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi > @@ -144,3 +144,7 @@ > &dwc3 { > phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>; > }; > + > +&vdec { > + compatible = "amlogic,gxm-vdec", "amlogic,gx-vdec"; > +}; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-29 13:06 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-26 12:46 [PATCH 0/3] arm64: dts: meson: add the video decoder nodes Maxime Jourdan 2019-07-26 12:46 ` [PATCH 1/3] dt-bindings: media: amlogic,vdec: add default compatible Maxime Jourdan 2019-07-29 13:06 ` Neil Armstrong 2019-07-26 12:46 ` [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry Maxime Jourdan 2019-07-29 13:05 ` Neil Armstrong 2019-07-26 12:46 ` [PATCH 3/3] arm64: dts: meson: add video decoder entries Maxime Jourdan 2019-07-29 13:05 ` 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).