From patchwork Thu Feb 28 12:21:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 10832939 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F1EBB17E9 for ; Thu, 28 Feb 2019 12:27:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E291D2EC05 for ; Thu, 28 Feb 2019 12:27:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D68C02EC21; Thu, 28 Feb 2019 12:27:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7D8B2EC05 for ; Thu, 28 Feb 2019 12:27:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731621AbfB1M1y (ORCPT ); Thu, 28 Feb 2019 07:27:54 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40354 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731883AbfB1M1x (ORCPT ); Thu, 28 Feb 2019 07:27:53 -0500 Received: by mail-wm1-f67.google.com with SMTP id g20so7976552wmh.5 for ; Thu, 28 Feb 2019 04:27:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=vXTkCN9XQrYDU1nAIhEf80bjP3QRImM0rvZgjdrLpoM=; b=zViCAUkUGygwrPh5ryUIoZlVVC4rFdcAkF9mQh026jMdmcKlqDw0Gkc9YphIoocF3O yQodupvAqYJ9DU95uatT7LlRfsD20zkOeIO1bN+VjNXtlRJ/V5B7OdClNCgYioqWkFew iyld1qAKnJWsahbkbKAuCwA+s9qSvB6kwe8qW6ZPAl3Cib0/KfDByadChrUuOuHdWdea 1BjemG1bV3mz5GTay4F+ViN2RhRBPwvVi+7kF++z4Gz6tdND7ys/GXX/qyiURMFIUDKC Q9iPM1NDXRHyPmH85PhPNfVPOx6Bwvh8j25bu+Pb8nNjQ+9O0FtdWonazejuTbMDf+zs r7aA== 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:in-reply-to:references; bh=vXTkCN9XQrYDU1nAIhEf80bjP3QRImM0rvZgjdrLpoM=; b=XwWA6zJ7wYuCn3PPT/942kpFHnGRnEP3R8n9Y0aVMTwZXMNCYfQYZ9fKIemuv2odXR hX1rkJVzsccEtEROb8g0W02qprGhRwt6pbdC/sefHgcoN+7OWt64nl3tNNhEeJD826mj ChCbjqp6X/Ugnefe3wrpY+KcWfV3ALwhsEsqaXkQ+MfbvXaIceUf9ADwv6mIrwIjbD9t HM6PNA7QrofA59L68A4HcgmWKHAAI65aU+5agn2CuEw2WO0i5DFJggFHc8hasuighE0j Y2ivm0RRRcE/TKG2oHBVEYSqRa9+HaIuu32LK9rLZlMBJHS27eSRT+W1zYSIEJGwSw00 YqRQ== X-Gm-Message-State: AHQUAubWPD1DbQv5uQ8qn9AKOupYz6Skqe97THTTTn1eukxyQYbhSaii m/o28+oC52b0Ch7uIbWOhnF/XA== X-Google-Smtp-Source: APXvYqy9YoiIJPTf/RzaVIpQhMBmnBnn9tFAKiut0Rws8RwpCWNRSvhBEdCqu9Nq/WkkjRz1+n0yzg== X-Received: by 2002:a1c:2885:: with SMTP id o127mr2953084wmo.135.1551356871384; Thu, 28 Feb 2019 04:27:51 -0800 (PST) Received: from localhost ([49.248.54.130]) by smtp.gmail.com with ESMTPSA id f196sm10214686wme.36.2019.02.28.04.27.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 04:27:50 -0800 (PST) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, andy.gross@linaro.org, Daniel Lezcano , David Brown , Zhang Rui Cc: linux-pm@vger.kernel.org Subject: [PATCH v2 19/24] drivers: thermal: tsens: Common get_temp() learns to do ADC conversion Date: Thu, 28 Feb 2019 17:51:09 +0530 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP get_temp() learns to return temperature regardless of whether it is returned as ADC code or direct temperature. Signed-off-by: Amit Kucheria --- drivers/thermal/qcom/tsens-common.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index 7bab0e640806..5db1aa441910 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -129,10 +129,15 @@ int get_temp_tsens_valid(struct tsens_priv *priv, int i, int *temp) if (ret) return ret; - mask = GENMASK(priv->fields[LAST_TEMP_0].msb, - priv->fields[LAST_TEMP_0].lsb); - /* Convert temperature from deciCelsius to milliCelsius */ - *temp = sign_extend32(last_temp, fls(mask) - 1) * 100; + if (priv->feat->adc) { + /* Convert temperature from ADC code to milliCelsius */ + *temp = code_to_degc(last_temp, s) * 1000; + } else { + mask = GENMASK(priv->fields[LAST_TEMP_0].msb, + priv->fields[LAST_TEMP_0].lsb); + /* Convert temperature from deciCelsius to milliCelsius */ + *temp = sign_extend32(last_temp, fls(mask) - 1) * 100; + } return 0; }