Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Mar 2022 12:20:24 +1100

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

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

between commit:

  6d0990e6e844 ("media: dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW")

from the v4l-dvb tree and commit:

  4ed545e7d100 ("dt-bindings: display: mediatek: disp: split each block to individual yaml")

from the drm tree.

I fixed it up (I deleted the file and added the following merge fix patch)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Mar 2022 12:17:12 +1100
Subject: [PATCH] fix up for "media: dt-binding: mediatek: Get rid of
 mediatek,larb for multimedia HW"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 .../bindings/display/mediatek/mediatek,ovl-2l.yaml     | 10 ----------
 .../bindings/display/mediatek/mediatek,ovl.yaml        | 10 ----------
 .../bindings/display/mediatek/mediatek,rdma.yaml       | 10 ----------
 .../bindings/display/mediatek/mediatek,wdma.yaml       | 10 ----------
 4 files changed, 40 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
index 611a2dbdefa4..e3cef99d0f98 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
@@ -46,15 +46,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -83,6 +74,5 @@ examples:
         power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
         clocks = <&mmsys CLK_MM_DISP_OVL0_2L>;
         iommus = <&iommu M4U_PORT_DISP_2L_OVL0_LARB0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x9000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
index e71f79bc2dee..93d5c68a2dbd 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
@@ -61,15 +61,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -98,6 +89,5 @@ examples:
         power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
         clocks = <&mmsys CLK_MM_DISP_OVL0>;
         iommus = <&iommu M4U_PORT_DISP_OVL0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xc000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
index 8ef821641672..b56e22fbcd52 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
@@ -63,15 +63,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,rdma-fifo-size:
     description:
       rdma fifo size may be different even in same SOC, add this property to the
@@ -111,7 +102,6 @@ examples:
         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>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xe000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
index aaf5649b6413..f9f00a518edf 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
@@ -44,15 +44,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -81,6 +72,5 @@ examples:
         power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
         clocks = <&mmsys CLK_MM_DISP_WDMA0>;
         iommus = <&iommu M4U_PORT_DISP_WDMA0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0x1000 0x1000>;
     };
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell