Re: [PATCH 5/5] soc: qcom: rpmpd: Add rpm power domains for msm8956

[AngeloGioacchino Del Regno <kholk11@xxxxxxxxx>]

Il giorno sab 5 ott 2019 alle ore 06:26 Bjorn Andersson
<bjorn.andersson@xxxxxxxxxx> ha scritto:
>
> On Sat 21 Sep 03:12 PDT 2019, kholk11@xxxxxxxxx wrote:
>
> > From: "Angelo G. Del Regno" <kholk11@xxxxxxxxx>
> >
> > The MSM8956 SoC has two main voltage-level power domains, VDD_CX
> > and VDD_MX, which also have their own voltage-floor-level (VFL)
> > corner.
> >
> > Signed-off-by: Angelo G. Del Regno <kholk11@xxxxxxxxx>
>
> I was under the impression that 8956/76 can be used interchangeably, if
> so I would prefer if you pick one (8976 as that seems to be your common
> choice) and stick with that.
>
> If not, I think it would be nice if all bindings came with both
> compatibles.
>
> Regards,
> Bjorn
>
> > ---
> >  .../devicetree/bindings/power/qcom,rpmpd.txt  |  1 +
> >  drivers/soc/qcom/rpmpd.c                      | 23 +++++++++++++++++++
> >  include/dt-bindings/power/qcom-rpmpd.h        |  8 +++++++
> >  3 files changed, 32 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.txt b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt
> > index eb35b22f9e23..30176b1e595a 100644
> > --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.txt
> > +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt
> > @@ -5,6 +5,7 @@ which then translates it into a corresponding voltage on a rail
> >
> >  Required Properties:
> >   - compatible: Should be one of the following
> > +     * qcom,msm8956-rpmpd: RPM Power domain for the msm8956 family of SoC
> >       * qcom,msm8996-rpmpd: RPM Power domain for the msm8996 family of SoC
> >       * qcom,msm8998-rpmpd: RPM Power domain for the msm8998 family of SoC
> >       * qcom,qcs404-rpmpd: RPM Power domain for the qcs404 family of SoC
> > diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c
> > index 3c1a55cf25d6..b50f62851461 100644
> > --- a/drivers/soc/qcom/rpmpd.c
> > +++ b/drivers/soc/qcom/rpmpd.c
> > @@ -115,6 +115,28 @@ struct rpmpd_desc {
> >
> >  static DEFINE_MUTEX(rpmpd_lock);
> >
> > +/* msm8956 RPM Power Domains */
> > +DEFINE_RPMPD_PAIR(msm8956, vddcx, vddcx_ao, SMPA, LEVEL, 2);
> > +DEFINE_RPMPD_PAIR(msm8956, vddmx, vddmx_ao, SMPA, LEVEL, 6);
> > +
> > +DEFINE_RPMPD_VFL(msm8956, vddcx_vfl, RWSC, 2);
> > +DEFINE_RPMPD_VFL(msm8956, vddmx_vfl, RWSM, 6);
> > +
> > +static struct rpmpd *msm8956_rpmpds[] = {
> > +     [MSM8956_VDDCX] =       &msm8956_vddcx,
> > +     [MSM8956_VDDCX_AO] =    &msm8956_vddcx_ao,
> > +     [MSM8956_VDDCX_VFL] =   &msm8956_vddcx_vfl,
> > +     [MSM8956_VDDMX] =       &msm8956_vddmx,
> > +     [MSM8956_VDDMX_AO] =    &msm8956_vddmx_ao,
> > +     [MSM8956_VDDMX_VFL] =   &msm8956_vddmx_vfl,
> > +};
> > +
> > +static const struct rpmpd_desc msm8956_desc = {
> > +     .rpmpds = msm8956_rpmpds,
> > +     .num_pds = ARRAY_SIZE(msm8956_rpmpds),
> > +     .max_state = RPM_SMD_LEVEL_TURBO_HIGH,
> > +};
> > +
> >  /* msm8996 RPM Power domains */
> >  DEFINE_RPMPD_PAIR(msm8996, vddcx, vddcx_ao, SMPA, CORNER, 1);
> >  DEFINE_RPMPD_PAIR(msm8996, vddmx, vddmx_ao, SMPA, CORNER, 2);
> > @@ -198,6 +220,7 @@ static const struct rpmpd_desc qcs404_desc = {
> >  };
> >
> >  static const struct of_device_id rpmpd_match_table[] = {
> > +     { .compatible = "qcom,msm8956-rpmpd", .data = &msm8956_desc },
> >       { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc },
> >       { .compatible = "qcom,msm8998-rpmpd", .data = &msm8998_desc },
> >       { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
> > diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h
> > index 30a0aee0df57..3423f964c233 100644
> > --- a/include/dt-bindings/power/qcom-rpmpd.h
> > +++ b/include/dt-bindings/power/qcom-rpmpd.h
> > @@ -27,6 +27,14 @@
> >  #define RPMH_REGULATOR_LEVEL_TURBO   384
> >  #define RPMH_REGULATOR_LEVEL_TURBO_L1        416
> >
> > +/* MSM8956 Power Domain Indexes */
> > +#define MSM8956_VDDCX                0
> > +#define MSM8956_VDDCX_AO     1
> > +#define MSM8956_VDDCX_VFL    2
> > +#define MSM8956_VDDMX                3
> > +#define MSM8956_VDDMX_AO     4
> > +#define MSM8956_VDDMX_VFL    5
> > +
> >  /* MSM8996 Power Domain Indexes */
> >  #define MSM8996_VDDCX                0
> >  #define MSM8996_VDDCX_AO     1
> > --
> > 2.21.0
> >

Yup. My brain stopped working for a minute on that patch :)))
This is applicable to both MSM8956 and MSM8976... and the other drivers that
I've sent are actually reporting a 8976 compatible, so, yes I'll
resend that one as
8976 instead.