Subject: linux-next: manual merge of the devicetree tree with the sound-asoc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Mar 2023 10:32:11 +1100

Hi all,

Today's linux-next merge of the devicetree tree got conflicts in:

  Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
  Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml

between commits:

  e4cf7805f084 ("ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants")
  bf4afbf95093 ("ASoC: dt-bindings: qcom,lpass-tx-macro: narrow clocks per variants")

from the sound-asoc tree and commit:

  d0dcd0ce8437 ("dt-bindings: yamllint: Require a space after a comment '#'")

from the devicetree tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
index 78e462e2cdcf,e6fcf542cf87..000000000000
--- a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
@@@ -50,65 -61,6 +50,65 @@@ required
    - reg
    - "#sound-dai-cells"
  
 +allOf:
 +  - $ref: dai-common.yaml#
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sc7280-lpass-rx-macro
 +    then:
 +      properties:
 +        clock-names:
 +          oneOf:
-             - items:   #for ADSP based platforms
++            - items:   # for ADSP based platforms
 +                - const: mclk
 +                - const: npl
 +                - const: macro
 +                - const: dcodec
 +                - const: fsgen
-             - items:   #for ADSP bypass based platforms
++            - items:   # for ADSP bypass based platforms
 +                - const: mclk
 +                - const: npl
 +                - const: fsgen
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sc8280xp-lpass-rx-macro
 +            - qcom,sm8250-lpass-rx-macro
 +            - qcom,sm8450-lpass-rx-macro
 +    then:
 +      properties:
 +        clocks:
 +          minItems: 5
 +          maxItems: 5
 +        clock-names:
 +          items:
 +            - const: mclk
 +            - const: npl
 +            - const: macro
 +            - const: dcodec
 +            - const: fsgen
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sm8550-lpass-rx-macro
 +    then:
 +      properties:
 +        clocks:
 +          minItems: 4
 +          maxItems: 4
 +        clock-names:
 +          items:
 +            - const: mclk
 +            - const: macro
 +            - const: dcodec
 +            - const: fsgen
 +
  unevaluatedProperties: false
  
  examples:
diff --cc Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml
index 9d6e67524daf,6c8751497d36..000000000000
--- a/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml
@@@ -55,65 -67,6 +55,65 @@@ required
    - reg
    - "#sound-dai-cells"
  
 +allOf:
 +  - $ref: dai-common.yaml#
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sc7280-lpass-tx-macro
 +    then:
 +      properties:
 +        clock-names:
 +          oneOf:
-             - items:   #for ADSP based platforms
++            - items:   # for ADSP based platforms
 +                - const: mclk
 +                - const: npl
 +                - const: macro
 +                - const: dcodec
 +                - const: fsgen
-             - items:   #for ADSP bypass based platforms
++            - items:   # for ADSP bypass based platforms
 +                - const: mclk
 +                - const: npl
 +                - const: fsgen
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sc8280xp-lpass-tx-macro
 +            - qcom,sm8250-lpass-tx-macro
 +            - qcom,sm8450-lpass-tx-macro
 +    then:
 +      properties:
 +        clocks:
 +          minItems: 5
 +          maxItems: 5
 +        clock-names:
 +          items:
 +            - const: mclk
 +            - const: npl
 +            - const: macro
 +            - const: dcodec
 +            - const: fsgen
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - qcom,sm8550-lpass-tx-macro
 +    then:
 +      properties:
 +        clocks:
 +          minItems: 4
 +          maxItems: 4
 +        clock-names:
 +          items:
 +            - const: mclk
 +            - const: macro
 +            - const: dcodec
 +            - const: fsgen
 +
  unevaluatedProperties: false
  
  examples: