From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jan 2024 23:05:30 +0000 (-0800)
Subject: Merge tag 'devicetree-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=38814330fedd778edffcabe0c8cb462ee365782e;p=linux.git

Merge tag 'devicetree-for-6.8' of git://git./linux/kernel/git/robh/linux

Pull devicetree updates from Rob Herring:

 - Convert FPGA bridge, all TPMs (finally), and Rockchip HDMI bindings
   to schemas

 - Improvements in Samsung GPU schemas

 - A few more cases of dropping unneeded quotes in schemas

 - Merge QCom idle-states txt binding into common idle-states schema

 - Add X1E80100, SM8650, SM8650, and SDX75 SoCs to QCom Power Domain
   Controller

 - Add NXP i.mx8dl to SCU PD

 - Add synaptics r63353 panel controller

 - Clarify the wording around the use of 'wakeup-source' property

 - Add a DTS coding style doc

 - Add smi vendor prefix

 - Fix DT_SCHEMA_FILES incorrect matching of paths outside the kernel
   tree

 - Disable sysfb (e.g. EFI FB) when simple-framebuffer node is present

 - Fix double free in of_parse_phandle_with_args_map()

 - A couple of kerneldoc fixes

* tag 'devicetree-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (37 commits)
  of: unittest: Fix of_count_phandle_with_args() expected value message
  dt-bindings: fpga: altera: Convert bridge bindings to yaml
  dt-bindings: fpga: Convert bridge binding to yaml
  dt-bindings: vendor-prefixes: Add smi
  dt-bindings: power: Clarify wording for wakeup-source property
  of: Fix double free in of_parse_phandle_with_args_map
  dt-bindings: ignore paths outside kernel for DT_SCHEMA_FILES
  drivers: of: Fixed kernel doc warning
  dt-bindings: tpm: Document Microsoft fTPM bindings
  dt-bindings: tpm: Convert IBM vTPM bindings to DT schema
  dt-bindings: tpm: Convert Google Cr50 bindings to DT schema
  dt-bindings: tpm: Consolidate TCG TIS bindings
  dt-bindings: display: rockchip,inno-hdmi: Document RK3128 compatible
  dt-bindings: arm: Add remote etm dt-binding
  dt-bindings: mmc: sdhci-pxa: Fix 'regs' typo
  media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas
  dt-bindings: display: panel: Add synaptics r63353 panel controller
  dt-bindings: arm: merge qcom,idle-state with idle-state
  dt-bindings: drm: rockchip: convert inno_hdmi-rockchip.txt to yaml
  dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries
  ...
---

38814330fedd778edffcabe0c8cb462ee365782e
diff --cc Documentation/devicetree/bindings/cache/qcom,llcc.yaml
index b9a9f2cf32a1b,d610b0be262cf..07ccbda4a0ab5
--- a/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
+++ b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
@@@ -103,10 -102,8 +104,9 @@@ allOf
          compatible:
            contains:
              enum:
-               - qcom,qdu1000-llcc
                - qcom,sc8180x-llcc
                - qcom,sc8280xp-llcc
 +              - qcom,x1e80100-llcc
      then:
        properties:
          reg:
diff --cc Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
index d66e515474827,4c3250985ac36..b46cc780703c6
--- a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
+++ b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
@@@ -162,27 -157,7 +158,24 @@@ allOf
          clocks:
            minItems: 1
            maxItems: 2
-         iommus:
-           minItems: 1
-           maxItems: 2
  
 +  - if:
 +      properties:
 +        compatible:
 +          contains:
 +            enum:
 +              - tesla,fsd-mfc
 +    then:
 +      properties:
 +        clocks:
 +          maxItems: 1
 +        clock-names:
 +          items:
 +            - const: mfc
 +        iommus:
 +          maxItems: 2
 +        iommus-names: false
 +
  examples:
    - |
      #include <dt-bindings/clock/exynos4.h>