Message ID | 1619432515-9060-1-git-send-email-dikshita@codeaurora.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | dt-bindings: media: venus: Add sc7280 dt schema | expand |
On Mon, 26 Apr 2021 15:51:55 +0530, Dikshita Agarwal wrote: > Add a schema description for the venus video encoder/decoder on the sc7280. > > Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> > --- > .../bindings/media/qcom,sc7280-venus.yaml | 158 +++++++++++++++++++++ > 1 file changed, 158 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Documentation/devicetree/bindings/media/qcom,sc7280-venus.example.dts:19:18: fatal error: dt-bindings/clock/qcom,videocc-sc7280.h: No such file or directory 19 | #include <dt-bindings/clock/qcom,videocc-sc7280.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [scripts/Makefile.lib:377: Documentation/devicetree/bindings/media/qcom,sc7280-venus.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1414: dt_binding_check] Error 2 See https://patchwork.ozlabs.org/patch/1470241 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit.
From a quick glance this looks extremely similar to the venus binding for sc7180. Is there really a good reason for a separate binding? On Mon, Apr 26, 2021 at 03:51:55PM +0530, Dikshita Agarwal wrote: > Add a schema description for the venus video encoder/decoder on the sc7280. > > Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> > --- > .../bindings/media/qcom,sc7280-venus.yaml | 158 +++++++++++++++++++++ > 1 file changed, 158 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > > diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > new file mode 100644 > index 0000000..a258d97 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > @@ -0,0 +1,158 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > + > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/media/qcom,sc7280-venus.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Qualcomm Venus video encode and decode accelerators > + > +maintainers: > + - Stanimir Varbanov <stanimir.varbanov@linaro.org> > + > +description: | > + The Venus IP is a video encode and decode accelerator present > + on Qualcomm platforms > + > +properties: > + compatible: > + const: qcom,sc7280-venus > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + power-domains: > + minItems: 2 > + maxItems: 3 > + > + power-domain-names: > + minItems: 2 > + maxItems: 3 > + items: > + - const: venus > + - const: vcodec0 > + > + clocks: > + maxItems: 5 > + > + clock-names: > + items: > + - const: core_clk > + - const: video_cc_mvsc_ctl_axi > + - const: iface_clk > + - const: vcodec_clk > + - const: video_cc_mvs0_ctl_axi > + > + iommus: > + maxItems: 2 > + > + memory-region: > + maxItems: 1 > + > + interconnects: > + maxItems: 2 > + > + interconnect-names: > + items: > + - const: cpu-cfg > + - const: video-mem > + > + video-decoder: > + type: object > + > + properties: > + compatible: > + const: venus-decoder > + > + required: > + - compatible > + > + additionalProperties: false > + > + video-encoder: > + type: object > + > + properties: > + compatible: > + const: venus-encoder > + > + required: > + - compatible > + > + additionalProperties: false > + > + video-firmware: > + type: object > + > + description: | > + Firmware subnode is needed when the platform does not > + have TrustZone. > + > + properties: > + iommus: > + maxItems: 1 > + > + required: > + - iommus > + > +required: > + - compatible > + - reg > + - interrupts > + - power-domains > + - power-domain-names > + - clocks > + - clock-names > + - iommus > + - memory-region > + - video-decoder > + - video-encoder > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/clock/qcom,videocc-sc7280.h> > + > + venus: video-codec@aa00000 { > + compatible = "qcom,sc7280-venus"; > + reg = <0x0aa00000 0xd0600>; > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; > + > + clocks = <&videocc VIDEO_CC_MVSC_CORE_CLK>, > + <&videocc VIDEO_CC_MVSC_CTL_AXI_CLK>, > + <&videocc VIDEO_CC_VENUS_AHB_CLK>, > + <&videocc VIDEO_CC_MVS0_CORE_CLK>, > + <&videocc VIDEO_CC_MVS0_AXI_CLK>; > + clock-names = "core_clk", "video_cc_mvsc_ctl_axi", > + "iface_clk", "vcodec_clk", > + "video_cc_mvs0_ctl_axi"; > + > + power-domains = <&videocc MVSC_GDSC>, > + <&videocc MVS0_GDSC>; > + power-domain-names = "venus", "vcodec0"; > + > + interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0> > + <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; > + interconnect-names = "cpu-cfg", "video-mem"; > + > + iommus = <&apps_smmu 0x2180 0x20>, > + <&apps_smmu 0x2184 0x20>; > + > + memory-region = <&video_mem>; > + > + video-decoder { > + compatible = "venus-decoder"; > + }; > + > + video-encoder { > + compatible = "venus-encoder"; > + }; > + > + video-firmware { > + iommus = <&apps_smmu 0x21a2 0x0>; > + }; > + }; > -- > 2.7.4 >
Hi Rob, Thanks for your comment. Actually, this change depends on https://patchwork.kernel.org/project/linux-arm-msm/list/?series=473809 which adds the file dt-bindings/clock/qcom,videocc-sc7280.h (v2 5/6) Missed adding the dependency in commit text. Thanks, Dikshita On 2021-04-27 02:34, Rob Herring wrote: > On Mon, 26 Apr 2021 15:51:55 +0530, Dikshita Agarwal wrote: >> Add a schema description for the venus video encoder/decoder on the >> sc7280. >> >> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> >> --- >> .../bindings/media/qcom,sc7280-venus.yaml | 158 >> +++++++++++++++++++++ >> 1 file changed, 158 insertions(+) >> create mode 100644 >> Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml >> > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > Documentation/devicetree/bindings/media/qcom,sc7280-venus.example.dts:19:18: > fatal error: dt-bindings/clock/qcom,videocc-sc7280.h: No such file or > directory > 19 | #include <dt-bindings/clock/qcom,videocc-sc7280.h> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > compilation terminated. > make[1]: *** [scripts/Makefile.lib:377: > Documentation/devicetree/bindings/media/qcom,sc7280-venus.example.dt.yaml] > Error 1 > make[1]: *** Waiting for unfinished jobs.... > make: *** [Makefile:1414: dt_binding_check] Error 2 > > See https://patchwork.ozlabs.org/patch/1470241 > > This check can fail if there are any dependencies. The base for a patch > series is generally the most recent rc1. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit.
On 4/26/21 1:21 PM, Dikshita Agarwal wrote: > Add a schema description for the venus video encoder/decoder on the sc7280. > > Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> > --- > .../bindings/media/qcom,sc7280-venus.yaml | 158 +++++++++++++++++++++ > 1 file changed, 158 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > > diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > new file mode 100644 > index 0000000..a258d97 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml > @@ -0,0 +1,158 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > + > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/media/qcom,sc7280-venus.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Qualcomm Venus video encode and decode accelerators > + > +maintainers: > + - Stanimir Varbanov <stanimir.varbanov@linaro.org> > + > +description: | > + The Venus IP is a video encode and decode accelerator present Maybe we can mention that this is Venus Iris2 IP? > + on Qualcomm platforms > + > +properties: > + compatible: > + const: qcom,sc7280-venus > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + power-domains: > + minItems: 2 > + maxItems: 3 > + > + power-domain-names: > + minItems: 2 > + maxItems: 3 > + items: > + - const: venus > + - const: vcodec0 The sm8250 (the same Iris2 IP) has one more MX power domain, I guess we should have it here too? > + > + clocks: > + maxItems: 5 > + > + clock-names: > + items: > + - const: core_clk > + - const: video_cc_mvsc_ctl_axi > + - const: iface_clk > + - const: vcodec_clk > + - const: video_cc_mvs0_ctl_axi I'd suggest following names: core bus iface vcodec_core vcodec_bus > + > + iommus: > + maxItems: 2 > + > + memory-region: > + maxItems: 1 > + > + interconnects: > + maxItems: 2 > + > + interconnect-names: > + items: > + - const: cpu-cfg > + - const: video-mem > + > + video-decoder: > + type: object > + > + properties: > + compatible: > + const: venus-decoder > + > + required: > + - compatible > + > + additionalProperties: false > + > + video-encoder: > + type: object > + > + properties: > + compatible: > + const: venus-encoder > + > + required: > + - compatible > + > + additionalProperties: false > + > + video-firmware: > + type: object > + > + description: | > + Firmware subnode is needed when the platform does not > + have TrustZone. > + > + properties: > + iommus: > + maxItems: 1 > + > + required: > + - iommus > + > +required: > + - compatible > + - reg > + - interrupts > + - power-domains > + - power-domain-names > + - clocks > + - clock-names > + - iommus > + - memory-region > + - video-decoder > + - video-encoder > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/clock/qcom,videocc-sc7280.h> > + > + venus: video-codec@aa00000 { > + compatible = "qcom,sc7280-venus"; > + reg = <0x0aa00000 0xd0600>; > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; > + > + clocks = <&videocc VIDEO_CC_MVSC_CORE_CLK>, > + <&videocc VIDEO_CC_MVSC_CTL_AXI_CLK>, > + <&videocc VIDEO_CC_VENUS_AHB_CLK>, > + <&videocc VIDEO_CC_MVS0_CORE_CLK>, > + <&videocc VIDEO_CC_MVS0_AXI_CLK>; > + clock-names = "core_clk", "video_cc_mvsc_ctl_axi", > + "iface_clk", "vcodec_clk", > + "video_cc_mvs0_ctl_axi"; > + > + power-domains = <&videocc MVSC_GDSC>, > + <&videocc MVS0_GDSC>; > + power-domain-names = "venus", "vcodec0"; > + > + interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0> > + <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; > + interconnect-names = "cpu-cfg", "video-mem"; Do we have sc7280 interconnect binding somewhere? > + > + iommus = <&apps_smmu 0x2180 0x20>, > + <&apps_smmu 0x2184 0x20>; > + > + memory-region = <&video_mem>; > + > + video-decoder { > + compatible = "venus-decoder"; > + }; > + > + video-encoder { > + compatible = "venus-encoder"; > + }; > + > + video-firmware { > + iommus = <&apps_smmu 0x21a2 0x0>; > + }; > + }; >
Hi Matthias, On 4/27/21 12:30 AM, Matthias Kaehlcke wrote: > From a quick glance this looks extremely similar to the venus binding > for sc7180. Is there really a good reason for a separate binding? The Venus IP is different (newer) for sc7280 (Iris2 vs AR50), and I think it is clearer if we have separate yaml for it. > > On Mon, Apr 26, 2021 at 03:51:55PM +0530, Dikshita Agarwal wrote: >> Add a schema description for the venus video encoder/decoder on the sc7280. >> >> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> >> --- >> .../bindings/media/qcom,sc7280-venus.yaml | 158 +++++++++++++++++++++ >> 1 file changed, 158 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml >> >> diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml >> new file mode 100644 >> index 0000000..a258d97 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml >> @@ -0,0 +1,158 @@ >> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) >> + >> +%YAML 1.2 >> +--- >> +$id: "http://devicetree.org/schemas/media/qcom,sc7280-venus.yaml#" >> +$schema: "http://devicetree.org/meta-schemas/core.yaml#" >> + >> +title: Qualcomm Venus video encode and decode accelerators >> + >> +maintainers: >> + - Stanimir Varbanov <stanimir.varbanov@linaro.org> >> + >> +description: | >> + The Venus IP is a video encode and decode accelerator present >> + on Qualcomm platforms >> + >> +properties: >> + compatible: >> + const: qcom,sc7280-venus >> + >> + reg: >> + maxItems: 1 >> + >> + interrupts: >> + maxItems: 1 >> + >> + power-domains: >> + minItems: 2 >> + maxItems: 3 >> + >> + power-domain-names: >> + minItems: 2 >> + maxItems: 3 >> + items: >> + - const: venus >> + - const: vcodec0 >> + >> + clocks: >> + maxItems: 5 >> + >> + clock-names: >> + items: >> + - const: core_clk >> + - const: video_cc_mvsc_ctl_axi >> + - const: iface_clk >> + - const: vcodec_clk >> + - const: video_cc_mvs0_ctl_axi >> + >> + iommus: >> + maxItems: 2 >> + >> + memory-region: >> + maxItems: 1 >> + >> + interconnects: >> + maxItems: 2 >> + >> + interconnect-names: >> + items: >> + - const: cpu-cfg >> + - const: video-mem >> + >> + video-decoder: >> + type: object >> + >> + properties: >> + compatible: >> + const: venus-decoder >> + >> + required: >> + - compatible >> + >> + additionalProperties: false >> + >> + video-encoder: >> + type: object >> + >> + properties: >> + compatible: >> + const: venus-encoder >> + >> + required: >> + - compatible >> + >> + additionalProperties: false >> + >> + video-firmware: >> + type: object >> + >> + description: | >> + Firmware subnode is needed when the platform does not >> + have TrustZone. >> + >> + properties: >> + iommus: >> + maxItems: 1 >> + >> + required: >> + - iommus >> + >> +required: >> + - compatible >> + - reg >> + - interrupts >> + - power-domains >> + - power-domain-names >> + - clocks >> + - clock-names >> + - iommus >> + - memory-region >> + - video-decoder >> + - video-encoder >> + >> +additionalProperties: false >> + >> +examples: >> + - | >> + #include <dt-bindings/clock/qcom,videocc-sc7280.h> >> + >> + venus: video-codec@aa00000 { >> + compatible = "qcom,sc7280-venus"; >> + reg = <0x0aa00000 0xd0600>; >> + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; >> + >> + clocks = <&videocc VIDEO_CC_MVSC_CORE_CLK>, >> + <&videocc VIDEO_CC_MVSC_CTL_AXI_CLK>, >> + <&videocc VIDEO_CC_VENUS_AHB_CLK>, >> + <&videocc VIDEO_CC_MVS0_CORE_CLK>, >> + <&videocc VIDEO_CC_MVS0_AXI_CLK>; >> + clock-names = "core_clk", "video_cc_mvsc_ctl_axi", >> + "iface_clk", "vcodec_clk", >> + "video_cc_mvs0_ctl_axi"; >> + >> + power-domains = <&videocc MVSC_GDSC>, >> + <&videocc MVS0_GDSC>; >> + power-domain-names = "venus", "vcodec0"; >> + >> + interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0> >> + <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; >> + interconnect-names = "cpu-cfg", "video-mem"; >> + >> + iommus = <&apps_smmu 0x2180 0x20>, >> + <&apps_smmu 0x2184 0x20>; >> + >> + memory-region = <&video_mem>; >> + >> + video-decoder { >> + compatible = "venus-decoder"; >> + }; >> + >> + video-encoder { >> + compatible = "venus-encoder"; >> + }; >> + >> + video-firmware { >> + iommus = <&apps_smmu 0x21a2 0x0>; >> + }; >> + }; >> -- >> 2.7.4 >>
diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml new file mode 100644 index 0000000..a258d97 --- /dev/null +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml @@ -0,0 +1,158 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/media/qcom,sc7280-venus.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm Venus video encode and decode accelerators + +maintainers: + - Stanimir Varbanov <stanimir.varbanov@linaro.org> + +description: | + The Venus IP is a video encode and decode accelerator present + on Qualcomm platforms + +properties: + compatible: + const: qcom,sc7280-venus + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + minItems: 2 + maxItems: 3 + + power-domain-names: + minItems: 2 + maxItems: 3 + items: + - const: venus + - const: vcodec0 + + clocks: + maxItems: 5 + + clock-names: + items: + - const: core_clk + - const: video_cc_mvsc_ctl_axi + - const: iface_clk + - const: vcodec_clk + - const: video_cc_mvs0_ctl_axi + + iommus: + maxItems: 2 + + memory-region: + maxItems: 1 + + interconnects: + maxItems: 2 + + interconnect-names: + items: + - const: cpu-cfg + - const: video-mem + + video-decoder: + type: object + + properties: + compatible: + const: venus-decoder + + required: + - compatible + + additionalProperties: false + + video-encoder: + type: object + + properties: + compatible: + const: venus-encoder + + required: + - compatible + + additionalProperties: false + + video-firmware: + type: object + + description: | + Firmware subnode is needed when the platform does not + have TrustZone. + + properties: + iommus: + maxItems: 1 + + required: + - iommus + +required: + - compatible + - reg + - interrupts + - power-domains + - power-domain-names + - clocks + - clock-names + - iommus + - memory-region + - video-decoder + - video-encoder + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,videocc-sc7280.h> + + venus: video-codec@aa00000 { + compatible = "qcom,sc7280-venus"; + reg = <0x0aa00000 0xd0600>; + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + + clocks = <&videocc VIDEO_CC_MVSC_CORE_CLK>, + <&videocc VIDEO_CC_MVSC_CTL_AXI_CLK>, + <&videocc VIDEO_CC_VENUS_AHB_CLK>, + <&videocc VIDEO_CC_MVS0_CORE_CLK>, + <&videocc VIDEO_CC_MVS0_AXI_CLK>; + clock-names = "core_clk", "video_cc_mvsc_ctl_axi", + "iface_clk", "vcodec_clk", + "video_cc_mvs0_ctl_axi"; + + power-domains = <&videocc MVSC_GDSC>, + <&videocc MVS0_GDSC>; + power-domain-names = "venus", "vcodec0"; + + interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0> + <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; + interconnect-names = "cpu-cfg", "video-mem"; + + iommus = <&apps_smmu 0x2180 0x20>, + <&apps_smmu 0x2184 0x20>; + + memory-region = <&video_mem>; + + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + + video-firmware { + iommus = <&apps_smmu 0x21a2 0x0>; + }; + };
Add a schema description for the venus video encoder/decoder on the sc7280. Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> --- .../bindings/media/qcom,sc7280-venus.yaml | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml