Unverified Commit da060ab8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dts-for-6.2-2' of... 

Merge tag 'qcom-dts-for-6.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

More Qualcomm DTS updates for 6.2

This introduces support for the OnePlus One, on MSM8974Pro, and properly
marks other Pro devices as compatible thereof. Also on MSM8974, the
description of USB devices and their PHYs are cleaned up.

On the binding side compatibles for recently added ARM and ARM64 boards
are added.

* tag 'qcom-dts-for-6.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (102 commits)
  dt-bindings: arm: qcom: Add zombie
  ARM: dts: qcom: msm8974: Add OnePlus One
  dt-bindings: arm: qcom: Document oneplus,bacon device
  ARM: dts: qcom: msm8974: clean up USB nodes
  arm: dts: qcom: use qcom,msm8974pro for pro devices
  dt-bindings: arm: qcom: split MSM8974 Pro and MSM8974
  ARM: dts: qcom: align LED node names with dtschema
  dt-bindings: arm: qcom: Document additional sa8540p device
  dt-bindings: arm: qcom: Add Xperia 5 IV (PDX224)
  dt-bindings: arm: qcom: Document msm8956 and msm8976 SoC and devices
  dt-bindings: arm: add xiaomi,sagit board based on msm8998 chip
  dt-bindings: arm: qcom: add sdm670 and pixel 3a compatible
  dt-bindings: arm: cpus: add qcom kryo 360 compatible
  ARM: dts: qcom-msm8960-cdp: align TLMM pin configuration with DT schema
  ARM: dts: qcom-msm8960: use define for interrupt constants
  dt-bindings: arm: qcom: Document SM6375 & Xperia 10 IV
  ARM: dts: qcom-apq8060: align TLMM pin configuration with DT schema
  ARM: dts: qcom: msm8226: Add MMCC node
  dt-bindings: arm: qcom: Separate LTE/WIFI SKU for sc7280-evoker
  dt-bindings: arm: qcom: Document QDU1000/QRU1000 SoCs and boards
  ...

Link: https://lore.kernel.org/r/20221207153201.3233015-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c24ba596 812e13dd

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,7 @@ properties: 
      - qcom,kryo250

      - qcom,kryo250

      - qcom,kryo260

      - qcom,kryo260

      - qcom,kryo280

      - qcom,kryo280

      - qcom,kryo360

      - qcom,kryo385

      - qcom,kryo385

      - qcom,kryo468

      - qcom,kryo468

      - qcom,kryo485

      - qcom,kryo485

Documentation/devicetree/bindings/arm/qcom.yaml

+79 −3
Original line number Original line Diff line number Diff line
@@ -29,17 +29,22 @@ description: | 
        apq8074

        apq8074

        apq8084

        apq8084

        apq8096

        apq8096

        ipq4018

        ipq6018

        ipq6018

        ipq8074

        ipq8074

        mdm9615

        mdm9615

        msm8226

        msm8226

        msm8916

        msm8916

        msm8956

        msm8974

        msm8974

        msm8976

        msm8992

        msm8992

        msm8994

        msm8994

        msm8996

        msm8996

        msm8998

        msm8998

        qcs404

        qcs404

        qdu1000

        qru1000

        sa8155p

        sa8155p

        sa8540p

        sa8540p

        sc7180

        sc7180
@@ -51,6 +56,7 @@ description: | 
        sdm632

        sdm632

        sdm636

        sdm636

        sdm660

        sdm660

        sdm670

        sdm845

        sdm845

        sdx55

        sdx55

        sdx65

        sdx65
@@ -58,6 +64,7 @@ description: | 
        sm6115

        sm6115

        sm6125

        sm6125

        sm6350

        sm6350

        sm6375

        sm7225

        sm7225

        sm8150

        sm8150

        sm8250

        sm8250
@@ -78,6 +85,7 @@ description: | 
        mtp

        mtp

        qrd

        qrd

        sbc

        sbc

        x100





  The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>

  The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>

  where the minor number may be omitted when it's zero, i.e.  v1.0 is the same

  where the minor number may be omitted when it's zero, i.e.  v1.0 is the same
@@ -116,7 +124,9 @@ properties: 
      - items:

      - items:

          - enum:

          - enum:

              - asus,sparrow

              - asus,sparrow

              - huawei,sturgeon

              - lg,lenok

              - lg,lenok

              - samsung,matisse-wifi

          - const: qcom,apq8026

          - const: qcom,apq8026





      - items:

      - items:
@@ -150,6 +160,12 @@ properties: 
              - samsung,s3ve3g

              - samsung,s3ve3g

          - const: qcom,msm8226

          - const: qcom,msm8226





      - items:

          - enum:

              - sony,kugo-row

              - sony,suzu-row

          - const: qcom,msm8956



      - items:

      - items:

          - enum:

          - enum:

              - qcom,msm8960-cdp

              - qcom,msm8960-cdp
@@ -157,14 +173,20 @@ properties: 




      - items:

      - items:

          - enum:

          - enum:

              - fairphone,fp2

              - lge,hammerhead

              - lge,hammerhead

              - samsung,klte

              - sony,xperia-amami

              - sony,xperia-amami

              - sony,xperia-castor

              - sony,xperia-honami

              - sony,xperia-honami

          - const: qcom,msm8974

          - const: qcom,msm8974





      - items:

          - enum:

              - fairphone,fp2

              - oneplus,bacon

              - samsung,klte

              - sony,xperia-castor

          - const: qcom,msm8974pro

          - const: qcom,msm8974



      - items:

      - items:

          - const: qcom,msm8916-mtp

          - const: qcom,msm8916-mtp

          - const: qcom,msm8916-mtp/1

          - const: qcom,msm8916-mtp/1
@@ -251,8 +273,15 @@ properties: 
              - sony,xperia-lilac

              - sony,xperia-lilac

              - sony,xperia-maple

              - sony,xperia-maple

              - sony,xperia-poplar

              - sony,xperia-poplar

              - xiaomi,sagit

          - const: qcom,msm8998

          - const: qcom,msm8998





      - items:

          - enum:

              - 8dev,jalapeno

              - alfa-network,ap120c-ac

          - const: qcom,ipq4018



      - items:

      - items:

          - enum:

          - enum:

              - qcom,ipq4019-ap-dk01.1-c1

              - qcom,ipq4019-ap-dk01.1-c1
@@ -264,6 +293,7 @@ properties: 




      - items:

      - items:

          - enum:

          - enum:

              - mikrotik,rb3011

              - qcom,ipq8064-ap148

              - qcom,ipq8064-ap148

          - const: qcom,ipq8064

          - const: qcom,ipq8064
@@ -274,6 +304,25 @@ properties: 
              - qcom,ipq8074-hk10-c2

              - qcom,ipq8074-hk10-c2

          - const: qcom,ipq8074

          - const: qcom,ipq8074





      - description: Sierra Wireless MangOH Green with WP8548 Module

        items:

          - const: swir,mangoh-green-wp8548

          - const: swir,wp8548

          - const: qcom,mdm9615



      - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform

        items:

          - enum:

              - qcom,qdu1000-idp

              - qcom,qdu1000-x100

          - const: qcom,qdu1000



      - description: Qualcomm Technologies, Inc. Radio Unit 1000 platform

        items:

          - enum:

              - qcom,qru1000-idp

          - const: qcom,qru1000



      - description: Qualcomm Technologies, Inc. SC7180 IDP

      - description: Qualcomm Technologies, Inc. SC7180 IDP

        items:

        items:

          - enum:

          - enum:
@@ -595,6 +644,11 @@ properties: 
          - const: google,evoker

          - const: google,evoker

          - const: qcom,sc7280

          - const: qcom,sc7280





      - description: Google Evoker with LTE (newest rev)

        items:

          - const: google,evoker-sku512

          - const: qcom,sc7280



      - description: Google Herobrine (newest rev)

      - description: Google Herobrine (newest rev)

        items:

        items:

          - const: google,herobrine

          - const: google,herobrine
@@ -615,6 +669,16 @@ properties: 
          - const: google,villager-sku512

          - const: google,villager-sku512

          - const: qcom,sc7280

          - const: qcom,sc7280





      - description: Google Zombie (newest rev)

        items:

          - const: google,zombie

          - const: qcom,sc7280



      - description: Google Zombie with LTE (newest rev)

        items:

          - const: google,zombie-sku512

          - const: qcom,sc7280



      - items:

      - items:

          - enum:

          - enum:

              - lenovo,flex-5g

              - lenovo,flex-5g
@@ -657,6 +721,11 @@ properties: 
              - xiaomi,lavender

              - xiaomi,lavender

          - const: qcom,sdm660

          - const: qcom,sdm660





      - items:

          - enum:

              - google,sargo

          - const: qcom,sdm670



      - items:

      - items:

          - enum:

          - enum:

              - qcom,sdx55-mtp

              - qcom,sdx55-mtp
@@ -690,6 +759,7 @@ properties: 
      - items:

      - items:

          - enum:

          - enum:

              - qcom,sa8295p-adp

              - qcom,sa8295p-adp

              - qcom,sa8540p-ride

          - const: qcom,sa8540p

          - const: qcom,sa8540p





      - items:

      - items:
@@ -730,6 +800,11 @@ properties: 
              - sony,pdx213

              - sony,pdx213

          - const: qcom,sm6350

          - const: qcom,sm6350





      - items:

          - enum:

              - sony,pdx225

          - const: qcom,sm6375



      - items:

      - items:

          - enum:

          - enum:

              - fairphone,fp4

              - fairphone,fp4
@@ -767,6 +842,7 @@ properties: 
              - qcom,sm8450-hdk

              - qcom,sm8450-hdk

              - qcom,sm8450-qrd

              - qcom,sm8450-qrd

              - sony,pdx223

              - sony,pdx223

              - sony,pdx224

          - const: qcom,sm8450

          - const: qcom,sm8450





additionalProperties: true

additionalProperties: true

Documentation/devicetree/bindings/arm/swir.txt

deleted100644 → 0
+0 −12
Original line number Original line Diff line number Diff line 
Sierra Wireless Modules device tree bindings

--------------------------------------------



Supported Modules :

 - WP8548 : Includes MDM9615 and PM8018 in a module



Sierra Wireless modules shall have the following properties :

  Required root node property

   - compatible: "swir,wp8548" for the WP8548 CF3 Module



Board compatible values:

  - "swir,mangoh-green-wp8548" for the mangOH green board with the WP8548 module

Documentation/devicetree/bindings/sram/qcom,imem.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - qcom,sdm630-imem

          - qcom,sdm630-imem

          - qcom,sdm845-imem

          - qcom,sdm845-imem

          - qcom,sdx55-imem

          - qcom,sdx55-imem

          - qcom,sdx65-imem

      - const: syscon

      - const: syscon

      - const: simple-mfd

      - const: simple-mfd

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,8 @@ patternProperties: 
    description: Annapurna Labs

    description: Annapurna Labs

  "^alcatel,.*":

  "^alcatel,.*":

    description: Alcatel

    description: Alcatel

  "^alfa-network,.*":

    description: ALFA Network Inc.

  "^allegro,.*":

  "^allegro,.*":

    description: Allegro DVT

    description: Allegro DVT

  "^allo,.*":

  "^allo,.*":