From: "thermal-bot for Dmitry Baryshkov" <tip-bot2@linutronix.de>
To: linux-pm@vger.kernel.org
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
rui.zhang@intel.com, daniel.lezcano@linaro.org, amitk@kernel.org
Subject: [thermal: thermal/next] iio: adc: qcom-vadc-common: rewrite vadc7 die temp calculation
Date: Thu, 18 Feb 2021 20:39:43 -0000 [thread overview]
Message-ID: <161368078360.20312.11434002224259466980.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201204025509.1075506-10-dmitry.baryshkov@linaro.org>
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 3bd0ceb566f700adc5d164f431d1da039374aa97
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//3bd0ceb566f700adc5d164f431d1da039374aa97
Author: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
AuthorDate: Fri, 04 Dec 2020 05:55:03 +03:00
Committer: Jonathan Cameron <Jonathan.Cameron@huawei.com>
CommitterDate: Sat, 16 Jan 2021 18:32:36
iio: adc: qcom-vadc-common: rewrite vadc7 die temp calculation
qcom_vadc7_scale_hw_calib_die_temp() uses a table format different from
the rest of volt/temp conversion functions in this file. Also the
conversion functions results in non-monothonic values conversion, which
seems wrong.
Rewrite qcom_vadc7_scale_hw_calib_die_temp() to use
qcom_vadc_map_voltage_temp() directly, like the rest of conversion
functions do.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20201204025509.1075506-10-dmitry.baryshkov@linaro.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/qcom-vadc-common.c | 50 ++++++-----------------
include/linux/iio/adc/qcom-vadc-common.h | 5 +--
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/drivers/iio/adc/qcom-vadc-common.c b/drivers/iio/adc/qcom-vadc-common.c
index 45a3860..0c705bb 100644
--- a/drivers/iio/adc/qcom-vadc-common.c
+++ b/drivers/iio/adc/qcom-vadc-common.c
@@ -101,18 +101,18 @@ static const struct vadc_map_pt adcmap_100k_104ef_104fb_1875_vref[] = {
};
static const struct vadc_map_pt adcmap7_die_temp[] = {
- { 433700, 1967},
- { 473100, 1964},
- { 512400, 1957},
- { 551500, 1949},
- { 590500, 1940},
- { 629300, 1930},
- { 667900, 1921},
- { 706400, 1910},
- { 744600, 1896},
- { 782500, 1878},
- { 820100, 1859},
- { 857300, 0},
+ { 857300, 160000 },
+ { 820100, 140000 },
+ { 782500, 120000 },
+ { 744600, 100000 },
+ { 706400, 80000 },
+ { 667900, 60000 },
+ { 629300, 40000 },
+ { 590500, 20000 },
+ { 551500, 0 },
+ { 512400, -20000 },
+ { 473100, -40000 },
+ { 433700, -60000 },
};
/*
@@ -585,33 +585,13 @@ static int qcom_vadc7_scale_hw_calib_die_temp(
u16 adc_code, int *result_mdec)
{
- int voltage, vtemp0, temp, i;
+ int voltage;
voltage = qcom_vadc_scale_code_voltage_factor(adc_code,
prescale, data, 1);
- if (adcmap7_die_temp[0].x > voltage) {
- *result_mdec = DIE_TEMP_ADC7_SCALE_1;
- return 0;
- }
-
- if (adcmap7_die_temp[ARRAY_SIZE(adcmap7_die_temp) - 1].x <= voltage) {
- *result_mdec = DIE_TEMP_ADC7_MAX;
- return 0;
- }
-
- for (i = 0; i < ARRAY_SIZE(adcmap7_die_temp); i++)
- if (adcmap7_die_temp[i].x > voltage)
- break;
-
- vtemp0 = adcmap7_die_temp[i - 1].x;
- voltage = voltage - vtemp0;
- temp = div64_s64(voltage * DIE_TEMP_ADC7_SCALE_FACTOR,
- adcmap7_die_temp[i - 1].y);
- temp += DIE_TEMP_ADC7_SCALE_1 + (DIE_TEMP_ADC7_SCALE_2 * (i - 1));
- *result_mdec = temp;
-
- return 0;
+ return qcom_vadc_map_voltage_temp(adcmap7_die_temp, ARRAY_SIZE(adcmap7_die_temp),
+ voltage, result_mdec);
}
static int qcom_vadc_scale_hw_smb_temp(
diff --git a/include/linux/iio/adc/qcom-vadc-common.h b/include/linux/iio/adc/qcom-vadc-common.h
index 1d337dd..5821612 100644
--- a/include/linux/iio/adc/qcom-vadc-common.h
+++ b/include/linux/iio/adc/qcom-vadc-common.h
@@ -54,11 +54,6 @@
#define R_PU_100K 100000
#define RATIO_MAX_ADC7 BIT(14)
-#define DIE_TEMP_ADC7_SCALE_1 -60000
-#define DIE_TEMP_ADC7_SCALE_2 20000
-#define DIE_TEMP_ADC7_SCALE_FACTOR 1000
-#define DIE_TEMP_ADC7_MAX 160000
-
/*
* VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
* VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for
next prev parent reply other threads:[~2021-02-18 20:43 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 2:54 [PATCH v10 00/15] qcom: pm8150: add support for thermal monitoring Dmitry Baryshkov
2020-12-04 2:54 ` [PATCH v10 01/15] dt-bindings: thermal: qcom: add adc-thermal monitor bindings Dmitry Baryshkov
2020-12-04 2:54 ` [PATCH v10 02/15] fixp-arith: add a linear interpolation function Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Craig Tatlor
2020-12-04 2:54 ` [PATCH v10 03/15] iio: adc: qcom-vadc: move several adc5 functions to common file Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:54 ` [PATCH v10 04/15] iio: adc: qcom-vadc-common: use fixp_linear_interpolate Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2021-02-18 22:03 ` kernel test robot
2020-12-04 2:54 ` [PATCH v10 05/15] iio: adc: move qcom-vadc-common.h to include dir Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 06/15] iio: adc: qcom-spmi-adc5: use of_device_get_match_data Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 07/15] iio: provide of_iio_channel_get_by_name() and devm_ version it Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 08/15] iio: adc: move vadc_map_pt from header to the source file Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 09/15] iio: adc: qcom-vadc-common: rewrite vadc7 die temp calculation Dmitry Baryshkov
2021-02-18 20:39 ` thermal-bot for Dmitry Baryshkov [this message]
2020-12-04 2:55 ` [PATCH v10 10/15] iio: adc: qcom-vadc-common: simplify qcom_vadc_map_voltage_temp Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 11/15] iio: adc: qcom-vadc-common: scale adcmap_100k_104ef_104fb Dmitry Baryshkov
2021-02-18 20:39 ` [thermal: thermal/next] " thermal-bot for Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 12/15] thermal: qcom: add support for adc-tm5 PMIC thermal monitor Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 13/15] arm64: dts: qcom: pm8150x: add definitions for adc-tm5 part Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 14/15] arm64: dts: sm8250-mtp: add thermal zones using pmic's adc-tm5 Dmitry Baryshkov
2020-12-04 2:55 ` [PATCH v10 15/15] arm64: dts: qrb5165-rb5: port thermal zone definitions Dmitry Baryshkov
2020-12-05 17:08 ` [PATCH v10 00/15] qcom: pm8150: add support for thermal monitoring Jonathan Cameron
2020-12-05 21:05 ` Dmitry Baryshkov
2020-12-08 10:39 ` Jonathan Cameron
2020-12-08 17:14 ` Dmitry Baryshkov
2021-01-13 17:19 ` Dmitry Baryshkov
2021-01-05 2:03 ` Dmitry Baryshkov
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=161368078360.20312.11434002224259466980.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=Jonathan.Cameron@huawei.com \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox