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

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

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

More Qualcomm driver updates for 6.3

The qcom_scm.h file is moved into firmware/qcom, to avoid having any
Qualcomm-specific files directly in include/linux.

Support for PMIC GLINK is introduced, which on newer Qualcomm platforms
provides an interface to the firmware implementing battery management
and USB Type-C handling. Together with the base driver comes the custom
altmode support driver.

SMD RPM gains support for IPQ9574, and socinfo is extended with support
for revision 17 of the information format and soc_id for IPQ5332 and
IPQ8064 are added.

The qcom_stats  is changes not to fail when not all parts are
initialized.

* tag 'qcom-drivers-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: socinfo: Add IDs for IPQ5332 and its variant
  dt-bindings: arm: qcom,ids: Add IDs for IPQ5332 and its variant
  dt-bindings: power: qcom,rpmpd: add RPMH_REGULATOR_LEVEL_LOW_SVS_L1
  firmware: qcom_scm: Move qcom_scm.h to include/linux/firmware/qcom/
  MAINTAINERS: Update qcom CPR maintainer entry
  dt-bindings: firmware: document Qualcomm SM8550 SCM
  dt-bindings: firmware: qcom,scm: add qcom,scm-sa8775p compatible
  soc: qcom: socinfo: Add Soc IDs for IPQ8064 and variants
  dt-bindings: arm: qcom,ids: Add Soc IDs for IPQ8064 and variants
  soc: qcom: socinfo: Add support for new field in revision 17
  soc: qcom: smd-rpm: Add IPQ9574 compatible
  soc: qcom: pmic_glink: remove redundant calculation of svid
  soc: qcom: stats: Populate all subsystem debugfs files
  dt-bindings: soc: qcom,rpmh-rsc: Update to allow for generic nodes
  soc: qcom: pmic_glink: add CONFIG_NET/CONFIG_OF dependencies
  soc: qcom: pmic_glink: Introduce altmode support
  soc: qcom: pmic_glink: Introduce base PMIC GLINK driver
  dt-bindings: soc: qcom: Introduce PMIC GLINK binding
  soc: qcom: dcc: Drop driver for now

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 01e9d2c6 b0bc8c89

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

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
          - qcom,scm-msm8996

          - qcom,scm-msm8998

          - qcom,scm-qdu1000

          - qcom,scm-sa8775p

          - qcom,scm-sc7180

          - qcom,scm-sc7280

          - qcom,scm-sc8280xp
@@ -54,6 +55,7 @@ properties: 
          - qcom,scm-sm8250

          - qcom,scm-sm8350

          - qcom,scm-sm8450

          - qcom,scm-sm8550

          - qcom,scm-qcs404

      - const: qcom,scm
@@ -165,6 +167,7 @@ allOf: 
            contains:

              enum:

                - qcom,scm-sm8450

                - qcom,scm-sm8550

    then:

      properties:

        interconnects: false
@@ -177,6 +180,7 @@ allOf: 
            contains:

              enum:

                - qcom,scm-sm8450

                - qcom,scm-sm8550

    then:

      properties:

        interrupts: false

Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml

0 → 100644
+95 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/soc/qcom/qcom,pmic-glink.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm PMIC GLINK firmware interface for battery management, USB

  Type-C and other things.



maintainers:

  - Bjorn Andersson <andersson@kernel.org>



description:

  The PMIC GLINK service, running on a coprocessor on some modern Qualcomm

  platforms and implement USB Type-C handling and battery management. This

  binding describes the component in the OS used to communicate with the

  firmware and connect it's resources to those described in the Devicetree,

  particularly the USB Type-C controllers relationship with USB and DisplayPort

  components.



properties:

  compatible:

    items:

      - enum:

          - qcom,sc8180x-pmic-glink

          - qcom,sc8280xp-pmic-glink

          - qcom,sm8350-pmic-glink

      - const: qcom,pmic-glink



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



patternProperties:

  '^connector@\d$':

    $ref: /schemas/connector/usb-connector.yaml#



    properties:

      reg: true



    required:

      - reg



    unevaluatedProperties: false



required:

  - compatible



additionalProperties: false



examples:

  - |+

    pmic-glink {

        compatible = "qcom,sc8280xp-pmic-glink", "qcom,pmic-glink";



        #address-cells = <1>;

        #size-cells = <0>;



        connector@0 {

            compatible = "usb-c-connector";

            reg = <0>;

            power-role = "dual";

            data-role = "dual";



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    endpoint {

                        remote-endpoint = <&usb_role>;

                    };

                };



                port@1 {

                    reg = <1>;

                    endpoint {

                        remote-endpoint = <&ss_phy_out>;

                    };

                };



                port@2 {

                    reg = <2>;

                    endpoint {

                        remote-endpoint = <&sbu_mux>;

                    };

                };

            };

        };

    };

...

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

+2 −1
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ properties: 
    $ref: /schemas/power/qcom,rpmpd.yaml#



patternProperties:

  '-regulators$':

  '^regulators(-[0-9])?$':

    $ref: /schemas/regulator/qcom,rpmh-regulator.yaml#

    unevaluatedProperties: false



required:

  - compatible

MAINTAINERS

+2 −9
Original line number Diff line number Diff line
@@ -5821,14 +5821,6 @@ W: http://lists.twibble.org/mailman/listinfo/dc395x/ 
F:	Documentation/scsi/dc395x.rst

F:	drivers/scsi/dc395x.*









DCC QTI DRIVER









M:	Souradeep Chowdhury <quic_schowdhu@quicinc.com>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/ABI/testing/debugfs-driver-dcc









F:	Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml









F:	drivers/soc/qcom/dcc.c

















DCCP PROTOCOL









L:	dccp@vger.kernel.org









S:	Orphan








@@ -17263,7 +17255,8 @@ F:	drivers/clk/qcom/







F:	include/dt-bindings/clock/qcom,*

















QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER









M:	Niklas Cassel <nks@flawful.org>









M:	Bjorn Andersson <andersson@kernel.org>









M:	Konrad Dybcio <konrad.dybcio@linaro.org>









L:	linux-pm@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained
































arch/arm/mach-qcom/platsmp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -14,7 +14,7 @@







#include <linux/of_address.h>









#include <linux/smp.h>









#include <linux/io.h>









#include <linux/qcom_scm.h>









#include <linux/firmware/qcom/qcom_scm.h>



















#include <asm/smp_plat.h>