2019-07-26 12:54:51

by Maxime Jourdan

Subject: [PATCH 0/3] arm64: dts: meson: add the video decoder nodes

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

2019-07-26 12:55:03

by Maxime Jourdan

Subject: [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry

Add the base video decoder node compatible with the meson vdec driver,
for GX* chips.

Signed-off-by: Maxime Jourdan <[email protected]>
---
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

2019-07-26 16:06:09

by Maxime Jourdan

Subject: [PATCH 3/3] arm64: dts: meson: add video decoder entries

This enables the video decoder for GXBB, GXL and GXM chips

Signed-off-by: Maxime Jourdan <[email protected]>
---
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

2019-07-29 14:00:04

by Neil Armstrong

Subject: Re: [PATCH 2/3] arm64: dts: meson-gx: add video decoder entry

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 <[email protected]>
> ---
> 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 <[email protected]>

2019-07-29 16:04:09

by Neil Armstrong

Subject: Re: [PATCH 3/3] arm64: dts: meson: add video decoder entries

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 <[email protected]>
> ---
> 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 <[email protected]>