Unverified Commit 936fc53f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-5.16' of... 

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

Qualcomm driver updates for v5.16

This drops the use of power-domains for exposing the load_state from the
QMP driver to clients, to avoid issues related to system suspend.

SMP2P becomes wakeup capable, to allow dying remoteprocs to wake up
Linux from suspend to perform recovery.

It adds RPM power-domain support for SM6350 and MSM8953 and base RPM
support for MSM8953 and QCM2290.

It adds support for MSM8996, SDM630 and SDM660 in the SPM driver, which
will enable the introduction of proper voltage scaling of the CPU
subsystem.

Support for releasing secondary CPUs on MSM8226 is introduced.

The Asynchronous Packet Router (APR) driver is extended to support the
new Generic Packet Router (GPR) variant, which is used to communicate
with the firmware in the new AudioReach audio driver.

Lastly it transitions a number of drivers to safer string functions, as
well as switching things to use devm_platform_ioremap_resource().

* tag 'qcom-drivers-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (40 commits)
  soc: qcom: apr: Add GPR support
  soc: dt-bindings: qcom: add gpr bindings
  soc: qcom: apr: make code more reuseable
  soc: dt-bindings: qcom: apr: deprecate qcom,apr-domain property
  soc: dt-bindings: qcom: apr: convert to yaml
  dt-bindings: soc: qcom: aoss: Delete unused power-domain definitions
  dt-bindings: msm/dp: Remove aoss-qmp header
  soc: qcom: aoss: Drop power domain support
  dt-bindings: soc: qcom: aoss: Drop the load state power-domain
  soc: qcom: smp2p: Add wakeup capability to SMP2P IRQ
  dt-bindings: power: rpmpd: Add SM6350 to rpmpd binding
  dt-bindings: soc: qcom: aoss: Add SM6350 compatible
  soc: qcom: llcc: Disable MMUHWT retention
  soc: qcom: smd-rpm: Add QCM2290 compatible
  dt-bindings: soc: qcom: smd-rpm: Add QCM2290 compatible
  firmware: qcom_scm: Add compatible for MSM8953 SoC
  dt-bindings: firmware: qcom-scm: Document msm8953 bindings
  soc: qcom: pdr: Prefer strscpy over strcpy
  soc: qcom: rpmh-rsc: Make use of the helper function devm_platform_ioremap_resource_byname()
  soc: qcom: gsbi: Make use of the helper function devm_platform_ioremap_resource()
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 030f4e72 f2759112

Documentation/devicetree/bindings/arm/cpus.yaml

+2 −1
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ properties: 
          - qcom,gcc-msm8660

          - qcom,kpss-acc-v1

          - qcom,kpss-acc-v2

          - qcom,msm8226-smp

          - renesas,apmu

          - renesas,r9a06g032-smp

          - rockchip,rk3036-smp
@@ -293,7 +294,7 @@ properties: 
      Specifies the ACC* node associated with this CPU.



      Required for systems that have an "enable-method" property

      value of "qcom,kpss-acc-v1" or "qcom,kpss-acc-v2"

      value of "qcom,kpss-acc-v1", "qcom,kpss-acc-v2" or "qcom,msm8226-smp"



      * arm/msm/qcom,kpss-acc.txt

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ examples: 
  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/qcom,dispcc-sc7180.h>

    #include <dt-bindings/power/qcom-aoss-qmp.h>

    #include <dt-bindings/power/qcom-rpmpd.h>



    displayport-controller@ae90000 {

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+3 −1
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ Required properties: 
 * "qcom,scm-ipq806x"

 * "qcom,scm-ipq8074"

 * "qcom,scm-mdm9607"

 * "qcom,scm-msm8226"

 * "qcom,scm-msm8660"

 * "qcom,scm-msm8916"

 * "qcom,scm-msm8953"

 * "qcom,scm-msm8960"

 * "qcom,scm-msm8974"

 * "qcom,scm-msm8994"
@@ -33,7 +35,7 @@ Required properties: 
 * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and

   "qcom,scm-msm8960"

 * core, iface and bus clocks required for "qcom,scm-apq8084",

   "qcom,scm-msm8916" and "qcom,scm-msm8974"

   "qcom,scm-msm8916", "qcom,scm-msm8953" and "qcom,scm-msm8974"

- clock-names: Must contain "core" for the core clock, "iface" for the interface

  clock and "bus" for the bus clock per the requirements of the compatible.

- qcom,dload-mode: phandle to the TCSR hardware block and offset of the

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - qcom,mdm9607-rpmpd

      - qcom,msm8916-rpmpd

      - qcom,msm8939-rpmpd

      - qcom,msm8953-rpmpd

      - qcom,msm8976-rpmpd

      - qcom,msm8994-rpmpd

      - qcom,msm8996-rpmpd
@@ -31,6 +32,7 @@ properties: 
      - qcom,sdm845-rpmhpd

      - qcom,sdx55-rpmhpd

      - qcom,sm6115-rpmpd

      - qcom,sm6350-rpmhpd

      - qcom,sm8150-rpmhpd

      - qcom,sm8250-rpmhpd

      - qcom,sm8350-rpmhpd

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

+2 −10
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ description: 


  The AOSS side channel exposes control over a set of resources, used to control

  a set of debug related clocks and to affect the low power state of resources

  related to the secondary subsystems. These resources are exposed as a set of

  power-domains.

  related to the secondary subsystems.



properties:

  compatible:
@@ -30,6 +29,7 @@ properties: 
          - qcom,sc7280-aoss-qmp

          - qcom,sc8180x-aoss-qmp

          - qcom,sdm845-aoss-qmp

          - qcom,sm6350-aoss-qmp

          - qcom,sm8150-aoss-qmp

          - qcom,sm8250-aoss-qmp

          - qcom,sm8350-aoss-qmp
@@ -57,13 +57,6 @@ properties: 
    description:

      The single clock represents the QDSS clock.



  "#power-domain-cells":

    const: 1

    description: |

        The provided power-domains are:

        CDSP state (0), LPASS state (1), modem state (2), SLPI

        state (3), SPSS state (4) and Venus state (5).



required:

  - compatible

  - reg
@@ -101,7 +94,6 @@ examples: 
      mboxes = <&apss_shared 0>;



      #clock-cells = <0>;

      #power-domain-cells = <1>;



      cx_cdev: cx {

        #cooling-cells = <2>;