diff mbox series

[1/3] dt-bindings: media: mtk-vcodec: Separating mtk vcodec encoder node

Message ID 20210121061804.26423-1-irui.wang@mediatek.com
State Superseded
Headers show
Series [1/3] dt-bindings: media: mtk-vcodec: Separating mtk vcodec encoder node | expand

Commit Message

Irui Wang Jan. 21, 2021, 6:18 a.m. UTC
Updates binding document since the avc and vp8 hardware encoder in
MT8173 are now separated. Separate "mediatek,mt8173-vcodec-enc" to
"mediatek,mt8173-vcodec-vp8-enc" and "mediatek,mt8173-vcodec-avc-enc".

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>
Signed-off-by: Irui Wang <irui.wang@mediatek.com>

---
 .../bindings/media/mediatek-vcodec.txt        | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

Comments

Tiffany Lin Jan. 26, 2021, 8:42 a.m. UTC | #1
On Thu, 2021-01-21 at 14:18 +0800, Irui Wang wrote:
> Updates binding document since the avc and vp8 hardware encoder in

> MT8173 are now separated. Separate "mediatek,mt8173-vcodec-enc" to

> "mediatek,mt8173-vcodec-vp8-enc" and "mediatek,mt8173-vcodec-avc-enc".

> 

> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>

> Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>

> Signed-off-by: Irui Wang <irui.wang@mediatek.com>

> 

Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>


> ---

>  .../bindings/media/mediatek-vcodec.txt        | 58 ++++++++++---------

>  1 file changed, 31 insertions(+), 27 deletions(-)

> 

> diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> index 8217424fd4bd..f85276e629bf 100644

> --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> @@ -4,7 +4,9 @@ Mediatek Video Codec is the video codec hw present in Mediatek SoCs which

>  supports high resolution encoding and decoding functionalities.

>  

>  Required properties:

> -- compatible : "mediatek,mt8173-vcodec-enc" for MT8173 encoder

> +- compatible : must be one of the following string:

> +  "mediatek,mt8173-vcodec-vp8-enc" for mt8173 vp8 encoder.

> +  "mediatek,mt8173-vcodec-avc-enc" for mt8173 avc encoder.

>    "mediatek,mt8183-vcodec-enc" for MT8183 encoder.

>    "mediatek,mt8173-vcodec-dec" for MT8173 decoder.

>  - reg : Physical base address of the video codec registers and length of

> @@ -13,10 +15,11 @@ Required properties:

>  - 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: encoder must contain "venc_sel_src", "venc_sel",,

> -  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",

> -  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",

> -  "venc_lt_sel", "vdec_bus_clk_src".

> +- clock-names:

> +   avc venc must contain "venc_sel";

> +   vp8 venc 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.txt

>    for details.

> @@ -80,14 +83,10 @@ vcodec_dec: vcodec@16000000 {

>      assigned-clock-rates = <0>, <0>, <0>, <1482000000>, <800000000>;

>    };

>  

> -  vcodec_enc: vcodec@18002000 {

> -    compatible = "mediatek,mt8173-vcodec-enc";

> -    reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/

> -          <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/

> -    interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>,

> -		 <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>;

> -    mediatek,larb = <&larb3>,

> -		    <&larb5>;

> +vcodec_enc: vcodec@18002000 {

> +    compatible = "mediatek,mt8173-vcodec-avc-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>,

> @@ -98,8 +97,20 @@ vcodec_dec: vcodec@16000000 {

>               <&iommu M4U_PORT_VENC_REF_LUMA>,

>               <&iommu M4U_PORT_VENC_REF_CHROMA>,

>               <&iommu M4U_PORT_VENC_NBM_RDMA>,

> -             <&iommu M4U_PORT_VENC_NBM_WDMA>,

> -             <&iommu M4U_PORT_VENC_RCPU_SET2>,

> +             <&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_lt: vcodec@19002000 {

> +    compatible = "mediatek,mt8173-vcodec-vp8-enc";

> +    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>,

> @@ -108,17 +119,10 @@ vcodec_dec: vcodec@16000000 {

>               <&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_VENCPLL_D2>,

> -             <&topckgen CLK_TOP_VENC_SEL>,

> -             <&topckgen CLK_TOP_UNIVPLL1_D2>,

> -             <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    clock-names = "venc_sel_src",

> -                  "venc_sel",

> -                  "venc_lt_sel_src",

> -                  "venc_lt_sel";

> -    assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,

> -                      <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,

> -                             <&topckgen CLK_TOP_UNIVPLL1_D2>;

> +    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>;

>    };
Alexandre Courbot Feb. 3, 2021, 10:44 a.m. UTC | #2
On Thu, Jan 21, 2021 at 3:18 PM Irui Wang <irui.wang@mediatek.com> wrote:
>

> Updates binding document since the avc and vp8 hardware encoder in

> MT8173 are now separated. Separate "mediatek,mt8173-vcodec-enc" to

> "mediatek,mt8173-vcodec-vp8-enc" and "mediatek,mt8173-vcodec-avc-enc".

>

> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>

> Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>

> Signed-off-by: Irui Wang <irui.wang@mediatek.com>

>

> ---

>  .../bindings/media/mediatek-vcodec.txt        | 58 ++++++++++---------

>  1 file changed, 31 insertions(+), 27 deletions(-)

>

> diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> index 8217424fd4bd..f85276e629bf 100644

> --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> @@ -4,7 +4,9 @@ Mediatek Video Codec is the video codec hw present in Mediatek SoCs which

>  supports high resolution encoding and decoding functionalities.

>

>  Required properties:

> -- compatible : "mediatek,mt8173-vcodec-enc" for MT8173 encoder

> +- compatible : must be one of the following string:

> +  "mediatek,mt8173-vcodec-vp8-enc" for mt8173 vp8 encoder.

> +  "mediatek,mt8173-vcodec-avc-enc" for mt8173 avc encoder.


IMHO "mediatek,mt8173-vcodec-enc-vp8" and
"mediatek,mt8173-vcodec-enc-avc" would be more logical. Also to keep a
bit of backward compatibility, shall we also allow
"mediatek,mt8173-vcodec-enc" to be an alias for
"mediatek,mt8173-vcodec-enc-avc"? The line above would become

  "mediatek,mt8173-vcodec-enc-avc" or "mediatek,mt8173-vcodec-enc" for
mt8173 avc encoder.

>    "mediatek,mt8183-vcodec-enc" for MT8183 encoder.

>    "mediatek,mt8173-vcodec-dec" for MT8173 decoder.

>  - reg : Physical base address of the video codec registers and length of

> @@ -13,10 +15,11 @@ Required properties:

>  - 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: encoder must contain "venc_sel_src", "venc_sel",,

> -  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",

> -  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",

> -  "venc_lt_sel", "vdec_bus_clk_src".

> +- clock-names:

> +   avc venc must contain "venc_sel";

> +   vp8 venc must contain "venc_lt_sel";


Can't we use "venc_sel" for both avc and vp8, since they are different
nodes now? That way we can just say

  encoder must contain "venc_sel"

which is clearer and also simpler on the code side.

> +   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.txt

>    for details.

> @@ -80,14 +83,10 @@ vcodec_dec: vcodec@16000000 {

>      assigned-clock-rates = <0>, <0>, <0>, <1482000000>, <800000000>;

>    };

>

> -  vcodec_enc: vcodec@18002000 {

> -    compatible = "mediatek,mt8173-vcodec-enc";

> -    reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/

> -          <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/

> -    interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>,

> -                <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>;

> -    mediatek,larb = <&larb3>,

> -                   <&larb5>;

> +vcodec_enc: vcodec@18002000 {


Let's use vcodec_enc_avc as a label?

> +    compatible = "mediatek,mt8173-vcodec-avc-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>,

> @@ -98,8 +97,20 @@ vcodec_dec: vcodec@16000000 {

>               <&iommu M4U_PORT_VENC_REF_LUMA>,

>               <&iommu M4U_PORT_VENC_REF_CHROMA>,

>               <&iommu M4U_PORT_VENC_NBM_RDMA>,

> -             <&iommu M4U_PORT_VENC_NBM_WDMA>,

> -             <&iommu M4U_PORT_VENC_RCPU_SET2>,

> +             <&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_lt: vcodec@19002000 {


And here the label should probably be "vcodec_enc_vp8" for consistency.



> +    compatible = "mediatek,mt8173-vcodec-vp8-enc";

> +    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>,

> @@ -108,17 +119,10 @@ vcodec_dec: vcodec@16000000 {

>               <&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_VENCPLL_D2>,

> -             <&topckgen CLK_TOP_VENC_SEL>,

> -             <&topckgen CLK_TOP_UNIVPLL1_D2>,

> -             <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    clock-names = "venc_sel_src",

> -                  "venc_sel",

> -                  "venc_lt_sel_src",

> -                  "venc_lt_sel";

> -    assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,

> -                      <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,

> -                             <&topckgen CLK_TOP_UNIVPLL1_D2>;

> +    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>;

>    };

> --

> 2.18.0

>
Rob Herring (Arm) Feb. 9, 2021, 3:53 p.m. UTC | #3
On Thu, Jan 21, 2021 at 02:18:02PM +0800, Irui Wang wrote:
> Updates binding document since the avc and vp8 hardware encoder in

> MT8173 are now separated. Separate "mediatek,mt8173-vcodec-enc" to

> "mediatek,mt8173-vcodec-vp8-enc" and "mediatek,mt8173-vcodec-avc-enc".


This is not a compatible change. You need to detail that and why that's 
okay (assuming it is).

> 

> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>

> Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>

> Signed-off-by: Irui Wang <irui.wang@mediatek.com>

> 

> ---

>  .../bindings/media/mediatek-vcodec.txt        | 58 ++++++++++---------

>  1 file changed, 31 insertions(+), 27 deletions(-)

> 

> diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> index 8217424fd4bd..f85276e629bf 100644

> --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> @@ -4,7 +4,9 @@ Mediatek Video Codec is the video codec hw present in Mediatek SoCs which

>  supports high resolution encoding and decoding functionalities.

>  

>  Required properties:

> -- compatible : "mediatek,mt8173-vcodec-enc" for MT8173 encoder

> +- compatible : must be one of the following string:

> +  "mediatek,mt8173-vcodec-vp8-enc" for mt8173 vp8 encoder.

> +  "mediatek,mt8173-vcodec-avc-enc" for mt8173 avc encoder.

>    "mediatek,mt8183-vcodec-enc" for MT8183 encoder.

>    "mediatek,mt8173-vcodec-dec" for MT8173 decoder.

>  - reg : Physical base address of the video codec registers and length of

> @@ -13,10 +15,11 @@ Required properties:

>  - 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: encoder must contain "venc_sel_src", "venc_sel",,

> -  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",

> -  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",

> -  "venc_lt_sel", "vdec_bus_clk_src".

> +- clock-names:

> +   avc venc must contain "venc_sel";

> +   vp8 venc 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.txt

>    for details.

> @@ -80,14 +83,10 @@ vcodec_dec: vcodec@16000000 {

>      assigned-clock-rates = <0>, <0>, <0>, <1482000000>, <800000000>;

>    };

>  

> -  vcodec_enc: vcodec@18002000 {

> -    compatible = "mediatek,mt8173-vcodec-enc";

> -    reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/

> -          <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/

> -    interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>,

> -		 <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>;

> -    mediatek,larb = <&larb3>,

> -		    <&larb5>;

> +vcodec_enc: vcodec@18002000 {

> +    compatible = "mediatek,mt8173-vcodec-avc-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>,

> @@ -98,8 +97,20 @@ vcodec_dec: vcodec@16000000 {

>               <&iommu M4U_PORT_VENC_REF_LUMA>,

>               <&iommu M4U_PORT_VENC_REF_CHROMA>,

>               <&iommu M4U_PORT_VENC_NBM_RDMA>,

> -             <&iommu M4U_PORT_VENC_NBM_WDMA>,

> -             <&iommu M4U_PORT_VENC_RCPU_SET2>,

> +             <&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_lt: vcodec@19002000 {

> +    compatible = "mediatek,mt8173-vcodec-vp8-enc";

> +    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>,

> @@ -108,17 +119,10 @@ vcodec_dec: vcodec@16000000 {

>               <&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_VENCPLL_D2>,

> -             <&topckgen CLK_TOP_VENC_SEL>,

> -             <&topckgen CLK_TOP_UNIVPLL1_D2>,

> -             <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    clock-names = "venc_sel_src",

> -                  "venc_sel",

> -                  "venc_lt_sel_src",

> -                  "venc_lt_sel";

> -    assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,

> -                      <&topckgen CLK_TOP_VENC_LT_SEL>;

> -    assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,

> -                             <&topckgen CLK_TOP_UNIVPLL1_D2>;

> +    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>;

>    };

> -- 

> 2.18.0

>
Irui Wang Feb. 20, 2021, 6:33 a.m. UTC | #4
On Tue, 2021-02-09 at 09:53 -0600, Rob Herring wrote:
> On Thu, Jan 21, 2021 at 02:18:02PM +0800, Irui Wang wrote:

> > Updates binding document since the avc and vp8 hardware encoder in

> > MT8173 are now separated. Separate "mediatek,mt8173-vcodec-enc" to

> > "mediatek,mt8173-vcodec-vp8-enc" and "mediatek,mt8173-vcodec-avc-enc".

> 

> This is not a compatible change. You need to detail that and why that's 

> okay (assuming it is).

> 

this patch separates the two devices, it's a preparing patch for adding
device_link between the larbs and venc-device. It's mainly for fixing
the problem:
https://lkml.org/lkml/2019/9/3/316

> > 

> > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>

> > Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>

> > Signed-off-by: Irui Wang <irui.wang@mediatek.com>

> > 

> > ---

> >  .../bindings/media/mediatek-vcodec.txt        | 58 ++++++++++---------

> >  1 file changed, 31 insertions(+), 27 deletions(-)

> > 

> > diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> > index 8217424fd4bd..f85276e629bf 100644

> > --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> > +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt

> > @@ -4,7 +4,9 @@ Mediatek Video Codec is the video codec hw present in Mediatek SoCs which

> >  supports high resolution encoding and decoding functionalities.

> >  

> >  Required properties:

> > -- compatible : "mediatek,mt8173-vcodec-enc" for MT8173 encoder

> > +- compatible : must be one of the following string:

> > +  "mediatek,mt8173-vcodec-vp8-enc" for mt8173 vp8 encoder.

> > +  "mediatek,mt8173-vcodec-avc-enc" for mt8173 avc encoder.

> >    "mediatek,mt8183-vcodec-enc" for MT8183 encoder.

> >    "mediatek,mt8173-vcodec-dec" for MT8173 decoder.

> >  - reg : Physical base address of the video codec registers and length of

> > @@ -13,10 +15,11 @@ Required properties:

> >  - 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: encoder must contain "venc_sel_src", "venc_sel",,

> > -  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",

> > -  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",

> > -  "venc_lt_sel", "vdec_bus_clk_src".

> > +- clock-names:

> > +   avc venc must contain "venc_sel";

> > +   vp8 venc 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.txt

> >    for details.

> > @@ -80,14 +83,10 @@ vcodec_dec: vcodec@16000000 {

> >      assigned-clock-rates = <0>, <0>, <0>, <1482000000>, <800000000>;

> >    };

> >  

> > -  vcodec_enc: vcodec@18002000 {

> > -    compatible = "mediatek,mt8173-vcodec-enc";

> > -    reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/

> > -          <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/

> > -    interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>,

> > -		 <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>;

> > -    mediatek,larb = <&larb3>,

> > -		    <&larb5>;

> > +vcodec_enc: vcodec@18002000 {

> > +    compatible = "mediatek,mt8173-vcodec-avc-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>,

> > @@ -98,8 +97,20 @@ vcodec_dec: vcodec@16000000 {

> >               <&iommu M4U_PORT_VENC_REF_LUMA>,

> >               <&iommu M4U_PORT_VENC_REF_CHROMA>,

> >               <&iommu M4U_PORT_VENC_NBM_RDMA>,

> > -             <&iommu M4U_PORT_VENC_NBM_WDMA>,

> > -             <&iommu M4U_PORT_VENC_RCPU_SET2>,

> > +             <&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_lt: vcodec@19002000 {

> > +    compatible = "mediatek,mt8173-vcodec-vp8-enc";

> > +    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>,

> > @@ -108,17 +119,10 @@ vcodec_dec: vcodec@16000000 {

> >               <&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_VENCPLL_D2>,

> > -             <&topckgen CLK_TOP_VENC_SEL>,

> > -             <&topckgen CLK_TOP_UNIVPLL1_D2>,

> > -             <&topckgen CLK_TOP_VENC_LT_SEL>;

> > -    clock-names = "venc_sel_src",

> > -                  "venc_sel",

> > -                  "venc_lt_sel_src",

> > -                  "venc_lt_sel";

> > -    assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,

> > -                      <&topckgen CLK_TOP_VENC_LT_SEL>;

> > -    assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,

> > -                             <&topckgen CLK_TOP_UNIVPLL1_D2>;

> > +    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>;

> >    };

> > -- 

> > 2.18.0

> >
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
index 8217424fd4bd..f85276e629bf 100644
--- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
@@ -4,7 +4,9 @@  Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
 supports high resolution encoding and decoding functionalities.
 
 Required properties:
-- compatible : "mediatek,mt8173-vcodec-enc" for MT8173 encoder
+- compatible : must be one of the following string:
+  "mediatek,mt8173-vcodec-vp8-enc" for mt8173 vp8 encoder.
+  "mediatek,mt8173-vcodec-avc-enc" for mt8173 avc encoder.
   "mediatek,mt8183-vcodec-enc" for MT8183 encoder.
   "mediatek,mt8173-vcodec-dec" for MT8173 decoder.
 - reg : Physical base address of the video codec registers and length of
@@ -13,10 +15,11 @@  Required properties:
 - 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: encoder must contain "venc_sel_src", "venc_sel",,
-  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",
-  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",
-  "venc_lt_sel", "vdec_bus_clk_src".
+- clock-names:
+   avc venc must contain "venc_sel";
+   vp8 venc 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.txt
   for details.
@@ -80,14 +83,10 @@  vcodec_dec: vcodec@16000000 {
     assigned-clock-rates = <0>, <0>, <0>, <1482000000>, <800000000>;
   };
 
-  vcodec_enc: vcodec@18002000 {
-    compatible = "mediatek,mt8173-vcodec-enc";
-    reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/
-          <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/
-    interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>,
-		 <GIC_SPI 202 IRQ_TYPE_LEVEL_LOW>;
-    mediatek,larb = <&larb3>,
-		    <&larb5>;
+vcodec_enc: vcodec@18002000 {
+    compatible = "mediatek,mt8173-vcodec-avc-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>,
@@ -98,8 +97,20 @@  vcodec_dec: vcodec@16000000 {
              <&iommu M4U_PORT_VENC_REF_LUMA>,
              <&iommu M4U_PORT_VENC_REF_CHROMA>,
              <&iommu M4U_PORT_VENC_NBM_RDMA>,
-             <&iommu M4U_PORT_VENC_NBM_WDMA>,
-             <&iommu M4U_PORT_VENC_RCPU_SET2>,
+             <&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_lt: vcodec@19002000 {
+    compatible = "mediatek,mt8173-vcodec-vp8-enc";
+    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>,
@@ -108,17 +119,10 @@  vcodec_dec: vcodec@16000000 {
              <&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_VENCPLL_D2>,
-             <&topckgen CLK_TOP_VENC_SEL>,
-             <&topckgen CLK_TOP_UNIVPLL1_D2>,
-             <&topckgen CLK_TOP_VENC_LT_SEL>;
-    clock-names = "venc_sel_src",
-                  "venc_sel",
-                  "venc_lt_sel_src",
-                  "venc_lt_sel";
-    assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,
-                      <&topckgen CLK_TOP_VENC_LT_SEL>;
-    assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,
-                             <&topckgen CLK_TOP_UNIVPLL1_D2>;
+    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>;
   };