From patchwork Thu Jan 21 19:15:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 367954 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 96975C4332B for ; Thu, 21 Jan 2021 19:19:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FBC523136 for ; Thu, 21 Jan 2021 19:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727359AbhAUTTB (ORCPT ); Thu, 21 Jan 2021 14:19:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727088AbhAUTRT (ORCPT ); Thu, 21 Jan 2021 14:17:19 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC3CCC0613ED; Thu, 21 Jan 2021 11:16:38 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id m6so2098519pfm.6; Thu, 21 Jan 2021 11:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9TJ+/IkMxCE3Me3OscF6ay8YRP3qL8IEtjgxoP99DSE=; b=FK7MfMHf4SGJILR+sHK0PKOBbz5BrcJSqMkh5Xn57+xD8yXD4MR4CBRO15g37ChqOs UpVFv13HjPHg8N1wO4QJ6ctTUwLuagBBlo51P0y/qCTdWeVcw3yGgmmedPtAjehDdqpJ mOl53FsFj2CIKfqyei1p4qcrymafV2VfHBnFMPqq4MsPv05IIwhA8ZRD9VWkZWWCE3Bh rlNoNGm3cjRTEbjzdZFZjotdFtak5Y2PMH5hDx+t81QQpOtAXV3jtDuKEVmjiXoNcdAK Chv30FnZ6YNP9oOHiSVuM8DxqPFz7K28PfHQCCtnouU5AC9gDJrdjMOd2BVHM4ggkP4E U5MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9TJ+/IkMxCE3Me3OscF6ay8YRP3qL8IEtjgxoP99DSE=; b=graIcfA7CXk8nNSvAVT2PrpLB6/tPxRafQ0obCnsJctM8eBdN6WUwU/7n+OkpQkWo3 yu6dEh9/4nBfN8R38gTgAnSzY4b0CBLCtcn1ev1H8UeUXR0hg9TGAdudJbw4nhmo3KMl f5hiXKDFGpTV8QKkZcn1DYPXaz10f03THm/IIxOSAlrU25jhbe9mX6TLbolhhvBkbsaj BiIOcJjsOdJaoqhRsq2nLlshR5nvD1r8ZczMJa36lmdEu6Sv0VxLq3NNtom4O+uDqJKf OFukLqbY7ZgJb0mLVqMwoX/BZ6j7kq1c3tPxcNfG1KE0tHoFJrswaDiO8hw3/8vZROfQ 4lRQ== X-Gm-Message-State: AOAM531xBEVu3VrhHHE42aEPQwBF7RQzukjRDpAVWjNljRnB98ctdKPI hTu0WWxdka9oBzopc2QMN3o= X-Google-Smtp-Source: ABdhPJyByj5OTVv1UZPdho8rMYmkQjVXKqm48U9EmhAalZM5DKwY17h3hKAyeZMyHT1xJcvOjsHYlQ== X-Received: by 2002:a65:68cb:: with SMTP id k11mr741755pgt.271.1611256598421; Thu, 21 Jan 2021 11:16:38 -0800 (PST) Received: from ansuel-xps20.localdomain (host-79-41-39-5.retail.telecomitalia.it. [79.41.39.5]) by smtp.googlemail.com with ESMTPSA id gg6sm11291013pjb.2.2021.01.21.11.16.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:16:37 -0800 (PST) From: Ansuel Smith To: Amit Kucheria Cc: Ansuel Smith , Andy Gross , Bjorn Andersson , 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: [PATCH v8 2/8] drivers: thermal: tsens: Don't hardcode sensor slope Date: Thu, 21 Jan 2021 20:15:54 +0100 Message-Id: <20210121191601.14403-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121191601.14403-1-ansuelsmth@gmail.com> References: <20210121191601.14403-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Function compute_intercept_slope hardcode the sensor slope to SLOPE_DEFAULT. Change this and use the default value only if a slope is not defined. This is needed for tsens VER_0 that has a hardcoded slope table. Signed-off-by: Ansuel Smith --- drivers/thermal/qcom/tsens.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index eaeaa1d69d92..dd9b41157894 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -86,7 +86,8 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1, "%s: sensor%d - data_point1:%#x data_point2:%#x\n", __func__, i, p1[i], p2[i]); - priv->sensor[i].slope = SLOPE_DEFAULT; + if (!priv->sensor[i].slope) + priv->sensor[i].slope = SLOPE_DEFAULT; if (mode == TWO_PT_CALIB) { /* * slope (m) = adc_code2 - adc_code1 (y2 - y1)/ From patchwork Thu Jan 21 19:15:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 367955 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 A0C77C433DB for ; Thu, 21 Jan 2021 19:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5ADAF23136 for ; Thu, 21 Jan 2021 19:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727343AbhAUTSz (ORCPT ); Thu, 21 Jan 2021 14:18:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727186AbhAUTR7 (ORCPT ); Thu, 21 Jan 2021 14:17:59 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4186FC061794; Thu, 21 Jan 2021 11:16:55 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id g15so2298612pjd.2; Thu, 21 Jan 2021 11:16:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yP+8b8XvGsdxgGgAFZqhFaVyr9bwBdl4LtN4K2NEQ40=; b=F3/fX+nIsjIqArVF4sHR0hFqYdbZKyD+cLISGK+Yu7+I2zpt6HoVolNpC3uv0HIC6Y b75T6m0qjcTcqk2fNUdfxkX1UNI6LoZ16xC8DIDIXYQvakT0mh+pajsQoWKA3no4XgG3 8m6UhKba89bZG0ldbO4H5yH44LX1SN8P+LlYGhDlWzKJZHzytrwFQZc1kTGWwgON68j+ W33OzWtVO1ve5bmCiHEif+qFDdAafx0GMQ/AReXl779mht/z4SnBmeOs5+ZXkDG7gXy8 0vBj/VBPsvcfjYdusSWKgxbDWVQ2+/pFtChf+mhr8S1NW8QnTgQ9m/3Y/jJCOQuGF90S P7tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yP+8b8XvGsdxgGgAFZqhFaVyr9bwBdl4LtN4K2NEQ40=; b=eNVpK6jh+EvnomK9zK7+EJp+sqeo11jpgvtuVeJA/oR9fUmFIA8fkHzkUpfVSUhse8 s54XvjNMtZiy5TMSc7oJsNhDdfiq95wnsKjAEHUwqsMxluEweLc+Y9S5beOLX2YBoka8 wY35bt7H8BoLjlo/n8UWIswMD/x508/A9p1IwghqbMeiIqWN1f+piKPVt6+ZnO6P8rIS tDINAW1S4JEJhwJqGeI6lZr8nicdDdgti9X8oFakILFjmC9ZB9W01XIs+41/bEc3hd60 VrPIHrE1f7Elj5CYEquX+pnqo0yi7UugmI8mPmy9Td5nZGNeUk0gcxnw375sERfLyxjr wGCQ== X-Gm-Message-State: AOAM532zrCIDjMl5wV1tPyz7kVm3wiRRCbRg03LxSf1Fdl9HYYWxpitz 0zXPOCmfqklEDnTkA/mPAX8= X-Google-Smtp-Source: ABdhPJwWDMkGkRWSv8MetyQC3EHii10tkXaZA+VJdPrzZmAhRPSoNxNtMQjUsLTONQbML4YKvfxmMQ== X-Received: by 2002:a17:902:e8cf:b029:de:a91c:5ec9 with SMTP id v15-20020a170902e8cfb02900dea91c5ec9mr1159215plg.27.1611256614744; Thu, 21 Jan 2021 11:16:54 -0800 (PST) Received: from ansuel-xps20.localdomain (host-79-41-39-5.retail.telecomitalia.it. [79.41.39.5]) by smtp.googlemail.com with ESMTPSA id gg6sm11291013pjb.2.2021.01.21.11.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:16:53 -0800 (PST) From: Ansuel Smith To: Amit Kucheria Cc: Ansuel Smith , Andy Gross , Bjorn Andersson , 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: [PATCH v8 4/8] drivers: thermal: tsens: Use init_common for msm8960 Date: Thu, 21 Jan 2021 20:15:56 +0100 Message-Id: <20210121191601.14403-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121191601.14403-1-ansuelsmth@gmail.com> References: <20210121191601.14403-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use init_common and drop custom init for msm8960. Signed-off-by: Ansuel Smith --- drivers/thermal/qcom/tsens-8960.c | 52 +------------------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c index 3f4fc1ffe679..86585f439985 100644 --- a/drivers/thermal/qcom/tsens-8960.c +++ b/drivers/thermal/qcom/tsens-8960.c @@ -173,56 +173,6 @@ static void disable_8960(struct tsens_priv *priv) regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); } -static int init_8960(struct tsens_priv *priv) -{ - int ret, i; - u32 reg_cntl; - - priv->tm_map = dev_get_regmap(priv->dev, NULL); - if (!priv->tm_map) - return -ENODEV; - - /* - * The status registers for each sensor are discontiguous - * because some SoCs have 5 sensors while others have more - * but the control registers stay in the same place, i.e - * directly after the first 5 status registers. - */ - for (i = 0; i < priv->num_sensors; i++) { - if (i >= 5) - priv->sensor[i].status = S0_STATUS_ADDR + 40; - priv->sensor[i].status += i * 4; - } - - reg_cntl = SW_RST; - ret = regmap_update_bits(priv->tm_map, CNTL_ADDR, SW_RST, reg_cntl); - if (ret) - return ret; - - if (priv->num_sensors > 1) { - reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18); - reg_cntl &= ~SW_RST; - ret = regmap_update_bits(priv->tm_map, CONFIG_ADDR, - CONFIG_MASK, CONFIG); - } else { - reg_cntl |= SLP_CLK_ENA_8660 | (MEASURE_PERIOD << 16); - reg_cntl &= ~CONFIG_MASK_8660; - reg_cntl |= CONFIG_8660 << CONFIG_SHIFT_8660; - } - - reg_cntl |= GENMASK(priv->num_sensors - 1, 0) << SENSOR0_SHIFT; - ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); - if (ret) - return ret; - - reg_cntl |= EN; - ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); - if (ret) - return ret; - - return 0; -} - static int calibrate_8960(struct tsens_priv *priv) { int i; @@ -346,7 +296,7 @@ static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = { }; static const struct tsens_ops ops_8960 = { - .init = init_8960, + .init = init_common, .calibrate = calibrate_8960, .get_temp = get_temp_8960, .enable = enable_8960, From patchwork Thu Jan 21 19:15:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 367953 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 74885C433E0 for ; Thu, 21 Jan 2021 19:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40D9623A1C for ; Thu, 21 Jan 2021 19:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727104AbhAUTSu (ORCPT ); Thu, 21 Jan 2021 14:18:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbhAUTSG (ORCPT ); Thu, 21 Jan 2021 14:18:06 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 819BEC0617A7; Thu, 21 Jan 2021 11:17:11 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id y205so2101981pfc.5; Thu, 21 Jan 2021 11:17:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2bCUVYm5PTbXlWccEltwKHodbOdPVGehKn93HfL2DGM=; b=dIwoVnESU5Rx+/2SD908/EvsLyfO6j9QDOu1khYe/SoP9JuwImQr53/StGNnDBhKjh ISPxsI8TN4E2jQAq91haWROqWgKAQkH6KA7OyjFv4Wfgr1KDi95wqmHeRn09MiOpQGin uvhQZ5V7a/x5e4u2rcwYfBlPIj2J1EZWDpNZKs6NgbywANMG0rM+w1y6X6r4wFk/ZJ9I swx8K3jOmLxZdiw9766tJGeWswlSMj1iO37HN5lnvc2d7wjg87KoLdtEgmheLktS7SF6 w/3wT31ZpGpOQhD8VWpBDbELxbkVFNpHNm2AGoCNF4NjXt3XoQHW9q+fhcCFTERV2eK8 oXXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2bCUVYm5PTbXlWccEltwKHodbOdPVGehKn93HfL2DGM=; b=i5aF+p42u0RIDZoVm6EFGRYaq8PoNTHIqogVzNfPiqo4rahA+iMp/G3nogLuXGwO8q nXP9nRaHlwg1IAZsbZm8lM3pB9IR+ji0jmobqSvDjd4rZSURFnAwwizokfwELl8YfJXx MS8vYEgyqirifV5qNPBbZzkOcKjllYdQ7JuCF5WvgvWfX9JpCaT3/0ZtUE8GO207MzTd lt0xZiH54mU73n0xuccPNDVBMFEzh0kg4eqmljsgYRJnIrVHCbTMSIl0wWFjZbN4rFM0 JTawZloIxuTOW0ZcJsvHXt9RA08nqgxhnqDiYlqHQdds9Zzo+t+rfIDaGlYRu6+x453K k78w== X-Gm-Message-State: AOAM531dSbWHTyHx+nYtL3ht9tj9gPojKl8lDz1FTHxc4xV2/CpA2MFM Fm1r/LCpohMO8gCzSYeDwMk= X-Google-Smtp-Source: ABdhPJyuFjgXz+YzNsvaxQkREdbWGWptT2114jjZD14FftTHMx31mOG42iXJ8ALyu304Hvi4c7b95A== X-Received: by 2002:a63:cd08:: with SMTP id i8mr728701pgg.425.1611256631036; Thu, 21 Jan 2021 11:17:11 -0800 (PST) Received: from ansuel-xps20.localdomain (host-79-41-39-5.retail.telecomitalia.it. [79.41.39.5]) by smtp.googlemail.com with ESMTPSA id gg6sm11291013pjb.2.2021.01.21.11.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:17:10 -0800 (PST) From: Ansuel Smith To: Amit Kucheria Cc: Ansuel Smith , Andy Gross , Bjorn Andersson , 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: [PATCH v8 6/8] drivers: thermal: tsens: Use get_temp_common for msm8960 Date: Thu, 21 Jan 2021 20:15:58 +0100 Message-Id: <20210121191601.14403-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121191601.14403-1-ansuelsmth@gmail.com> References: <20210121191601.14403-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Rework calibrate function to use common function. Derive the offset from a missing hardcoded slope table and the data from the nvmem calib efuses. Signed-off-by: Ansuel Smith --- drivers/thermal/qcom/tsens-8960.c | 56 +++++++++---------------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c index 248aaa65b5b0..43ebe4d54672 100644 --- a/drivers/thermal/qcom/tsens-8960.c +++ b/drivers/thermal/qcom/tsens-8960.c @@ -67,6 +67,13 @@ #define S9_STATUS_OFF 0x3674 #define S10_STATUS_OFF 0x3678 +/* Original slope - 200 to compensate mC to C inaccuracy */ +u32 tsens_msm8960_slope[] = { + 976, 976, 954, 976, + 911, 932, 932, 999, + 932, 999, 932 + }; + static int suspend_8960(struct tsens_priv *priv) { int ret; @@ -192,9 +199,7 @@ static int calibrate_8960(struct tsens_priv *priv) { int i; char *data; - - ssize_t num_read = priv->num_sensors; - struct tsens_sensor *s = priv->sensor; + u32 p1[11]; data = qfprom_read(priv->dev, "calib"); if (IS_ERR(data)) @@ -202,49 +207,18 @@ static int calibrate_8960(struct tsens_priv *priv) if (IS_ERR(data)) return PTR_ERR(data); - for (i = 0; i < num_read; i++, s++) - s->offset = data[i]; + for (i = 0; i < priv->num_sensors; i++) { + p1[i] = data[i]; + priv->sensor[i].slope = tsens_msm8960_slope[i]; + } + + compute_intercept_slope(priv, p1, NULL, ONE_PT_CALIB); kfree(data); return 0; } -/* Temperature on y axis and ADC-code on x-axis */ -static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) -{ - int slope, offset; - - slope = thermal_zone_get_slope(s->tzd); - offset = CAL_MDEGC - slope * s->offset; - - return adc_code * slope + offset; -} - -static int get_temp_8960(const struct tsens_sensor *s, int *temp) -{ - int ret; - u32 code, trdy; - struct tsens_priv *priv = s->priv; - unsigned long timeout; - - timeout = jiffies + usecs_to_jiffies(TIMEOUT_US); - do { - ret = regmap_read(priv->tm_map, INT_STATUS_ADDR, &trdy); - if (ret) - return ret; - if (!(trdy & TRDY_MASK)) - continue; - ret = regmap_read(priv->tm_map, s->status, &code); - if (ret) - return ret; - *temp = code_to_mdegC(code, s); - return 0; - } while (time_before(jiffies, timeout)); - - return -ETIMEDOUT; -} - static struct tsens_features tsens_8960_feat = { .ver_major = VER_0, .crit_int = 0, @@ -313,7 +287,7 @@ static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = { static const struct tsens_ops ops_8960 = { .init = init_common, .calibrate = calibrate_8960, - .get_temp = get_temp_8960, + .get_temp = get_temp_common, .enable = enable_8960, .disable = disable_8960, .suspend = suspend_8960,