lkml.org 
[lkml]   [2021]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v3] thermal: qcom: tsens-v0_1: Add support for MDM9607
From
Date


On 2/9/21 2:25 PM, 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>
> Acked-by: Rob Herring <robh@kernel.org>
>
> ---
> Changes since v2:
> - Address Bjorn's comments (remove redundant variable and kfree)
> .../bindings/thermal/qcom-tsens.yaml | 2 +
> drivers/thermal/qcom/tsens-v0_1.c | 99 ++++++++++++++++++-
> drivers/thermal/qcom/tsens.c | 3 +
> drivers/thermal/qcom/tsens.h | 2 +-
> 4 files changed, 104 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

This should be split into two different patches. DT binding changes is
usually not combined with driver changes because two different
maintainers handle them. Also checkpatch.pl throws a warning stating the
same.

> - 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..a9fc92a4779b 100644
> --- a/drivers/thermal/qcom/tsens-v0_1.c
> +++ b/drivers/thermal/qcom/tsens-v0_1.c
> @@ -190,6 +190,39 @@
>
> #define BIT_APPEND 0x3
>
> +/* 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
> +
> static int calibrate_8916(struct tsens_priv *priv)
> {
> int base0 = 0, base1 = 0, i;
> @@ -452,7 +485,56 @@ static int calibrate_8974(struct tsens_priv *priv)
> return 0;
> }
>
> -/* v0.1: 8916, 8939, 8974 */
> +static int calibrate_9607(struct tsens_priv *priv)
> +{
> + int base, i;
> + u32 p1[5], p2[5];
> + int mode = 0;
> + u32 *qfprom_cdata;
> +
> + 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;
> + dev_dbg(priv->dev, "calibration mode is %d\n", mode);
> +
> + switch (mode) {
> + case TWO_PT_CALIB:
> + base = (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] = ((base + p2[i]) << 2);
> + fallthrough;
> + case ONE_PT_CALIB2:
> + base = (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] = (((base) + p1[i]) << 2);

minor nit: extra braces around base

> + 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);
> +
> + return 0;
> +}
> +
> +/* v0.1: 8916, 8939, 8974, 9607 */
>
> static struct tsens_features tsens_v0_1_feat = {
> .ver_major = VER_0_1,
> @@ -540,3 +622,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 },
> +

please remove the stray blank line.

--
Warm Regards
Thara

\
 
 \ /
  Last update: 2021-03-17 23:39    [W:0.051 / U:0.644 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site