soc: qcom: rpmpd: Add MDM9607 RPM Power Domains

This SoC while being from 8916 era, makes use of the
newer-style, floor-level management, instead of the older
floor-corner.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210131013233.54666-1-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
index c01bb5f..4807b56 100644 (file)
--- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
+++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
@@ -16,6 +16,7 @@ description:
 properties:
   compatible:
     enum:
+      - qcom,mdm9607-rpmpd
       - qcom,msm8916-rpmpd
       - qcom,msm8939-rpmpd
       - qcom,msm8976-rpmpd

diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c
index 27733b0..0b532a8 100644 (file)
--- a/drivers/soc/qcom/rpmpd.c
+++ b/drivers/soc/qcom/rpmpd.c
@@ -118,6 +118,27 @@ struct rpmpd_desc {
 
 static DEFINE_MUTEX(rpmpd_lock);
 
+/* mdm9607 RPM Power Domains */
+DEFINE_RPMPD_PAIR(mdm9607, vddcx, vddcx_ao, SMPA, LEVEL, 3);
+DEFINE_RPMPD_VFL(mdm9607, vddcx_vfl, SMPA, 3);
+
+DEFINE_RPMPD_PAIR(mdm9607, vddmx, vddmx_ao, LDOA, LEVEL, 12);
+DEFINE_RPMPD_VFL(mdm9607, vddmx_vfl, LDOA, 12);
+static struct rpmpd *mdm9607_rpmpds[] = {
+       [MDM9607_VDDCX] =       &mdm9607_vddcx,
+       [MDM9607_VDDCX_AO] =    &mdm9607_vddcx_ao,
+       [MDM9607_VDDCX_VFL] =   &mdm9607_vddcx_vfl,
+       [MDM9607_VDDMX] =       &mdm9607_vddmx,
+       [MDM9607_VDDMX_AO] =    &mdm9607_vddmx_ao,
+       [MDM9607_VDDMX_VFL] =   &mdm9607_vddmx_vfl,
+};
+
+static const struct rpmpd_desc mdm9607_desc = {
+       .rpmpds = mdm9607_rpmpds,
+       .num_pds = ARRAY_SIZE(mdm9607_rpmpds),
+       .max_state = RPM_SMD_LEVEL_TURBO,
+};
+
 /* msm8939 RPM Power Domains */
 DEFINE_RPMPD_PAIR(msm8939, vddmd, vddmd_ao, SMPA, CORNER, 1);
 DEFINE_RPMPD_VFC(msm8939, vddmd_vfc, SMPA, 1);
@@ -326,6 +347,7 @@ static const struct rpmpd_desc sdm660_desc = {
 };
 
 static const struct of_device_id rpmpd_match_table[] = {
+       { .compatible = "qcom,mdm9607-rpmpd", .data = &mdm9607_desc },
        { .compatible = "qcom,msm8916-rpmpd", .data = &msm8916_desc },
        { .compatible = "qcom,msm8939-rpmpd", .data = &msm8939_desc },
        { .compatible = "qcom,msm8976-rpmpd", .data = &msm8976_desc },

diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h
index 93c134f..8b5708b 100644 (file)
--- a/include/dt-bindings/power/qcom-rpmpd.h
+++ b/include/dt-bindings/power/qcom-rpmpd.h
@@ -108,6 +108,14 @@
 #define RPMH_REGULATOR_LEVEL_TURBO     384
 #define RPMH_REGULATOR_LEVEL_TURBO_L1  416
 
+/* MDM9607 Power Domains */
+#define MDM9607_VDDCX          0
+#define MDM9607_VDDCX_AO       1
+#define MDM9607_VDDCX_VFL      2
+#define MDM9607_VDDMX          3
+#define MDM9607_VDDMX_AO       4
+#define MDM9607_VDDMX_VFL      5
+
 /* MSM8939 Power Domains */
 #define MSM8939_VDDMDCX                0
 #define MSM8939_VDDMDCX_AO     1