Hi Dafna, Thanks for your suggestion, On Fri, 2021-10-29 at 13:49 +0200, Dafna Hirschfeld wrote: > > On 29.10.21 05:55, Yunfei Dong wrote: > > Decoder will use component framework to manage hardware, it is big > > difference with encoder. > > > > Reviewed-by: Rob Herring<robh@xxxxxxxxxx> > > Signed-off-by: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx> > > --- > > .../media/mediatek,vcodec-decoder.yaml | 176 > > +++++++++++++++++ > > .../media/mediatek,vcodec-encoder.yaml | 187 > > ++++++++++++++++++ > > .../bindings/media/mediatek-vcodec.txt | 131 ------------ > > 3 files changed, 363 insertions(+), 131 deletions(-) > > create mode 100644 > > Documentation/devicetree/bindings/media/mediatek,vcodec- > > decoder.yaml > > create mode 100644 > > Documentation/devicetree/bindings/media/mediatek,vcodec- > > encoder.yaml > > delete mode 100644 > > Documentation/devicetree/bindings/media/mediatek-vcodec.txt > > > > diff --git > > a/Documentation/devicetree/bindings/media/mediatek,vcodec- > > decoder.yaml > > b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > decoder.yaml > > new file mode 100644 > > index 000000000000..5de37065fbce > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > decoder.yaml > > @@ -0,0 +1,176 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > + > > +%YAML 1.2 > > +--- > > +$id: > > http://devicetree.org/schemas/media/mediatek,vcodec-decoder.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Mediatek Video Decode Accelerator With Component > > + > > +maintainers: > > + - Yunfei Dong <yunfei.dong@xxxxxxxxxxxx> > > + > > +description: |+ > > + Mediatek Video Decode is the video decode hardware present in > > Mediatek > > + SoCs which supports high resolution decoding functionalities. > > + > > +properties: > > + compatible: > > + enum: > > + - mediatek,mt8173-vcodec-dec > > + - mediatek,mt8183-vcodec-dec > > + > > + reg: > > + maxItems: 12 > > + > > + interrupts: > > + maxItems: 1 > > + > > + clocks: > > + maxItems: 8 > > + > > + clock-names: > > + items: > > + - const: vcodecpll > > + - const: univpll_d2 > > + - const: clk_cci400_sel > > + - const: vdec_sel > > + - const: vdecpll > > + - const: vencpll > > + - const: venc_lt_sel > > + - const: vdec_bus_clk_src > > + > > + assigned-clocks: true > > + > > + assigned-clock-parents: true > > + > > + assigned-clock-rates: true > > + > > + power-domains: > > + maxItems: 1 > > + > > + iommus: > > + minItems: 1 > > + maxItems: 32 > > + description: | > > + List of the hardware port in respective IOMMU block for > > current Socs. > > + Refer to bindings/iommu/mediatek,iommu.yaml. > > + > > + dma-ranges: > > + maxItems: 1 > > + description: | > > + Describes the physical address space of IOMMU maps to > > memory. > > + > > + mediatek,larb: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: | > > + Must contain the local arbiters in the current Socs. > > + > > + mediatek,vpu: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: > > + Describes point to vpu. > > + > > + mediatek,scp: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: > > + Describes point to scp. > > + > > +required: > > + - compatible > > + - reg > > + - interrupts > > + - clocks > > + - clock-names > > + - iommus > > + - assigned-clocks > > + - assigned-clock-parents > > + > > +allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - mediatek,mt8183-vcodec-dec > > + > > + then: > > + required: > > + - mediatek,scp > > + > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - mediatek,mt8173-vcodec-dec > > + > > + then: > > + required: > > + - mediatek,vpu > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + #include <dt-bindings/clock/mt8173-clk.h> > > + #include <dt-bindings/memory/mt8173-larb-port.h> > > + #include <dt-bindings/interrupt-controller/irq.h> > > + #include <dt-bindings/power/mt8173-power.h> > > + > > + vcodec_dec: vcodec@16000000 { > > + compatible = "mediatek,mt8173-vcodec-dec"; > > + reg = <0x16000000 0x100>, /*VDEC_SYS*/ > > + <0x16020000 0x1000>, /*VDEC_MISC*/ > > + <0x16021000 0x800>, /*VDEC_LD*/ > > + <0x16021800 0x800>, /*VDEC_TOP*/ > > + <0x16022000 0x1000>, /*VDEC_CM*/ > > + <0x16023000 0x1000>, /*VDEC_AD*/ > > + <0x16024000 0x1000>, /*VDEC_AV*/ > > + <0x16025000 0x1000>, /*VDEC_PP*/ > > + <0x16026800 0x800>, /*VP8_VD*/ > > + <0x16027000 0x800>, /*VP6_VD*/ > > + <0x16027800 0x800>, /*VP8_VL*/ > > + <0x16028400 0x400>; /*VP9_VD*/ > > + interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_LOW>; > > + mediatek,larb = <&larb1>; > > + iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_PP_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_PRED_RD_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_PRED_WR_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_UFO_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_VLD_EXT>, > > + <&iommu M4U_PORT_HW_VDEC_VLD2_EXT>; > > + mediatek,vpu = <&vpu>; > > + power-domains = <&scpsys MT8173_POWER_DOMAIN_VDEC>; > > + clocks = <&apmixedsys CLK_APMIXED_VCODECPLL>, > > + <&topckgen CLK_TOP_UNIVPLL_D2>, > > + <&topckgen CLK_TOP_CCI400_SEL>, > > + <&topckgen CLK_TOP_VDEC_SEL>, > > + <&topckgen CLK_TOP_VCODECPLL>, > > + <&apmixedsys CLK_APMIXED_VENCPLL>, > > + <&topckgen CLK_TOP_VENC_LT_SEL>, > > + <&topckgen CLK_TOP_VCODECPLL_370P5>; > > + clock-names = "vcodecpll", > > + "univpll_d2", > > + "clk_cci400_sel", > > + "vdec_sel", > > + "vdecpll", > > + "vencpll", > > + "venc_lt_sel", > > + "vdec_bus_clk_src"; > > + assigned-clocks = <&topckgen CLK_TOP_VENC_LT_SEL>, > > + <&topckgen CLK_TOP_CCI400_SEL>, > > + <&topckgen CLK_TOP_VDEC_SEL>, > > + <&apmixedsys CLK_APMIXED_VCODECPLL>, > > + <&apmixedsys CLK_APMIXED_VENCPLL>; > > + assigned-clock-parents = <&topckgen > > CLK_TOP_VCODECPLL_370P5>, > > + <&topckgen CLK_TOP_UNIVPLL_D2>, > > + <&topckgen CLK_TOP_VCODECPLL>; > > + assigned-clock-rates = <0>, <0>, <0>, <1482000000>, > > <800000000>; > > + }; > > diff --git > > a/Documentation/devicetree/bindings/media/mediatek,vcodec- > > encoder.yaml > > b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > encoder.yaml > > new file mode 100644 > > index 000000000000..94d67d40548c > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > encoder.yaml > > @@ -0,0 +1,187 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > + > > +%YAML 1.2 > > +--- > > +$id: > > http://devicetree.org/schemas/media/mediatek,vcodec-encoder.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Mediatek Video Encode Accelerator With Component > > Fix in v9. > why is it "With Component" ? > I guess it should be removed > > Thanks, > Dafna > Thanks Yunfei Dong > > + > > +maintainers: > > + - Yunfei Dong <yunfei.dong@xxxxxxxxxxxx> > > + > > +description: |+ > > + Mediatek Video Encode is the video encode hardware present in > > Mediatek > > + SoCs which supports high resolution encoding functionalities. > > + > > +properties: > > + compatible: > > + enum: > > + - mediatek,mt8173-vcodec-enc-vp8 > > + - mediatek,mt8173-vcodec-enc > > + - mediatek,mt8183-vcodec-enc > > + - mediatek,mt8192-vcodec-enc > > + - mediatek,mt8195-vcodec-enc > > + > > + reg: > > + maxItems: 1 > > + > > + interrupts: > > + maxItems: 1 > > + > > + clocks: > > + minItems: 1 > > + maxItems: 5 > > + > > + clock-names: > > + minItems: 1 > > + maxItems: 5 > > + > > + assigned-clocks: true > > + > > + assigned-clock-parents: true > > + > > + iommus: > > + minItems: 1 > > + maxItems: 32 > > + description: | > > + List of the hardware port in respective IOMMU block for > > current Socs. > > + Refer to bindings/iommu/mediatek,iommu.yaml. > > + > > + dma-ranges: > > + maxItems: 1 > > + description: | > > + Describes the physical address space of IOMMU maps to > > memory. > > + > > + mediatek,larb: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: | > > + Must contain the local arbiters in the current Socs. > > + > > + mediatek,vpu: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: > > + Describes point to vpu. > > + > > + mediatek,scp: > > + $ref: /schemas/types.yaml#/definitions/phandle > > + maxItems: 1 > > + description: > > + Describes point to scp. > > + > > +required: > > + - compatible > > + - reg > > + - interrupts > > + - clocks > > + - clock-names > > + - iommus > > + - assigned-clocks > > + - assigned-clock-parents > > + > > +allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - mediatek,mt8183-vcodec-enc > > + - mediatek,mt8192-vcodec-enc > > + > > + then: > > + required: > > + - mediatek,scp > > + > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - mediatek,mt8173-vcodec-enc-vp8 > > + - mediatek,mt8173-vcodec-enc > > + > > + then: > > + required: > > + - mediatek,vpu > > + > > + - if: > > + properties: > > + compatible: > > + enum: > > + - mediatek,mt8173-vcodec-enc > > + - mediatek,mt8192-vcodec-enc > > + - mediatek,mt8173-vcodec-enc > > + > > + then: > > + properties: > > + clock: > > + items: > > + minItems: 1 > > + maxItems: 1 > > + clock-names: > > + items: > > + - const: venc_sel > > + else: # for vp8 hw decoder > > + properties: > > + clock: > > + items: > > + minItems: 1 > > + maxItems: 1 > > + clock-names: > > + items: > > + - const: venc_lt_sel > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + #include <dt-bindings/clock/mt8173-clk.h> > > + #include <dt-bindings/memory/mt8173-larb-port.h> > > + #include <dt-bindings/interrupt-controller/irq.h> > > + > > + vcodec_enc_avc: vcodec@18002000 { > > + compatible = "mediatek,mt8173-vcodec-enc"; > > + reg = <0x18002000 0x1000>; > > + interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>; > > + iommus = <&iommu M4U_PORT_VENC_RCPU>, > > + <&iommu M4U_PORT_VENC_REC>, > > + <&iommu M4U_PORT_VENC_BSDMA>, > > + <&iommu M4U_PORT_VENC_SV_COMV>, > > + <&iommu M4U_PORT_VENC_RD_COMV>, > > + <&iommu M4U_PORT_VENC_CUR_LUMA>, > > + <&iommu M4U_PORT_VENC_CUR_CHROMA>, > > + <&iommu M4U_PORT_VENC_REF_LUMA>, > > + <&iommu M4U_PORT_VENC_REF_CHROMA>, > > + <&iommu M4U_PORT_VENC_NBM_RDMA>, > > + <&iommu M4U_PORT_VENC_NBM_WDMA>; > > + mediatek,larb = <&larb3>; > > + mediatek,vpu = <&vpu>; > > + clocks = <&topckgen CLK_TOP_VENC_SEL>; > > + clock-names = "venc_sel"; > > + assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>; > > + assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>; > > + }; > > + > > + vcodec_enc_vp8: vcodec@19002000 { > > + compatible = "mediatek,mt8173-vcodec-enc-vp8"; > > + reg = <0x19002000 0x1000>; /* VENC_LT_SYS */ > > + interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>; > > + iommus = <&iommu M4U_PORT_VENC_RCPU_SET2>, > > + <&iommu M4U_PORT_VENC_REC_FRM_SET2>, > > + <&iommu M4U_PORT_VENC_BSDMA_SET2>, > > + <&iommu M4U_PORT_VENC_SV_COMA_SET2>, > > + <&iommu M4U_PORT_VENC_RD_COMA_SET2>, > > + <&iommu M4U_PORT_VENC_CUR_LUMA_SET2>, > > + <&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>, > > + <&iommu M4U_PORT_VENC_REF_LUMA_SET2>, > > + <&iommu M4U_PORT_VENC_REC_CHROMA_SET2>; > > + mediatek,larb = <&larb5>; > > + mediatek,vpu = <&vpu>; > > + clocks = <&topckgen CLK_TOP_VENC_LT_SEL>; > > + clock-names = "venc_lt_sel"; > > + assigned-clocks = <&topckgen CLK_TOP_VENC_LT_SEL>; > > + assigned-clock-parents = <&topckgen > > CLK_TOP_VCODECPLL_370P5>; > > + }; > > diff --git a/Documentation/devicetree/bindings/media/mediatek- > > vcodec.txt b/Documentation/devicetree/bindings/media/mediatek- > > vcodec.txt > > deleted file mode 100644 > > index 665a9508708e..000000000000 > > --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt > > +++ /dev/null > > @@ -1,131 +0,0 @@ > > -Mediatek Video Codec > > - > > -Mediatek Video Codec is the video codec hw present in Mediatek > > SoCs which > > -supports high resolution encoding and decoding functionalities. > > - > > -Required properties: > > -- compatible : must be one of the following string: > > - "mediatek,mt8173-vcodec-enc-vp8" for mt8173 vp8 encoder. > > - "mediatek,mt8173-vcodec-enc" for mt8173 avc encoder. > > - "mediatek,mt8183-vcodec-enc" for MT8183 encoder. > > - "mediatek,mt8173-vcodec-dec" for MT8173 decoder. > > - "mediatek,mt8192-vcodec-enc" for MT8192 encoder. > > - "mediatek,mt8183-vcodec-dec" for MT8183 decoder. > > - "mediatek,mt8195-vcodec-enc" for MT8195 encoder. > > -- reg : Physical base address of the video codec registers and > > length of > > - memory mapped region. > > -- interrupts : interrupt number to the cpu. > > -- mediatek,larb : must contain the local arbiters in the current > > Socs. > > -- clocks : list of clock specifiers, corresponding to entries in > > - the clock-names property. > > -- clock-names: avc encoder must contain "venc_sel", vp8 encoder > > must > > - contain "venc_lt_sel", decoder must contain "vcodecpll", > > "univpll_d2", > > - "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll", > > "venc_lt_sel", > > - "vdec_bus_clk_src". > > -- iommus : should point to the respective IOMMU block with master > > port as > > - argument, see > > Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml > > - for details. > > -- dma-ranges : describes the dma address range space that the > > codec hw access. > > -One of the two following nodes: > > -- mediatek,vpu : the node of the video processor unit, if using > > VPU. > > -- mediatek,scp : the node of the SCP unit, if using SCP. > > - > > - > > -Example: > > - > > -vcodec_dec: vcodec@16000000 { > > - compatible = "mediatek,mt8173-vcodec-dec"; > > - reg = <0 0x16000000 0 0x100>, /*VDEC_SYS*/ > > - <0 0x16020000 0 0x1000>, /*VDEC_MISC*/ > > - <0 0x16021000 0 0x800>, /*VDEC_LD*/ > > - <0 0x16021800 0 0x800>, /*VDEC_TOP*/ > > - <0 0x16022000 0 0x1000>, /*VDEC_CM*/ > > - <0 0x16023000 0 0x1000>, /*VDEC_AD*/ > > - <0 0x16024000 0 0x1000>, /*VDEC_AV*/ > > - <0 0x16025000 0 0x1000>, /*VDEC_PP*/ > > - <0 0x16026800 0 0x800>, /*VP8_VD*/ > > - <0 0x16027000 0 0x800>, /*VP6_VD*/ > > - <0 0x16027800 0 0x800>, /*VP8_VL*/ > > - <0 0x16028400 0 0x400>; /*VP9_VD*/ > > - interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_LOW>; > > - mediatek,larb = <&larb1>; > > - iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_PP_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_PRED_RD_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_PRED_WR_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_UFO_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_VLD_EXT>, > > - <&iommu M4U_PORT_HW_VDEC_VLD2_EXT>; > > - mediatek,vpu = <&vpu>; > > - power-domains = <&scpsys MT8173_POWER_DOMAIN_VDEC>; > > - clocks = <&apmixedsys CLK_APMIXED_VCODECPLL>, > > - <&topckgen CLK_TOP_UNIVPLL_D2>, > > - <&topckgen CLK_TOP_CCI400_SEL>, > > - <&topckgen CLK_TOP_VDEC_SEL>, > > - <&topckgen CLK_TOP_VCODECPLL>, > > - <&apmixedsys CLK_APMIXED_VENCPLL>, > > - <&topckgen CLK_TOP_VENC_LT_SEL>, > > - <&topckgen CLK_TOP_VCODECPLL_370P5>; > > - clock-names = "vcodecpll", > > - "univpll_d2", > > - "clk_cci400_sel", > > - "vdec_sel", > > - "vdecpll", > > - "vencpll", > > - "venc_lt_sel", > > - "vdec_bus_clk_src"; > > - assigned-clocks = <&topckgen CLK_TOP_VENC_LT_SEL>, > > - <&topckgen CLK_TOP_CCI400_SEL>, > > - <&topckgen CLK_TOP_VDEC_SEL>, > > - <&apmixedsys CLK_APMIXED_VCODECPLL>, > > - <&apmixedsys CLK_APMIXED_VENCPLL>; > > - assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL_370P5>, > > - <&topckgen CLK_TOP_UNIVPLL_D2>, > > - <&topckgen CLK_TOP_VCODECPLL>; > > - assigned-clock-rates = <0>, <0>, <0>, <1482000000>, > > <800000000>; > > - }; > > - > > -vcodec_enc_avc: vcodec@18002000 { > > - compatible = "mediatek,mt8173-vcodec-enc"; > > - reg = <0 0x18002000 0 0x1000>; > > - interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>; > > - iommus = <&iommu M4U_PORT_VENC_RCPU>, > > - <&iommu M4U_PORT_VENC_REC>, > > - <&iommu M4U_PORT_VENC_BSDMA>, > > - <&iommu M4U_PORT_VENC_SV_COMV>, > > - <&iommu M4U_PORT_VENC_RD_COMV>, > > - <&iommu M4U_PORT_VENC_CUR_LUMA>, > > - <&iommu M4U_PORT_VENC_CUR_CHROMA>, > > - <&iommu M4U_PORT_VENC_REF_LUMA>, > > - <&iommu M4U_PORT_VENC_REF_CHROMA>, > > - <&iommu M4U_PORT_VENC_NBM_RDMA>, > > - <&iommu M4U_PORT_VENC_NBM_WDMA>; > > - mediatek,larb = <&larb3>; > > - mediatek,vpu = <&vpu>; > > - clocks = <&topckgen CLK_TOP_VENC_SEL>; > > - clock-names = "venc_sel"; > > - assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>; > > - assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>; > > - }; > > - > > -vcodec_enc_vp8: vcodec@19002000 { > > - compatible = "mediatek,mt8173-vcodec-enc-vp8"; > > - reg = <0 0x19002000 0 0x1000>; /* VENC_LT_SYS */ > > - interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>; > > - iommus = <&iommu M4U_PORT_VENC_RCPU_SET2>, > > - <&iommu M4U_PORT_VENC_REC_FRM_SET2>, > > - <&iommu M4U_PORT_VENC_BSDMA_SET2>, > > - <&iommu M4U_PORT_VENC_SV_COMA_SET2>, > > - <&iommu M4U_PORT_VENC_RD_COMA_SET2>, > > - <&iommu M4U_PORT_VENC_CUR_LUMA_SET2>, > > - <&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>, > > - <&iommu M4U_PORT_VENC_REF_LUMA_SET2>, > > - <&iommu M4U_PORT_VENC_REC_CHROMA_SET2>; > > - mediatek,larb = <&larb5>; > > - mediatek,vpu = <&vpu>; > > - clocks = <&topckgen CLK_TOP_VENC_LT_SEL>; > > - clock-names = "venc_lt_sel"; > > - assigned-clocks = <&topckgen CLK_TOP_VENC_LT_SEL>; > > - assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL_370P5>; > > - }; > >
