| Message ID | 20200325213439.16509-8-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hantro: set of small cleanups and fixes | expand |
On Wed, 25 Mar 2020 18:34:38 -0300, Ezequiel Garcia wrote: > Convert Rockchip VPU (Hantro IP block) codec driver documentation to > json-schema. > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > .../bindings/media/rockchip-vpu.txt | 43 ---------- > .../bindings/media/rockchip-vpu.yaml | 82 +++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 83 insertions(+), 44 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt > create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml > My bot found errors running 'make dt_binding_check' on your patch: Error: Documentation/devicetree/bindings/media/rockchip-vpu.example.dts:28.41-42 syntax error FATAL ERROR: Unable to parse input tree scripts/Makefile.lib:311: recipe for target 'Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml' failed make[1]: *** [Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... Makefile:1262: recipe for target 'dt_binding_check' failed make: *** [dt_binding_check] Error 2 See https://patchwork.ozlabs.org/patch/1261669 If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date: pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade Please check and re-submit.
On Wed, Mar 25, 2020 at 3:35 PM Ezequiel Garcia <ezequiel@collabora.com> wrote: > > Convert Rockchip VPU (Hantro IP block) codec driver documentation to > json-schema. > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > .../bindings/media/rockchip-vpu.txt | 43 ---------- > .../bindings/media/rockchip-vpu.yaml | 82 +++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 83 insertions(+), 44 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt > create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.txt b/Documentation/devicetree/bindings/media/rockchip-vpu.txt > deleted file mode 100644 > index 339252d9c515..000000000000 > --- a/Documentation/devicetree/bindings/media/rockchip-vpu.txt > +++ /dev/null > @@ -1,43 +0,0 @@ > -device-tree bindings for rockchip VPU codec > - > -Rockchip (Video Processing Unit) present in various Rockchip platforms, > -such as RK3288, RK3328 and RK3399. > - > -Required properties: > -- compatible: value should be one of the following > - "rockchip,rk3288-vpu"; > - "rockchip,rk3328-vpu"; > - "rockchip,rk3399-vpu"; > -- interrupts: encoding and decoding interrupt specifiers > -- interrupt-names: should be > - "vepu", "vdpu" on RK3288 and RK3399, > - "vdpu" on RK3328. > -- clocks: phandle to VPU aclk, hclk clocks > -- clock-names: should be "aclk" and "hclk" > -- power-domains: phandle to power domain node > -- iommus: phandle to a iommu node > - > -Example: > -SoC-specific DT entry: > - vpu: video-codec@ff9a0000 { > - compatible = "rockchip,rk3288-vpu"; > - reg = <0x0 0xff9a0000 0x0 0x800>; > - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "vepu", "vdpu"; > - clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; > - clock-names = "aclk", "hclk"; > - power-domains = <&power RK3288_PD_VIDEO>; > - iommus = <&vpu_mmu>; > - }; > - > - vpu: video-codec@ff350000 { > - compatible = "rockchip,rk3328-vpu"; > - reg = <0x0 0xff350000 0x0 0x800>; > - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "vdpu"; > - clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > - clock-names = "aclk", "hclk"; > - power-domains = <&power RK3328_PD_VPU>; > - iommus = <&vpu_mmu>; > - }; > diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml > new file mode 100644 > index 000000000000..a0c45e05cf03 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml > @@ -0,0 +1,82 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > + > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/media/rockchip-vpu.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Hantro G1 VPU codecs implemented on Rockchip SoCs > + > +maintainers: > + - Ezequiel Garcia <ezequiel@collabora.com> > + > +description: > + Hantro G1 video encode and decode accelerators present on Rockchip SoCs. > + > +properties: > + compatible: > + enum: > + - rockchip,rk3288-vpu > + - rockchip,rk3328-vpu > + - rockchip,rk3399-vpu > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 2 > + > + interrupt-names: > + items: > + - const: vepu > + - const: vdpu > + > + clocks: > + maxItems: 2 > + > + clock-names: > + items: > + - const: aclk > + - const: hclk > + > + power-domains: > + maxItems: 1 > + > + iommus: > + maxItems: 1 > + > +required: > + - compatible > + - reg > + - interrupts > + - interrupt-names > + - clocks > + - clock-names Add: additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/clock/rk3288-cru.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + vpu: video-codec@ff9a0000 { > + compatible = "rockchip,rk3288-vpu"; > + reg = <0x0 0xff9a0000 0x0 0x800>; > + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vepu", "vdpu"; > + clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; > + clock-names = "aclk", "hclk"; > + power-domains = <&power RK3288_PD_VIDEO>; Header for this define? > + iommus = <&vpu_mmu>; > + }; > + > + vpu: video-codec@ff350000 { > + compatible = "rockchip,rk3328-vpu"; > + reg = <0x0 0xff350000 0x0 0x800>; > + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vdpu"; > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > + clock-names = "aclk", "hclk"; > + power-domains = <&power RK3328_PD_VPU>; > + iommus = <&vpu_mmu>; > + }; > diff --git a/MAINTAINERS b/MAINTAINERS > index d66ac41ef587..2b8b3e7f3df3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -14320,7 +14320,7 @@ L: linux-rockchip@lists.infradead.org > S: Maintained > F: drivers/staging/media/hantro/ > F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > -F: Documentation/devicetree/bindings/media/rockchip-vpu.txt > +F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > ROCKER DRIVER > M: Jiri Pirko <jiri@resnulli.us> > -- > 2.26.0.rc2 >
On Thu, 2020-03-26 at 10:55 -0600, Rob Herring wrote: > On Wed, 25 Mar 2020 18:34:38 -0300, Ezequiel Garcia wrote: > > Convert Rockchip VPU (Hantro IP block) codec driver documentation to > > json-schema. > > > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Rob Herring <robh@kernel.org> > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > > --- > > .../bindings/media/rockchip-vpu.txt | 43 ---------- > > .../bindings/media/rockchip-vpu.yaml | 82 +++++++++++++++++++ > > MAINTAINERS | 2 +- > > 3 files changed, 83 insertions(+), 44 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt > > create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > > > My bot found errors running 'make dt_binding_check' on your patch: > > Error: Documentation/devicetree/bindings/media/rockchip-vpu.example.dts:28.41-42 syntax error > FATAL ERROR: Unable to parse input tree > scripts/Makefile.lib:311: recipe for target 'Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml' failed > make[1]: *** [Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml] Error 1 > make[1]: *** Waiting for unfinished jobs.... > Makefile:1262: recipe for target 'dt_binding_check' failed > make: *** [dt_binding_check] Error 2 > > See https://patchwork.ozlabs.org/patch/1261669 > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure dt-schema is up to date: > > pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade > > Please check and re-submit. > Sure, I will. Sorry about that! Ezequiel
Hey Rob, On Thu, 2020-03-26 at 10:59 -0600, Rob Herring wrote: > On Wed, Mar 25, 2020 at 3:35 PM Ezequiel Garcia <ezequiel@collabora.com> wrote: > > Convert Rockchip VPU (Hantro IP block) codec driver documentation to > > json-schema. > > > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Rob Herring <robh@kernel.org> > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > > --- > > .../bindings/media/rockchip-vpu.txt | 43 ---------- > > .../bindings/media/rockchip-vpu.yaml | 82 +++++++++++++++++++ > > MAINTAINERS | 2 +- > > 3 files changed, 83 insertions(+), 44 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt > > create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > > > diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.txt b/Documentation/devicetree/bindings/media/rockchip-vpu.txt > > deleted file mode 100644 > > index 339252d9c515..000000000000 > > --- a/Documentation/devicetree/bindings/media/rockchip-vpu.txt > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -device-tree bindings for rockchip VPU codec > > - > > -Rockchip (Video Processing Unit) present in various Rockchip platforms, > > -such as RK3288, RK3328 and RK3399. > > - > > -Required properties: > > -- compatible: value should be one of the following > > - "rockchip,rk3288-vpu"; > > - "rockchip,rk3328-vpu"; > > - "rockchip,rk3399-vpu"; > > -- interrupts: encoding and decoding interrupt specifiers > > -- interrupt-names: should be > > - "vepu", "vdpu" on RK3288 and RK3399, > > - "vdpu" on RK3328. > > -- clocks: phandle to VPU aclk, hclk clocks > > -- clock-names: should be "aclk" and "hclk" > > -- power-domains: phandle to power domain node > > -- iommus: phandle to a iommu node > > - > > -Example: > > -SoC-specific DT entry: > > - vpu: video-codec@ff9a0000 { > > - compatible = "rockchip,rk3288-vpu"; > > - reg = <0x0 0xff9a0000 0x0 0x800>; > > - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, > > - <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > > - interrupt-names = "vepu", "vdpu"; > > - clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; > > - clock-names = "aclk", "hclk"; > > - power-domains = <&power RK3288_PD_VIDEO>; > > - iommus = <&vpu_mmu>; > > - }; > > - > > - vpu: video-codec@ff350000 { > > - compatible = "rockchip,rk3328-vpu"; > > - reg = <0x0 0xff350000 0x0 0x800>; > > - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > > - interrupt-names = "vdpu"; > > - clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > > - clock-names = "aclk", "hclk"; > > - power-domains = <&power RK3328_PD_VPU>; > > - iommus = <&vpu_mmu>; > > - }; > > diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > new file mode 100644 > > index 000000000000..a0c45e05cf03 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > @@ -0,0 +1,82 @@ > > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > > + > > +%YAML 1.2 > > +--- > > +$id: "http://devicetree.org/schemas/media/rockchip-vpu.yaml#" > > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > > + > > +title: Hantro G1 VPU codecs implemented on Rockchip SoCs > > + > > +maintainers: > > + - Ezequiel Garcia <ezequiel@collabora.com> > > + > > +description: > > + Hantro G1 video encode and decode accelerators present on Rockchip SoCs. > > + > > +properties: > > + compatible: > > + enum: > > + - rockchip,rk3288-vpu > > + - rockchip,rk3328-vpu > > + - rockchip,rk3399-vpu > > + > > + reg: > > + maxItems: 1 > > + > > + interrupts: > > + maxItems: 2 > > + > > + interrupt-names: > > + items: > > + - const: vepu > > + - const: vdpu > > + > > + clocks: > > + maxItems: 2 > > + > > + clock-names: > > + items: > > + - const: aclk > > + - const: hclk > > + > > + power-domains: > > + maxItems: 1 > > + > > + iommus: > > + maxItems: 1 > > + > > +required: > > + - compatible > > + - reg > > + - interrupts > > + - interrupt-names > > + - clocks > > + - clock-names > > Add: > > additionalProperties: false > OK. > > + > > +examples: > > + - | > > + #include <dt-bindings/clock/rk3288-cru.h> > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + > > + vpu: video-codec@ff9a0000 { > > + compatible = "rockchip,rk3288-vpu"; > > + reg = <0x0 0xff9a0000 0x0 0x800>; > > + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, > > + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "vepu", "vdpu"; > > + clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; > > + clock-names = "aclk", "hclk"; > > + power-domains = <&power RK3288_PD_VIDEO>; > > Header for this define? > Indeed, now the check passes. I'll get a v4 just for this patch. Thanks, Ezequiel > > + iommus = <&vpu_mmu>; > > + }; > > + > > + vpu: video-codec@ff350000 { > > + compatible = "rockchip,rk3328-vpu"; > > + reg = <0x0 0xff350000 0x0 0x800>; > > + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "vdpu"; > > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > > + clock-names = "aclk", "hclk"; > > + power-domains = <&power RK3328_PD_VPU>; > > + iommus = <&vpu_mmu>; > > + }; > > diff --git a/MAINTAINERS b/MAINTAINERS > > index d66ac41ef587..2b8b3e7f3df3 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -14320,7 +14320,7 @@ L: linux-rockchip@lists.infradead.org > > S: Maintained > > F: drivers/staging/media/hantro/ > > F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > -F: Documentation/devicetree/bindings/media/rockchip-vpu.txt > > +F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml > > > > ROCKER DRIVER > > M: Jiri Pirko <jiri@resnulli.us> > > -- > > 2.26.0.rc2 > >
diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.txt b/Documentation/devicetree/bindings/media/rockchip-vpu.txt deleted file mode 100644 index 339252d9c515..000000000000 --- a/Documentation/devicetree/bindings/media/rockchip-vpu.txt +++ /dev/null @@ -1,43 +0,0 @@ -device-tree bindings for rockchip VPU codec - -Rockchip (Video Processing Unit) present in various Rockchip platforms, -such as RK3288, RK3328 and RK3399. - -Required properties: -- compatible: value should be one of the following - "rockchip,rk3288-vpu"; - "rockchip,rk3328-vpu"; - "rockchip,rk3399-vpu"; -- interrupts: encoding and decoding interrupt specifiers -- interrupt-names: should be - "vepu", "vdpu" on RK3288 and RK3399, - "vdpu" on RK3328. -- clocks: phandle to VPU aclk, hclk clocks -- clock-names: should be "aclk" and "hclk" -- power-domains: phandle to power domain node -- iommus: phandle to a iommu node - -Example: -SoC-specific DT entry: - vpu: video-codec@ff9a0000 { - compatible = "rockchip,rk3288-vpu"; - reg = <0x0 0xff9a0000 0x0 0x800>; - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vepu", "vdpu"; - clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; - clock-names = "aclk", "hclk"; - power-domains = <&power RK3288_PD_VIDEO>; - iommus = <&vpu_mmu>; - }; - - vpu: video-codec@ff350000 { - compatible = "rockchip,rk3328-vpu"; - reg = <0x0 0xff350000 0x0 0x800>; - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vdpu"; - clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; - clock-names = "aclk", "hclk"; - power-domains = <&power RK3328_PD_VPU>; - iommus = <&vpu_mmu>; - }; diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file mode 100644 index 000000000000..a0c45e05cf03 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml @@ -0,0 +1,82 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/media/rockchip-vpu.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Hantro G1 VPU codecs implemented on Rockchip SoCs + +maintainers: + - Ezequiel Garcia <ezequiel@collabora.com> + +description: + Hantro G1 video encode and decode accelerators present on Rockchip SoCs. + +properties: + compatible: + enum: + - rockchip,rk3288-vpu + - rockchip,rk3328-vpu + - rockchip,rk3399-vpu + + reg: + maxItems: 1 + + interrupts: + maxItems: 2 + + interrupt-names: + items: + - const: vepu + - const: vdpu + + clocks: + maxItems: 2 + + clock-names: + items: + - const: aclk + - const: hclk + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - interrupt-names + - clocks + - clock-names + +examples: + - | + #include <dt-bindings/clock/rk3288-cru.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + vpu: video-codec@ff9a0000 { + compatible = "rockchip,rk3288-vpu"; + reg = <0x0 0xff9a0000 0x0 0x800>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vepu", "vdpu"; + clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; + clock-names = "aclk", "hclk"; + power-domains = <&power RK3288_PD_VIDEO>; + iommus = <&vpu_mmu>; + }; + + vpu: video-codec@ff350000 { + compatible = "rockchip,rk3328-vpu"; + reg = <0x0 0xff350000 0x0 0x800>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vdpu"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + clock-names = "aclk", "hclk"; + power-domains = <&power RK3328_PD_VPU>; + iommus = <&vpu_mmu>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index d66ac41ef587..2b8b3e7f3df3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14320,7 +14320,7 @@ L: linux-rockchip@lists.infradead.org S: Maintained F: drivers/staging/media/hantro/ F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml -F: Documentation/devicetree/bindings/media/rockchip-vpu.txt +F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml ROCKER DRIVER M: Jiri Pirko <jiri@resnulli.us>
Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- .../bindings/media/rockchip-vpu.txt | 43 ---------- .../bindings/media/rockchip-vpu.yaml | 82 +++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 83 insertions(+), 44 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml