Unverified Commit 2c947cd6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-5.20-2' of... 

Merge tag 'qcom-arm64-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

More Qualcomm ARM64 DTS updates for v5.20

Related to SDM845, the Xiaomi Mi Mix2s is introduced, the DB845c on
SDM845 gains support for the second GPI DMA controller and has the GENI
I2C and SPI instances wired up to their respective GPI DMA controller.

QCS404 USB controller and PHY assignment is corrected and IPQ8074 gains
APCS definition to handle outgoing IPC interrupts.

Lastly a range of Devicetree validation issues are addressed.

* tag 'qcom-arm64-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (53 commits)
  arm64: dts: qcom: Add support for Xiaomi Mi Mix2s
  dt-bindings: arm: qcom: Add Xiaomi Mi Mix2s bindings
  dt-bindings: arm: qcom: Document lg,judyln and lg,judyp devices
  dt-bindings: arm: qcom: add missing SM6350 board compatibles
  dt-bindings: arm: qcom: add missing SM6125 board compatibles
  dt-bindings: arm: qcom: add missing SDM845 board compatibles
  dt-bindings: arm: qcom: add missing SDM636 board compatibles
  dt-bindings: arm: qcom: add missing SDM630 board compatibles
  dt-bindings: arm: qcom: add missing QCS404 board compatibles
  dt-bindings: arm: qcom: add missing MSM8992 board compatibles
  dt-bindings: arm: qcom: add missing MSM8998 board compatibles
  dt-bindings: vendor-prefixes: add Shift GmbH
  dt-bindings: arm: qcom: add missing SM8350 board compatibles
  dt-bindings: arm: qcom: add missing SM8250 board compatibles
  dt-bindings: arm: qcom: add missing SM8150 board compatibles
  dt-bindings: arm: qcom: add missing MSM8994 board compatibles
  dt-bindings: arm: qcom: add missing MSM8916 board compatibles
  dt-bindings: arm: qcom: fix MSM8994 boards compatibles
  dt-bindings: arm: qcom: fix MSM8916 MTP compatibles
  dt-bindings: arm: qcom: fix Longcheer L8150 compatibles
  ...

Link: https://lore.kernel.org/r/20220720231643.2114565-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3d2b5fdd be497abe

Documentation/devicetree/bindings/arm/qcom.yaml

+105 −6
Original line number Original line Diff line number Diff line
@@ -38,6 +38,8 @@ description: | 
        msm8992

        msm8992

        msm8994

        msm8994

        msm8996

        msm8996

        msm8998

        qcs404

        sa8155p

        sa8155p

        sa8540p

        sa8540p

        sc7180

        sc7180
@@ -47,10 +49,13 @@ description: | 
        sda660

        sda660

        sdm630

        sdm630

        sdm632

        sdm632

        sdm636

        sdm660

        sdm660

        sdm845

        sdm845

        sdx55

        sdx55

        sdx65

        sdx65

        sm6125

        sm6350

        sm7225

        sm7225

        sm8150

        sm8150

        sm8250

        sm8250
@@ -159,28 +164,50 @@ properties: 
          - const: qcom,msm8974

          - const: qcom,msm8974





      - items:

      - items:

          - enum:

              - alcatel,idol347

          - const: qcom,msm8916-mtp/1

          - const: qcom,msm8916-mtp

          - const: qcom,msm8916-mtp

          - const: qcom,msm8916-mtp/1

          - const: qcom,msm8916

          - const: qcom,msm8916





      - items:

      - items:

          - enum:

          - enum:

              - longcheer,l8150

              - alcatel,idol347

              - asus,z00l

              - huawei,g7

              - longcheer,l8910

              - samsung,a3u-eur

              - samsung,a3u-eur

              - samsung,a5u-eur

              - samsung,a5u-eur

              - samsung,j5

              - samsung,serranove

              - wingtech,wt88047

          - const: qcom,msm8916



      - items:

          - const: longcheer,l8150

          - const: qcom,msm8916-v1-qrd/9-v1

          - const: qcom,msm8916

          - const: qcom,msm8916





      - items:

          - enum:

              - lg,bullhead

              - microsoft,talkman

              - xiaomi,libra

          - const: qcom,msm8992



      - items:

      - items:

          - enum:

          - enum:

              - sony,karin_windy

              - sony,karin_windy

          - const: qcom,apq8094



      - items:

          - enum:

              - huawei,angler

              - microsoft,cityman

              - sony,ivy-row

              - sony,karin-row

              - sony,karin-row

              - sony,satsuki-row

              - sony,satsuki-row

              - sony,sumire-row

              - sony,sumire-row

              - sony,suzuran-row

              - sony,suzuran-row

              - qcom,msm8994

          - const: qcom,msm8994

          - const: qcom,apq8094





      - items:

      - items:

          - enum:

          - enum:
@@ -200,6 +227,20 @@ properties: 
              - xiaomi,scorpio

              - xiaomi,scorpio

          - const: qcom,msm8996

          - const: qcom,msm8996





      - items:

          - enum:

              - asus,novago-tp370ql

              - fxtec,pro1

              - hp,envy-x2

              - lenovo,miix-630

              - oneplus,cheeseburger

              - oneplus,dumpling

              - qcom,msm8998-mtp

              - sony,xperia-lilac

              - sony,xperia-maple

              - sony,xperia-poplar

          - const: qcom,msm8998



      - items:

      - items:

          - enum:

          - enum:

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

              - qcom,ipq4019-ap-dk01.1-c1
@@ -548,6 +589,14 @@ properties: 
              - qcom,sc8280xp-qrd

              - qcom,sc8280xp-qrd

          - const: qcom,sc8280xp

          - const: qcom,sc8280xp





      - items:

          - enum:

              - sony,discovery-row

              - sony,kirin-row

              - sony,pioneer-row

              - sony,voyager-row

          - const: qcom,sdm630



      - items:

      - items:

          - enum:

          - enum:

              - inforce,ifc6560

              - inforce,ifc6560
@@ -558,6 +607,11 @@ properties: 
              - fairphone,fp3

              - fairphone,fp3

          - const: qcom,sdm632

          - const: qcom,sdm632





      - items:

          - enum:

              - sony,mermaid-row

          - const: qcom,sdm636



      - items:

      - items:

          - enum:

          - enum:

              - xiaomi,lavender

              - xiaomi,lavender
@@ -581,6 +635,13 @@ properties: 
              - qcom,ipq6018-cp01-c1

              - qcom,ipq6018-cp01-c1

          - const: qcom,ipq6018

          - const: qcom,ipq6018





      - items:

          - enum:

              - qcom,qcs404-evb-1000

              - qcom,qcs404-evb-4000

          - const: qcom,qcs404-evb

          - const: qcom,qcs404



      - items:

      - items:

          - enum:

          - enum:

              - qcom,sa8155p-adp

              - qcom,sa8155p-adp
@@ -591,6 +652,34 @@ properties: 
              - qcom,sa8295p-adp

              - qcom,sa8295p-adp

          - const: qcom,sa8540p

          - const: qcom,sa8540p





      - items:

          - enum:

              - lenovo,yoga-c630

              - lg,judyln

              - lg,judyp

              - oneplus,enchilada

              - oneplus,fajita

              - qcom,sdm845-mtp

              - shift,axolotl

              - samsung,w737

              - sony,akari-row

              - sony,akatsuki-row

              - sony,apollo-row

              - thundercomm,db845c

              - xiaomi,beryllium

              - xiaomi,polaris

          - const: qcom,sdm845



      - items:

          - enum:

              - sony,pdx201

          - const: qcom,sm6125



      - items:

          - enum:

              - sony,pdx213

          - const: qcom,sm6350



      - items:

      - items:

          - enum:

          - enum:

              - fairphone,fp4

              - fairphone,fp4
@@ -598,19 +687,29 @@ properties: 




      - items:

      - items:

          - enum:

          - enum:

              - microsoft,surface-duo

              - qcom,sm8150-hdk

              - qcom,sm8150-mtp

              - qcom,sm8150-mtp

              - sony,bahamut-generic

              - sony,griffin-generic

          - const: qcom,sm8150

          - const: qcom,sm8150





      - items:

      - items:

          - enum:

          - enum:

              - qcom,qrb5165-rb5

              - qcom,qrb5165-rb5

              - qcom,sm8250-hdk

              - qcom,sm8250-mtp

              - qcom,sm8250-mtp

              - sony,pdx203-generic

              - sony,pdx206-generic

          - const: qcom,sm8250

          - const: qcom,sm8250





      - items:

      - items:

          - enum:

          - enum:

              - microsoft,surface-duo2

              - qcom,sm8350-hdk

              - qcom,sm8350-hdk

              - qcom,sm8350-mtp

              - qcom,sm8350-mtp

              - sony,pdx214-generic

              - sony,pdx215-generic

          - const: qcom,sm8350

          - const: qcom,sm8350





      - items:

      - items:

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,8 +63,8 @@ additionalProperties: true 
examples:

examples:

  - |

  - |

    / {

    / {

        model = "Qualcomm Technologies, Inc. QCS404";

        model = "Qualcomm Technologies, Inc. QCS404 EVB 1000";

        compatible = "qcom,qcs404";

        compatible = "qcom,qcs404-evb-1000", "qcom,qcs404-evb", "qcom,qcs404";

        #address-cells = <2>;

        #address-cells = <2>;

        #size-cells = <2>;

        #size-cells = <2>;

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Original line Diff line number Diff line
@@ -1103,6 +1103,8 @@ patternProperties: 
    description: SGX Sensortech

    description: SGX Sensortech

  "^sharp,.*":

  "^sharp,.*":

    description: Sharp Corporation

    description: Sharp Corporation

  "^shift,.*":

    description: SHIFT GmbH

  "^shimafuji,.*":

  "^shimafuji,.*":

    description: Shimafuji Electric, Inc.

    description: Shimafuji Electric, Inc.

  "^shiratech,.*":

  "^shiratech,.*":

arch/arm64/boot/dts/qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-akari.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-akatsuki.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-akatsuki.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-apollo.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-apollo.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-beryllium.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-beryllium.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-polaris.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-shift-axolotl.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-shift-axolotl.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-samsung-w737.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-samsung-w737.dtb

arch/arm64/boot/dts/qcom/ipq8074-hk01.dts

+0 −3
Original line number Original line Diff line number Diff line
@@ -5,11 +5,8 @@ 
#include "ipq8074.dtsi"

#include "ipq8074.dtsi"





/ {

/ {

	#address-cells = <0x2>;

	#size-cells = <0x2>;

	model = "Qualcomm Technologies, Inc. IPQ8074-HK01";

	model = "Qualcomm Technologies, Inc. IPQ8074-HK01";

	compatible = "qcom,ipq8074-hk01", "qcom,ipq8074";

	compatible = "qcom,ipq8074-hk01", "qcom,ipq8074";

	interrupt-parent = <&intc>;





	aliases {

	aliases {

		serial0 = &blsp1_uart5;

		serial0 = &blsp1_uart5;