lkml.org 
[lkml]   [2021]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 01/16] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW
    Date
    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 the property.

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

    Signed-off-by: Yong Wu <yong.wu@mediatek.com>
    Reviewed-by: Rob Herring <robh@kernel.org>
    Reviewed-by: Evan Green <evgreen@chromium.org>
    ---
    .../bindings/display/mediatek/mediatek,disp.txt | 9 ---------
    .../devicetree/bindings/media/mediatek-jpeg-decoder.txt | 4 ----
    .../devicetree/bindings/media/mediatek-jpeg-encoder.txt | 4 ----
    Documentation/devicetree/bindings/media/mediatek-mdp.txt | 8 --------
    .../devicetree/bindings/media/mediatek-vcodec.txt | 4 ----
    5 files changed, 29 deletions(-)

    diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
    index 93b160df3eec..6336bae8a6d7 100644
    --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
    +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
    @@ -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.txt
    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 {
    diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt b/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
    index cf60c5acc0e4..7978f210e3d4 100644
    --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
    +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
    @@ -15,9 +15,6 @@ Required properties:
    - clock-names: must contain "jpgdec-smi" and "jpgdec".
    - power-domains: a phandle to the power domain, see
    Documentation/devicetree/bindings/power/power_domain.txt for details.
    -- mediatek,larb: must contain the local arbiters in the current Socs, see
    - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
    - for details.
    - iommus: should point to the respective IOMMU block with master port as
    argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
    for details.
    @@ -32,7 +29,6 @@ Example:
    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>;
    };
    diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
    index acfb50375b8a..4b3664987362 100644
    --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
    +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
    @@ -13,9 +13,6 @@ Required properties:
    - clock-names: must contain "jpgenc". It is the clock of JPEG encoder.
    - power-domains: a phandle to the power domain, see
    Documentation/devicetree/bindings/power/power_domain.txt for details.
    -- mediatek,larb: must contain the local arbiters in the current SoCs, see
    - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
    - for details.
    - iommus: should point to the respective IOMMU block with master port as
    argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
    for details.
    @@ -29,7 +26,6 @@ Example:
    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>;
    };
    diff --git a/Documentation/devicetree/bindings/media/mediatek-mdp.txt b/Documentation/devicetree/bindings/media/mediatek-mdp.txt
    index f4798d04e925..df69c5a06250 100644
    --- a/Documentation/devicetree/bindings/media/mediatek-mdp.txt
    +++ b/Documentation/devicetree/bindings/media/mediatek-mdp.txt
    @@ -27,9 +27,6 @@ Required properties (DMA function blocks, child node):
    - iommus: should point to the respective IOMMU block with master port as
    argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
    for details.
    -- mediatek,larb: must contain the local arbiters in the current Socs, see
    - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
    - for details.

    Example:
    mdp_rdma0: rdma@14001000 {
    @@ -40,7 +37,6 @@ Example:
    <&mmsys CLK_MM_MUTEX_32K>;
    power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
    iommus = <&iommu M4U_PORT_MDP_RDMA0>;
    - mediatek,larb = <&larb0>;
    mediatek,vpu = <&vpu>;
    };

    @@ -51,7 +47,6 @@ Example:
    <&mmsys CLK_MM_MUTEX_32K>;
    power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
    iommus = <&iommu M4U_PORT_MDP_RDMA1>;
    - mediatek,larb = <&larb4>;
    };

    mdp_rsz0: rsz@14003000 {
    @@ -81,7 +76,6 @@ Example:
    clocks = <&mmsys CLK_MM_MDP_WDMA>;
    power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
    iommus = <&iommu M4U_PORT_MDP_WDMA>;
    - mediatek,larb = <&larb0>;
    };

    mdp_wrot0: wrot@14007000 {
    @@ -90,7 +84,6 @@ Example:
    clocks = <&mmsys CLK_MM_MDP_WROT0>;
    power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
    iommus = <&iommu M4U_PORT_MDP_WROT0>;
    - mediatek,larb = <&larb0>;
    };

    mdp_wrot1: wrot@14008000 {
    @@ -99,5 +92,4 @@ Example:
    clocks = <&mmsys CLK_MM_MDP_WROT1>;
    power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
    iommus = <&iommu M4U_PORT_MDP_WROT1>;
    - mediatek,larb = <&larb4>;
    };
    diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
    index 8318f0ed492d..ad7ba4bf23fe 100644
    --- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
    +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
    @@ -12,7 +12,6 @@ Required properties:
    - 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
    @@ -44,7 +43,6 @@ vcodec_dec: vcodec@16000000 {
    <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>,
    @@ -97,7 +95,6 @@ vcodec_enc_avc: vcodec@18002000 {
    <&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";
    @@ -118,7 +115,6 @@ vcodec_enc_vp8: vcodec@19002000 {
    <&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";
    --
    2.18.0
    \
     
     \ /
      Last update: 2021-04-10 11:12    [W:3.747 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site