From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41C57C433DB for ; Wed, 27 Jan 2021 18:32:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 081E164DA5 for ; Wed, 27 Jan 2021 18:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229563AbhA0ScV (ORCPT ); Wed, 27 Jan 2021 13:32:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236860AbhA0ScN (ORCPT ); Wed, 27 Jan 2021 13:32:13 -0500 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02F56C061573 for ; Wed, 27 Jan 2021 10:31:33 -0800 (PST) Received: by mail-oi1-x236.google.com with SMTP id p5so3201461oif.7 for ; Wed, 27 Jan 2021 10:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yVWoKHNM7lw4JJ/3R5+3VSNvZx03Tl0bTWmV8GTC02w=; b=k9MByBKBaEvLqw/1ZnE4FDzS2PWZ2raXIIAQ9pF4FCKjcQxtBWJb8r8gDevS0xsGV1 v+F4X2o2BxYadaVpOC03AsibKTRKVzaZdY0XRPBkXHgisS1CDefoNO0HVT+hwjLqn8w1 43r28jPTqAKNX1hpKiQ7KcosSddu+Can4yAI90dRswRV+8+1HzDL4mRwKpEhB70kh2+p AGfHlRNFHzPvkAZ1v6lIELstUE1/ygE5nODvZ4U/xKYUIuYE9ABW10bvKfO6sWiBj04u C6o9B8jsjuWmTuRp0kL1tJfb77Xdql0oaqpIo6r9+WJ2zy/YKQsF29RaKelfG5rAo1Fx rOkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yVWoKHNM7lw4JJ/3R5+3VSNvZx03Tl0bTWmV8GTC02w=; b=RBtFD/irCeq2UIMysv3OYYmBHZ7X6mofVqlNVaLj8xI5ALR2djDKPADgO21WUBHrNy y4OAQS+3Gt2xVDwlv2MCEP7fUsABDNsf0qfpEE8UhmgqPUil50wNEAGRp0ftQdSZCMgn Oi0Wk4A6fjkFoTh3AHyIo37Pcig+rzQgKThjdO8YdkH8oDLmtXwy7LUuiKDTGCE8qyxW v0OFrvGxacZQhDr583RPrWFAON5IwgFzY/f8YQt2ecMvhKhvvsK76nh45kgCt3xnqGHB Vuwa3u55L7prYeniv0eK7p5tkJmhNtGBAyPwyErd3pI/rLZuunSVM1w+FQe3wa1KVO07 pRTg== X-Gm-Message-State: AOAM532NREXZ9ndJ4haFBh5N6Tjr+HeraQyT7TdiQ94dF+wfufmSMQUs sXmxJERw47hGCHvgWmvEoK3iwg== X-Google-Smtp-Source: ABdhPJy8bR6AFXrBYCqGrBDUYSv2db5BeNn4aUMcSxCBVf20H/6bf6jWR8XN782H2PhavV5aafylxQ== X-Received: by 2002:aca:49d0:: with SMTP id w199mr4320762oia.61.1611772292318; Wed, 27 Jan 2021 10:31:32 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id m133sm570115oig.44.2021.01.27.10.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 10:31:31 -0800 (PST) Date: Wed, 27 Jan 2021 12:31:29 -0600 From: Bjorn Andersson To: Konrad Dybcio Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Amit Kucheria , Andy Gross , Zhang Rui , Daniel Lezcano , Rob Herring , 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 Message-ID: References: <20210127181400.44642-1-konrad.dybcio@somainline.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210127181400.44642-1-konrad.dybcio@somainline.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.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 > --- > .../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 >