From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Konrad Dybcio <konrad.dybcio@somainline.org>
Cc: phone-devel@vger.kernel.org,
~postmarketos/upstreaming@lists.sr.ht,
Amit Kucheria <amitk@kernel.org>, Andy Gross <agross@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] thermal: qcom: tsens-v0_1: Add support for MDM9607
Date: Wed, 27 Jan 2021 12:31:29 -0600 [thread overview]
Message-ID: <YBGxgSb8TJeYH6mw@builder.lan> (raw)
In-Reply-To: <20210127181400.44642-1-konrad.dybcio@somainline.org>
On Wed 27 Jan 12:14 CST 2021, Konrad Dybcio wrote:
> MDM9607 TSENS IP is very similar to the one of MSM8916, with
> minor adjustments to various tuning values.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
> .../bindings/thermal/qcom-tsens.yaml | 2 +
> drivers/thermal/qcom/tsens-v0_1.c | 100 +++++++++++++++++-
> drivers/thermal/qcom/tsens.c | 3 +
> drivers/thermal/qcom/tsens.h | 2 +-
> 4 files changed, 105 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> index 95462e071ab4..8ad9dc139c23 100644
> --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> @@ -22,6 +22,7 @@ properties:
> - description: v0.1 of TSENS
> items:
> - enum:
> + - qcom,mdm9607-tsens
> - qcom,msm8916-tsens
> - qcom,msm8939-tsens
> - qcom,msm8974-tsens
> @@ -94,6 +95,7 @@ allOf:
> compatible:
> contains:
> enum:
> + - qcom,mdm9607-tsens
> - qcom,msm8916-tsens
> - qcom,msm8974-tsens
> - qcom,msm8976-tsens
> diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
> index 4ffa2e2c0145..8efe925b860f 100644
> --- a/drivers/thermal/qcom/tsens-v0_1.c
> +++ b/drivers/thermal/qcom/tsens-v0_1.c
> @@ -126,6 +126,39 @@
> #define CAL_SEL_SHIFT 30
> #define CAL_SEL_SHIFT_2 28
>
> +/* eeprom layout data for mdm9607 */
> +#define MDM9607_BASE0_MASK 0x000000ff
> +#define MDM9607_BASE1_MASK 0x000ff000
> +#define MDM9607_BASE0_SHIFT 0
> +#define MDM9607_BASE1_SHIFT 12
> +
> +#define MDM9607_S0_P1_MASK 0x00003f00
> +#define MDM9607_S1_P1_MASK 0x03f00000
> +#define MDM9607_S2_P1_MASK 0x0000003f
> +#define MDM9607_S3_P1_MASK 0x0003f000
> +#define MDM9607_S4_P1_MASK 0x0000003f
> +
> +#define MDM9607_S0_P2_MASK 0x000fc000
> +#define MDM9607_S1_P2_MASK 0xfc000000
> +#define MDM9607_S2_P2_MASK 0x00000fc0
> +#define MDM9607_S3_P2_MASK 0x00fc0000
> +#define MDM9607_S4_P2_MASK 0x00000fc0
> +
> +#define MDM9607_S0_P1_SHIFT 8
> +#define MDM9607_S1_P1_SHIFT 20
> +#define MDM9607_S2_P1_SHIFT 0
> +#define MDM9607_S3_P1_SHIFT 12
> +#define MDM9607_S4_P1_SHIFT 0
> +
> +#define MDM9607_S0_P2_SHIFT 14
> +#define MDM9607_S1_P2_SHIFT 26
> +#define MDM9607_S2_P2_SHIFT 6
> +#define MDM9607_S3_P2_SHIFT 18
> +#define MDM9607_S4_P2_SHIFT 6
> +
> +#define MDM9607_CAL_SEL_MASK 0x00700000
> +#define MDM9607_CAL_SEL_SHIFT 20
> +
> #define S0_P1_SHIFT 8
> #define S1_P1_SHIFT 14
> #define S2_P1_SHIFT 20
> @@ -452,7 +485,57 @@ static int calibrate_8974(struct tsens_priv *priv)
> return 0;
> }
>
> -/* v0.1: 8916, 8939, 8974 */
> +static int calibrate_9607(struct tsens_priv *priv)
> +{
> + int base0 = 0, base1 = 0, i;
Afaict, there's no need to initialize base0 and base1, they are both
assigned to before used.
Also, they are temporary variables within each case (even with the
fallthrough), so you should only need a single "base".
> + u32 p1[5], p2[5];
> + int mode = 0;
> + u32 *qfprom_cdata, *qfprom_csel;
> +
> + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib");
> + if (IS_ERR(qfprom_cdata))
> + return PTR_ERR(qfprom_cdata);
> +
> + mode = (qfprom_cdata[2] & MDM9607_CAL_SEL_MASK) >> MDM9607_CAL_SEL_SHIFT;
How about:
mode = field_get(MDM9607_CAL_SEL_MASK, qfprom_cdata[2]);
and same below.
(I see that this would break the style of the file, perhaps we can clean
that up?)
> + dev_dbg(priv->dev, "calibration mode is %d\n", mode);
> +
> + switch (mode) {
> + case TWO_PT_CALIB:
> + base1 = (qfprom_cdata[2] & MDM9607_BASE1_MASK) >> MDM9607_BASE1_SHIFT;
> + p2[0] = (qfprom_cdata[0] & MDM9607_S0_P2_MASK) >> MDM9607_S0_P2_SHIFT;
> + p2[1] = (qfprom_cdata[0] & MDM9607_S1_P2_MASK) >> MDM9607_S1_P2_SHIFT;
> + p2[2] = (qfprom_cdata[1] & MDM9607_S2_P2_MASK) >> MDM9607_S2_P2_SHIFT;
> + p2[3] = (qfprom_cdata[1] & MDM9607_S3_P2_MASK) >> MDM9607_S3_P2_SHIFT;
> + p2[4] = (qfprom_cdata[2] & MDM9607_S4_P2_MASK) >> MDM9607_S4_P2_SHIFT;
> + for (i = 0; i < priv->num_sensors; i++)
> + p2[i] = ((base1 + p2[i]) << 2);
> + fallthrough;
> + case ONE_PT_CALIB2:
> + base0 = (qfprom_cdata[0] & MDM9607_BASE0_MASK);
> + p1[0] = (qfprom_cdata[0] & MDM9607_S0_P1_MASK) >> MDM9607_S0_P1_SHIFT;
> + p1[1] = (qfprom_cdata[0] & MDM9607_S1_P1_MASK) >> MDM9607_S1_P1_SHIFT;
> + p1[2] = (qfprom_cdata[1] & MDM9607_S2_P1_MASK) >> MDM9607_S2_P1_SHIFT;
> + p1[3] = (qfprom_cdata[1] & MDM9607_S3_P1_MASK) >> MDM9607_S3_P1_SHIFT;
> + p1[4] = (qfprom_cdata[2] & MDM9607_S4_P1_MASK) >> MDM9607_S4_P1_SHIFT;
> + for (i = 0; i < priv->num_sensors; i++)
> + p1[i] = (((base0) + p1[i]) << 2);
> + break;
> + default:
> + for (i = 0; i < priv->num_sensors; i++) {
> + p1[i] = 500;
> + p2[i] = 780;
> + }
> + break;
> + }
> +
> + compute_intercept_slope(priv, p1, p2, mode);
> + kfree(qfprom_cdata);
> + kfree(qfprom_csel);
qfprom_csel seems unused and uninitialized.
Regards,
Bjorn
> +
> + return 0;
> +}
> +
> +/* v0.1: 8916, 8939, 8974, 9607 */
>
> static struct tsens_features tsens_v0_1_feat = {
> .ver_major = VER_0_1,
> @@ -540,3 +623,18 @@ struct tsens_plat_data data_8974 = {
> .feat = &tsens_v0_1_feat,
> .fields = tsens_v0_1_regfields,
> };
> +
> +static const struct tsens_ops ops_9607 = {
> + .init = init_common,
> + .calibrate = calibrate_9607,
> + .get_temp = get_temp_common,
> +};
> +
> +struct tsens_plat_data data_9607 = {
> + .num_sensors = 5,
> + .ops = &ops_9607,
> + .hw_ids = (unsigned int []){ 0, 1, 2, 3, 4 },
> +
> + .feat = &tsens_v0_1_feat,
> + .fields = tsens_v0_1_regfields,
> +};
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index d8ce3a687b80..51c36b9e8e69 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -895,6 +895,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
>
> static const struct of_device_id tsens_table[] = {
> {
> + .compatible = "qcom,mdm9607-tsens",
> + .data = &data_9607,
> + }, {
> .compatible = "qcom,msm8916-tsens",
> .data = &data_8916,
> }, {
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index f40b625f897e..cba64c33b4f9 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -585,7 +585,7 @@ int get_temp_common(const struct tsens_sensor *s, int *temp);
> extern struct tsens_plat_data data_8960;
>
> /* TSENS v0.1 targets */
> -extern struct tsens_plat_data data_8916, data_8939, data_8974;
> +extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607;
>
> /* TSENS v1 targets */
> extern struct tsens_plat_data data_tsens_v1, data_8976;
> --
> 2.30.0
>
next prev parent reply other threads:[~2021-01-27 18:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 18:14 [PATCH] thermal: qcom: tsens-v0_1: Add support for MDM9607 Konrad Dybcio
2021-01-27 18:31 ` Bjorn Andersson [this message]
2021-01-27 18:44 ` Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YBGxgSb8TJeYH6mw@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=phone-devel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.