Commit cda1138f authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm driver updates for v5.14

In addition to fixing a kerneldoc issue in the qcom-ebi2 driver this
populates socinfo with a range of platforms and PMICs and extends a few
of the Qualcomm drivers bits of support for MSM8226, MDM9607, SM6125 and
SC8180X.

* tag 'qcom-drivers-for-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  firmware: qcom_scm: Add MDM9607 compatible
  soc: qcom: rpmpd: Add MDM9607 RPM Power Domains
  soc: qcom: smd-rpm: Add MSM8226 compatible
  dt-bindings: soc: qcom: smd-rpm: Add MSM8226 compatible
  soc: qcom: socinfo: import PMIC IDs from pmic-spmi
  bus: qcom-ebi2: Fix incorrect documentation for '{slow,fast}_cfg'
  soc: qcom: socinfo: Add more IDs
  soc: qcom: rpmhpd: Add SC8180X
  dt-bindings: power: rpmpd: Add SC8180X to rpmpd binding
  dt-bindings: soc: qcom: smd-rpm: Document SM6125 compatible
  soc: qcom: smd-rpm: Add SM6125 compatible
  soc: qcom: socinfo: Add remaining IPQ6018 family ID-s
  soc: qcom: socinfo: Add missing SoC ID for SM6125

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ec3171d7 82a6cbf0

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
 * "qcom,scm-ipq4019"

 * "qcom,scm-ipq806x"

 * "qcom,scm-ipq8074"

 * "qcom,scm-mdm9607"

 * "qcom,scm-msm8660"

 * "qcom,scm-msm8916"

 * "qcom,scm-msm8960"

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ description: 
properties:

  compatible:

    enum:

      - qcom,mdm9607-rpmpd

      - qcom,msm8916-rpmpd

      - qcom,msm8939-rpmpd

      - qcom,msm8976-rpmpd
@@ -26,6 +27,7 @@ properties: 
      - qcom,sdm660-rpmpd

      - qcom,sc7180-rpmhpd

      - qcom,sc7280-rpmhpd

      - qcom,sc8180x-rpmhpd

      - qcom,sdm845-rpmhpd

      - qcom,sdx55-rpmhpd

      - qcom,sm8150-rpmhpd

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

+2 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ properties: 
    enum:

      - qcom,rpm-apq8084

      - qcom,rpm-ipq6018

      - qcom,rpm-msm8226

      - qcom,rpm-msm8916

      - qcom,rpm-msm8974

      - qcom,rpm-msm8976

      - qcom,rpm-msm8996

      - qcom,rpm-msm8998

      - qcom,rpm-sdm660

      - qcom,rpm-sm6125

      - qcom,rpm-qcs404



  qcom,smd-channels:

drivers/bus/qcom-ebi2.c

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ 
/**

 * struct cs_data - struct with info on a chipselect setting

 * @enable_mask: mask to enable the chipselect in the EBI2 config

 * @slow_cfg0: offset to XMEMC slow CS config

 * @fast_cfg1: offset to XMEMC fast CS config

 * @slow_cfg: offset to XMEMC slow CS config

 * @fast_cfg: offset to XMEMC fast CS config

 */

struct cs_data {

	u32 enable_mask;

drivers/firmware/qcom_scm.c

+3 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,9 @@ static const struct of_device_id qcom_scm_dt_match[] = { 
							     SCM_HAS_BUS_CLK)

	},

	{ .compatible = "qcom,scm-ipq4019" },

	{ .compatible = "qcom,scm-mdm9607", .data = (void *)(SCM_HAS_CORE_CLK |

							     SCM_HAS_IFACE_CLK |

							     SCM_HAS_BUS_CLK) },

	{ .compatible = "qcom,scm-msm8660", .data = (void *) SCM_HAS_CORE_CLK },

	{ .compatible = "qcom,scm-msm8960", .data = (void *) SCM_HAS_CORE_CLK },

	{ .compatible = "qcom,scm-msm8916", .data = (void *)(SCM_HAS_CORE_CLK |