On 01/04/2021 17:59, Benjamin Gaignard wrote:
> Introducing G2 hevc video decoder lead to modify the bindings to allow
> to get one node per VPUs.
Introducing the G2 hevc video decoder requires modifications of the bindings to
allow
one node per VPU.
> VPUs share one hardware control block which is provided as a phandle on
> an syscon.
an -> a
> Each node got now one reg and one interrupt.
got now -> has now
> Add a compatible for G2 hardware block: nxp,imx8mq-vpu-g2.
>
> To be compatible with older DT the driver is still capable to use 'ctrl'
use -> use the
> reg-name even if it is deprecated now.
Regards,
Hans
>
> Signed-off-by: Benjamin Gaignard
> Reviewed-by: Rob Herring
> Reviewed-by: Philipp Zabel
> ---
> version 7:
> - Add Rob and Philipp reviewed-by tag
> - Change syscon phandle name to nxp,imx8m-vpu-ctrl (remove 'q' to be
> usable for iMX8MM too)
>
> version 5:
> - This version doesn't break the backward compatibilty between kernel
> and DT.
>
> .../bindings/media/nxp,imx8mq-vpu.yaml| 53 ---
> 1 file changed, 34 insertions(+), 19 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> index 762be3f96ce9..18e7d40a5f24 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> @@ -15,22 +15,18 @@ description:
>
> properties:
>compatible:
> -const: nxp,imx8mq-vpu
> +oneOf:
> + - const: nxp,imx8mq-vpu
> + - const: nxp,imx8mq-vpu-g2
>
>reg:
> -maxItems: 3
> -
> - reg-names:
> -items:
> - - const: g1
> - - const: g2
> - - const: ctrl
> +maxItems: 1
>
>interrupts:
> -maxItems: 2
> +maxItems: 1
>
>interrupt-names:
> -items:
> +oneOf:
>- const: g1
>- const: g2
>
> @@ -46,14 +42,18 @@ properties:
>power-domains:
> maxItems: 1
>
> + nxp,imx8m-vpu-ctrl:
> +description: Specifies a phandle to syscon VPU hardware control block
> +$ref: "/schemas/types.yaml#/definitions/phandle"
> +
> required:
>- compatible
>- reg
> - - reg-names
>- interrupts
>- interrupt-names
>- clocks
>- clock-names
> + - nxp,imx8m-vpu-ctrl
>
> additionalProperties: false
>
> @@ -62,18 +62,33 @@ examples:
> #include
> #include
>
> -vpu: video-codec@3830 {
> +vpu_ctrl: syscon@3832 {
> + compatible = "nxp,imx8mq-vpu-ctrl", "syscon";
> + reg = <0x3832 0x1>;
> +};
> +
> +vpu_g1: video-codec@3830 {
> compatible = "nxp,imx8mq-vpu";
> -reg = <0x3830 0x1>,
> - <0x3831 0x1>,
> - <0x3832 0x1>;
> -reg-names = "g1", "g2", "ctrl";
> -interrupts = ,
> - ;
> -interrupt-names = "g1", "g2";
> +reg = <0x3830 0x1>;
> +interrupts = ;
> +interrupt-names = "g1";
> +clocks = < IMX8MQ_CLK_VPU_G1_ROOT>,
> + < IMX8MQ_CLK_VPU_G2_ROOT>,
> + < IMX8MQ_CLK_VPU_DEC_ROOT>;
> +clock-names = "g1", "g2", "bus";
> +power-domains = <_vpu>;
> +nxp,imx8m-vpu-ctrl = <_ctrl>;
> +};
> +
> +vpu_g2: video-codec@3831 {
> +compatible = "nxp,imx8mq-vpu-g2";
> +reg = <0x3830 0x1>;
> +interrupts = ;
> +interrupt-names = "g2";
> clocks = < IMX8MQ_CLK_VPU_G1_ROOT>,
> < IMX8MQ_CLK_VPU_G2_ROOT>,
> < IMX8MQ_CLK_VPU_DEC_ROOT>;
> clock-names = "g1", "g2", "bus";
> power-domains = <_vpu>;
> +nxp,imx8m-vpu-ctrl = <_ctrl>;
> };
>
