Unverified Commit 99978d2f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

More Qualcomm driver changes for v5.20

This adds support for booting secondary cores, SPM, SMD-RPM and RPM
power-domain support for the MSM8909 platform.

It drops an unnecessary print in icc-bwmon, corrects SA8540P entries in
socinfo and a Kconfig build dependency for QCOM_RPMPD.

Lastly it continues to clean up up the Devicetree bindings for the
Qualcomm drivers.

* tag 'qcom-drivers-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  dt-bindings: soc: qcom: qcom,smd-rpm: add power-controller
  dt-bindings: soc: qcom: aoss: document qcom,sm8450-aoss-qmp
  dt-bindings: soc: qcom,rpmh-rsc: simplify qcom,tcs-config
  ARM: mach-qcom: Add support for MSM8909
  dt-bindings: arm: cpus: Document "qcom,msm8909-smp" enable-method
  soc: qcom: spm: Add CPU data for MSM8909
  dt-bindings: soc: qcom: spm: Add MSM8909 CPU compatible
  soc: qcom: rpmpd: Add compatible for MSM8909
  dt-bindings: power: qcom-rpmpd: Add MSM8909 power domains
  soc: qcom: smd-rpm: Add compatible for MSM8909
  dt-bindings: soc: qcom: smd-rpm: Add MSM8909
  soc: qcom: icc-bwmon: Remove unnecessary print function dev_err()
  soc: qcom: socinfo: Fix the id of SA8540P SoC
  soc: qcom: Make QCOM_RPMPD depend on PM

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f740949d c23b7d49

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ properties: 
          - qcom,kpss-acc-v1

          - qcom,kpss-acc-v2

          - qcom,msm8226-smp

          - qcom,msm8909-smp

          # Only valid on ARM 32-bit, see above for ARM v8 64-bit

          - qcom,msm8916-smp

          - renesas,apmu

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
    enum:

      - qcom,mdm9607-rpmpd

      - qcom,msm8226-rpmpd

      - qcom,msm8909-rpmpd

      - qcom,msm8916-rpmpd

      - qcom,msm8939-rpmpd

      - qcom,msm8953-rpmpd

Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - qcom,sm8150-aoss-qmp

          - qcom,sm8250-aoss-qmp

          - qcom,sm8350-aoss-qmp

          - qcom,sm8450-aoss-qmp

      - const: qcom,aoss-qmp



  reg:

Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml

+11 −22
Original line number Diff line number Diff line
@@ -65,33 +65,22 @@ properties: 


  qcom,tcs-config:

    $ref: /schemas/types.yaml#/definitions/uint32-matrix

    minItems: 4

    maxItems: 4

    items:

      - items:

          - description: TCS type

            enum: [ 0, 1, 2, 3 ]

          - description: Number of TCS

      - items:

          - description: TCS type

            enum: [ 0, 1, 2, 3 ]

          - description: Number of TCS

      - items:

          - description: TCS type

            enum: [ 0, 1, 2, 3]

          - description: Numbe r of TCS

      - items:

          - description: TCS type

      items:

        - description: |

            TCS type::

             - ACTIVE_TCS

             - SLEEP_TCS

             - WAKE_TCS

             - CONTROL_TCS

          enum: [ 0, 1, 2, 3 ]

        - description: Number of TCS

    description: |

      The tuple defining the configuration of TCS. Must have two cells which

      describe each TCS type.  The order of the TCS must match the hardware

      configuration.

      Cell 1 (TCS Type):: TCS types to be specified::

       - ACTIVE_TCS

       - SLEEP_TCS

       - WAKE_TCS

       - CONTROL_TCS

      Cell 2 (Number of TCS):: <u32>



  qcom,tcs-offset:

    $ref: /schemas/types.yaml#/definitions/uint32

Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ properties: 
      - qcom,rpm-apq8084

      - qcom,rpm-ipq6018

      - qcom,rpm-msm8226

      - qcom,rpm-msm8909

      - qcom,rpm-msm8916

      - qcom,rpm-msm8936

      - qcom,rpm-msm8953
@@ -51,6 +52,9 @@ properties: 
    $ref: /schemas/clock/qcom,rpmcc.yaml#

    unevaluatedProperties: false



  power-controller:

    $ref: /schemas/power/qcom,rpmpd.yaml#



  qcom,smd-channels:

    $ref: /schemas/types.yaml#/definitions/string-array

    description: Channel name used for the RPM communication