]> Git Repo - J-linux.git/commitdiff
Merge tag 'devicetree-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
authorLinus Torvalds <[email protected]>
Fri, 12 Jan 2024 23:05:30 +0000 (15:05 -0800)
committerLinus Torvalds <[email protected]>
Fri, 12 Jan 2024 23:05:30 +0000 (15:05 -0800)
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
  ...

1  2 
Documentation/devicetree/bindings/cache/qcom,llcc.yaml
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
Documentation/devicetree/bindings/trivial-devices.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml

index b9a9f2cf32a1b698d6e26304f2d6bcea2315d8ca,d610b0be262cfc5c55ccf5b1898c6cc793f45e53..07ccbda4a0ab5405f9fcd944a06a4bbd2f545d26
@@@ -33,8 -33,6 +33,8 @@@ properties
        - qcom,sm8350-llcc
        - qcom,sm8450-llcc
        - qcom,sm8550-llcc
 +      - qcom,sm8650-llcc
 +      - qcom,x1e80100-llcc
  
    reg:
      minItems: 2
@@@ -66,6 -64,7 +66,7 @@@ allOf
          compatible:
            contains:
              enum:
+               - qcom,qdu1000-llcc
                - qcom,sc7180-llcc
                - qcom,sm6350-llcc
      then:
          compatible:
            contains:
              enum:
-               - qcom,qdu1000-llcc
                - qcom,sc8180x-llcc
                - qcom,sc8280xp-llcc
 +              - qcom,x1e80100-llcc
      then:
        properties:
          reg:
index d66e5154748274ecd5453aafb4cad18fbfe52782,4c3250985ac3642b4bfed969a3fd7c61a9e5b238..b46cc780703c6cdecbf1deafdfe16dfd70c512d4
@@@ -24,7 -24,6 +24,7 @@@ properties
            - samsung,mfc-v7                # Exynos5420
            - samsung,mfc-v8                # Exynos5800
            - samsung,mfc-v10               # Exynos7880
 +          - tesla,fsd-mfc                 # Tesla FSD
        - items:
            - enum:
                - samsung,exynos3250-mfc    # Exynos3250
@@@ -50,7 -49,9 +50,9 @@@
  
    iommu-names:
      minItems: 1
-     maxItems: 2
+     items:
+       - const: left
+       - const: right
  
    power-domains:
      maxItems: 1
@@@ -85,7 -86,7 +87,7 @@@ allOf
              - const: sclk_mfc
          iommus:
            maxItems: 1
-         iommus-names: false
+         iommu-names: false
  
    - if:
        properties:
              - const: aclk
              - const: aclk_xiu
          iommus:
-           maxItems: 2
-         iommus-names:
-           items:
-             - const: left
-             - const: right
+           minItems: 2
+         iommu-names:
+           minItems: 2
  
    - if:
        properties:
              - const: mfc
              - const: sclk_mfc
          iommus:
-           maxItems: 2
-         iommus-names:
-           items:
-             - const: left
-             - const: right
+           minItems: 2
+         iommu-names:
+           minItems: 2
  
    - if:
        properties:
            items:
              - const: mfc
          iommus:
-           maxItems: 2
-         iommus-names:
-           items:
-             - const: left
-             - const: right
+           minItems: 2
+         iommu-names:
+           minItems: 2
  
    - if:
        properties:
          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>
index a5fb2fa22026b85f8e0d90ef25c6d3055e6927ba,29aed5ddba6be2d8fe3d92ecfddffb1711c7121b..21d1f066f87518ceed6f0500ccb466b73d0fcc39
@@@ -49,8 -49,6 +49,6 @@@ properties
            - ams,iaq-core
              # i2c serial eeprom (24cxx)
            - at,24c08
-             # i2c trusted platform module (TPM)
-           - atmel,at97sc3204t
              # ATSHA204 - i2c h/w symmetric crypto module
            - atmel,atsha204
              # ATSHA204A - i2c h/w symmetric crypto module
            - fsl,mpl3115
              # MPR121: Proximity Capacitive Touch Sensor Controller
            - fsl,mpr121
 +            # Monolithic Power Systems Inc. multi-phase controller mp2856
 +          - mps,mp2856
 +            # Monolithic Power Systems Inc. multi-phase controller mp2857
 +          - mps,mp2857
              # Monolithic Power Systems Inc. multi-phase controller mp2888
            - mps,mp2888
              # Monolithic Power Systems Inc. multi-phase controller mp2971
            - mps,mp2973
              # Monolithic Power Systems Inc. multi-phase controller mp2975
            - mps,mp2975
 +            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
 +          - mps,mp5990
              # Honeywell Humidicon HIH-6130 humidity/temperature sensor
            - honeywell,hi6130
              # IBM Common Form Factor Power Supply Versions (all versions)
            - infineon,ir38263
              # Infineon IRPS5401 Voltage Regulator (PMIC)
            - infineon,irps5401
-             # Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
-           - infineon,slb9635tt
-             # Infineon SLB9645 I2C TPM (new protocol, max 400khz)
-           - infineon,slb9645tt
-             # Infineon SLB9673 I2C TPM 2.0
-           - infineon,slb9673
              # Infineon TLV493D-A1B6 I2C 3D Magnetic Sensor
            - infineon,tlv493d-a1b6
              # Infineon Multi-phase Digital VR Controller xdpe11280
            - national,lm85
              # I2C ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator
            - national,lm92
-             # i2c trusted platform module (TPM)
-           - nuvoton,npct501
-             # i2c trusted platform module (TPM2)
-           - nuvoton,npct601
              # Nuvoton Temperature Sensor
            - nuvoton,w83773g
              # OKI ML86V7667 video decoder
            - silabs,si7020
              # Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
            - skyworks,sky81452
-             # Socionext SynQuacer TPM MMIO module
-           - socionext,synquacer-tpm-mmio
              # SparkFun Qwiic Joystick (COM-15168) with i2c interface
            - sparkfun,qwiic-joystick
              # i2c serial eeprom (24cxx)
            - winbond,w83793
              # Vicor Corporation Digital Supervisor
            - vicor,pli1209bc
-             # i2c trusted platform module (TPM)
-           - winbond,wpct301
  
  required:
    - compatible
index 871f38fef3c432daaad53d092113d27089fdcfcd,6f1b91d9d11143b7f26ae7cc52fa6a9c3f2c9035..02aaa1f538b2928599e289432a80f154588cec0d
@@@ -79,8 -79,6 +79,8 @@@ patternProperties
      description: ALFA Network Inc.
    "^allegro,.*":
      description: Allegro DVT
 +  "^alliedvision,.*":
 +    description: Allied Vision Technologies GmbH
    "^allo,.*":
      description: Allo.com
    "^allwinner,.*":
      description: CompuLab Ltd.
    "^congatec,.*":
      description: congatec GmbH
 +  "^coolpi,.*":
 +    description: cool-pi.com
    "^coreriver,.*":
      description: CORERIVER Semiconductor Co.,Ltd.
    "^corpro,.*":
      description: Digi International Inc.
    "^digilent,.*":
      description: Diglent, Inc.
 +  "^dimonoff,.*":
 +    description: Dimonoff inc.
    "^diodes,.*":
      description: Diodes, Inc.
    "^dioo,.*":
      description: Fairphone B.V.
    "^faraday,.*":
      description: Faraday Technology Corporation
 +  "^fascontek,.*":
 +    description: Fascontek
    "^fastrax,.*":
      description: Fastrax Oy
    "^fcs,.*":
      description: Fujitsu Ltd.
    "^fxtec,.*":
      description: FX Technology Ltd.
 +  "^galaxycore,.*":
 +    description: GalaxyCore Inc.
    "^gardena,.*":
      description: GARDENA GmbH
    "^gateway,.*":
      description: Hewlett Packard Enterprise
    "^hsg,.*":
      description: HannStar Display Co.
 +  "^htc,.*":
 +    description: HTC Corporation
    "^huawei,.*":
      description: Huawei Technologies Co., Ltd.
    "^hugsun,.*":
      description: Shenzhen Roofull Technology Co, Ltd
    "^roseapplepi,.*":
      description: RoseapplePi.org
 +  "^rve,.*":
 +    description: Recharge Véhicule Électrique (RVE) inc.
    "^saef,.*":
      description: Saef Technology Limited
    "^samsung,.*":
      description: Skyworks Solutions, Inc.
    "^smartlabs,.*":
      description: SmartLabs LLC
+   "^smi,.*":
+     description: Silicon Motion Technology Corporation
    "^smsc,.*":
      description: Standard Microsystems Corporation
    "^snps,.*":
      description: Technologic Systems
    "^techstar,.*":
      description: Shenzhen Techstar Electronics Co., Ltd.
 +  "^techwell,.*":
 +    description: Techwell, Inc.
    "^teejet,.*":
      description: TeeJet
    "^teltonika,.*":
      description: TPO
    "^tq,.*":
      description: TQ-Systems GmbH
 +  "^transpeed,.*":
 +    description: Transpeed
    "^traverse,.*":
      description: Traverse Technologies Australia Pty Ltd
    "^tronfy,.*":
This page took 0.187591 seconds and 4 git commands to generate.