Commit 6d0990e6 authored by Yong Wu's avatar Yong Wu Committed by Mauro Carvalho Chehab
Browse files

media: dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW 



After adding device_link between the consumer with the smi-larbs,
if the consumer call its owner pm_runtime_get(_sync), the
pm_runtime_get(_sync) of smi-larb and smi-common will be called
automatically. Thus, the consumer don't need this property.

And IOMMU also know which larb this consumer connects with from
iommu id in the "iommus=" property.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Acked-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent bd73292d

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+0 −9
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ Required properties (DMA function blocks): 
	"mediatek,<chip>-disp-rdma"

	"mediatek,<chip>-disp-wdma"

  the supported chips are mt2701, mt8167 and mt8173.

- larb: Should contain a phandle pointing to the local arbiter device as defined

  in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

- iommus: Should point to the respective IOMMU block with master port as

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

  for details.
@@ -91,7 +89,6 @@ ovl0: ovl@1400c000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_OVL0>;

	iommus = <&iommu M4U_PORT_DISP_OVL0>;

	mediatek,larb = <&larb0>;

};



ovl1: ovl@1400d000 {
@@ -101,7 +98,6 @@ ovl1: ovl@1400d000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_OVL1>;

	iommus = <&iommu M4U_PORT_DISP_OVL1>;

	mediatek,larb = <&larb4>;

};



rdma0: rdma@1400e000 {
@@ -111,7 +107,6 @@ rdma0: rdma@1400e000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA0>;

	iommus = <&iommu M4U_PORT_DISP_RDMA0>;

	mediatek,larb = <&larb0>;

	mediatek,rdma-fifosize = <8192>;

};
@@ -122,7 +117,6 @@ rdma1: rdma@1400f000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA1>;

	iommus = <&iommu M4U_PORT_DISP_RDMA1>;

	mediatek,larb = <&larb4>;

};



rdma2: rdma@14010000 {
@@ -132,7 +126,6 @@ rdma2: rdma@14010000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA2>;

	iommus = <&iommu M4U_PORT_DISP_RDMA2>;

	mediatek,larb = <&larb4>;

};



wdma0: wdma@14011000 {
@@ -142,7 +135,6 @@ wdma0: wdma@14011000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_WDMA0>;

	iommus = <&iommu M4U_PORT_DISP_WDMA0>;

	mediatek,larb = <&larb0>;

};



wdma1: wdma@14012000 {
@@ -152,7 +144,6 @@ wdma1: wdma@14012000 { 
	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_WDMA1>;

	iommus = <&iommu M4U_PORT_DISP_WDMA1>;

	mediatek,larb = <&larb4>;

};



color0: color@14013000 {

Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml

+0 −7
Original line number Diff line number Diff line
@@ -61,12 +61,6 @@ properties: 
    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
@@ -137,7 +131,6 @@ examples: 
          <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>,

Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml

+0 −8
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ properties: 
    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
@@ -157,7 +151,6 @@ examples: 
             <&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";
@@ -178,7 +171,6 @@ examples: 
             <&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";

Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml

+0 −9
Original line number Diff line number Diff line
@@ -42,13 +42,6 @@ properties: 
  power-domains:

    maxItems: 1



  mediatek,larb:

    $ref: '/schemas/types.yaml#/definitions/phandle'

    description: |

      Must contain the local arbiters in the current Socs, see

      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

      for details.



  iommus:

    maxItems: 2

    description: |
@@ -63,7 +56,6 @@ required: 
  - clocks

  - clock-names

  - power-domains

  - mediatek,larb

  - iommus



additionalProperties: false
@@ -83,7 +75,6 @@ examples: 
      clock-names = "jpgdec-smi",

                    "jpgdec";

      power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;

      mediatek,larb = <&larb2>;

      iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,

               <&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;

    };

Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml

+0 −9
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ properties: 
  power-domains:

    maxItems: 1



  mediatek,larb:

    $ref: '/schemas/types.yaml#/definitions/phandle'

    description: |

      Must contain the local arbiters in the current Socs, see

      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

      for details.



  iommus:

    maxItems: 2

    description: |
@@ -56,7 +49,6 @@ required: 
  - clocks

  - clock-names

  - power-domains

  - mediatek,larb

  - iommus



additionalProperties: false
@@ -75,7 +67,6 @@ examples: 
      clocks =  <&imgsys CLK_IMG_VENC>;

      clock-names = "jpgenc";

      power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;

      mediatek,larb = <&larb2>;

      iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>,

               <&iommu MT2701_M4U_PORT_JPGENC_BSDMA>;

    };