Commit ce8ccf21 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm driver updates for 5.12

The socinfo driver gains support for dumping information about the platform's
PMICs, as well as new definitions for a number of platforms. The LLCC driver
gains SM8250 support, AOSS QMP gains SM8350 support and the RPMPD driver gains
support for MSM8994 power domains. In addition to this it contains a few minor
fixes in the ocmem, rpmh and llcc drivers.

* tag 'qcom-drivers-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: ocmem: don't return NULL in of_get_ocmem
  soc: qcom: socinfo: Remove unwanted le32_to_cpu()
  soc: qcom: aoss: Add SM8350 compatible
  drivers: soc: qcom: rpmpd: Add msm8994 RPM Power Domains
  soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
  soc: qcom: socinfo: Fix off-by-one array index bounds check
  soc: qcom: socinfo: Add MDM9607 IDs
  soc: qcom: socinfo: Add SoC IDs for APQ/MSM8998
  soc: qcom: socinfo: Add SoC IDs for 630 family
  soc: qcom: socinfo: Open read access to all for debugfs
  soc: qcom: socinfo: add info from PMIC models array
  soc: qcom: socinfo: add several PMIC IDs
  soc: qcom: socinfo: add qrb5165 SoC ID
  soc: qcom: rpmh: Remove serialization of TCS commands
  soc: qcom: smem: use %*ph to print small buffer
  dt-bindings: soc: qcom: convert qcom,smem bindings to yaml
  drivers: qcom: rpmh-rsc: Do not read back the register write on trigger
  soc: qcom: llcc-qcom: Add support for SM8250 SoC
  soc: qcom: llcc-qcom: Extract major hardware version
  dt-bindings: msm: Add LLCC for SM8250

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


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

Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - qcom,sc7180-llcc

      - qcom,sdm845-llcc

      - qcom,sm8150-llcc

      - qcom,sm8250-llcc



  reg:

    items:

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

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

      - qcom,msm8939-rpmpd

      - qcom,msm8976-rpmpd

      - qcom,msm8994-rpmpd

      - qcom,msm8996-rpmpd

      - qcom,msm8998-rpmpd

      - qcom,qcs404-rpmpd

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ power-domains. 
		    "qcom,sdm845-aoss-qmp"

		    "qcom,sm8150-aoss-qmp"

		    "qcom,sm8250-aoss-qmp"

		    "qcom,sm8350-aoss-qmp"



- reg:

	Usage: required

Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
Qualcomm Shared Memory Manager binding



This binding describes the Qualcomm Shared Memory Manager, used to share data

between various subsystems and OSes in Qualcomm platforms.



- compatible:

	Usage: required

	Value type: <stringlist>

	Definition: must be:

		    "qcom,smem"



- memory-region:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: handle to memory reservation for main SMEM memory region.



- qcom,rpm-msg-ram:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: handle to RPM message memory resource



- hwlocks:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: reference to a hwspinlock used to protect allocations from

		    the shared memory



= EXAMPLE

The following example shows the SMEM setup for MSM8974, with a main SMEM region

at 0xfa00000 and the RPM message ram at 0xfc428000:



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		smem_region: smem@fa00000 {

			reg = <0xfa00000 0x200000>;

			no-map;

		};

	};



	smem@fa00000 {

		compatible = "qcom,smem";



		memory-region = <&smem_region>;

		qcom,rpm-msg-ram = <&rpm_msg_ram>;



		hwlocks = <&tcsr_mutex 3>;

	};



	soc {

		rpm_msg_ram: memory@fc428000 {

			compatible = "qcom,rpm-msg-ram";

			reg = <0xfc428000 0x4000>;

		};

	};

Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml

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

%YAML 1.2

---

$id: "http://devicetree.org/schemas/soc/qcom/qcom,smem.yaml#"

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



title: Qualcomm Shared Memory Manager binding



maintainers:

  - Andy Gross <agross@kernel.org>

  - Bjorn Andersson <bjorn.andersson@linaro.org>



description: |

  This binding describes the Qualcomm Shared Memory Manager, used to share data

  between various subsystems and OSes in Qualcomm platforms.



properties:

  compatible:

    const: qcom,smem



  memory-region:

    maxItems: 1

    description: handle to memory reservation for main SMEM memory region.



  hwlocks:

    maxItems: 1



  qcom,rpm-msg-ram:

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

    description: handle to RPM message memory resource



required:

  - compatible

  - memory-region

  - hwlocks



additionalProperties: false



examples:

  - |

    reserved-memory {

        #address-cells = <1>;

        #size-cells = <1>;

        ranges;



        smem_region: smem@fa00000 {

            reg = <0xfa00000 0x200000>;

            no-map;

        };

    };



    smem {

        compatible = "qcom,smem";



        memory-region = <&smem_region>;

        qcom,rpm-msg-ram = <&rpm_msg_ram>;



        hwlocks = <&tcsr_mutex 3>;

    };



    soc {

        #address-cells = <1>;

        #size-cells = <1>;

        ranges;



        rpm_msg_ram: sram@fc428000 {

            compatible = "qcom,rpm-msg-ram";

            reg = <0xfc428000 0x4000>;

        };

    };



...