From: Eliav Farber <farbere@amazon.com>
To: <jdelvare@suse.com>, <linux@roeck-us.net>, <robh+dt@kernel.org>,
<p.zabel@pengutronix.de>, <rtanwar@maxlinear.com>,
<linux-hwmon@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <farbere@amazon.com>, <hhhawa@amazon.com>, <jonnyc@amazon.com>,
<andriy.shevchenko@intel.com>
Subject: [PATCH v4 16/21] hwmon: (mr75203) modify the temperature equation according to series 5 datasheet
Date: Tue, 6 Sep 2022 08:33:51 +0000 [thread overview]
Message-ID: <20220906083356.21067-17-farbere@amazon.com> (raw)
In-Reply-To: <20220906083356.21067-1-farbere@amazon.com>
Modify the equation and coefficients used to convert the digital output
to temperature according to series 5 of the Moortec Embedded Temperature
Sensor (METS) datasheet:
T = G + H * (n / cal5 - 0.5) + J * F
Where:
*) G = 60, H = 200, cal5 = 4094, J = -0.1.
*) F = frequency clock in MHz.
*) n is the digital output.
In code, the G, H and J coefficients are multiplied by a factor of 1000
to get the temperature in milli-Celsius.
Final result is clamped in case it exceeds min/max thresholds.
Change is done since it is unclear where the current equation and
coefficients came from.
Signed-off-by: Eliav Farber <farbere@amazon.com>
---
V4 -> V3:
- Change 'not clear' to 'unclear' in commit message.
- Add _mC prefix to temperature mix/max defines.
- Add SERIES5 to coefficient defines.
V3 -> V2:
- Protect from overflow.
- Add temperature clamping.
- Add better documentation.
drivers/hwmon/mr75203.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index 66f151082c11..f98fb0f3d2fd 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -102,13 +102,19 @@
#define PVT_POLL_DELAY_US 20
#define PVT_POLL_TIMEOUT_US 20000
-#define PVT_H_CONST 100000
-#define PVT_CAL5_CONST 2047
-#define PVT_G_CONST 40000
#define PVT_CONV_BITS 10
#define PVT_N_CONST 90
#define PVT_R_CONST 245805
+#define PVT_TEMP_MIN_mC -40000
+#define PVT_TEMP_MAX_mC 125000
+
+/* Temperature coefficients for series 5 */
+#define PVT_SERIES5_H_CONST 200000
+#define PVT_SERIES5_G_CONST 60000
+#define PVT_SERIES5_J_CONST -100
+#define PVT_SERIES5_CAL5_CONST 4094
+
#define PRE_SCALER_X1 1
#define PRE_SCALER_X2 2
@@ -174,13 +180,26 @@ static umode_t pvt_is_visible(const void *data, enum hwmon_sensor_types type,
return 0;
}
+static long pvt_calc_temp(struct pvt_device *pvt, u32 nbs)
+{
+ /*
+ * Convert the register value to degrees centigrade temperature:
+ * T = G + H * (n / cal5 - 0.5) + J * F
+ */
+ s64 tmp = PVT_SERIES5_G_CONST +
+ PVT_SERIES5_H_CONST * (s64)nbs / PVT_SERIES5_CAL5_CONST -
+ PVT_SERIES5_H_CONST / 2 +
+ PVT_SERIES5_J_CONST * (s64)pvt->ip_freq / HZ_PER_MHZ;
+
+ return clamp_val(tmp, PVT_TEMP_MIN_mC, PVT_TEMP_MAX_mC);
+}
+
static int pvt_read_temp(struct device *dev, u32 attr, int channel, long *val)
{
struct pvt_device *pvt = dev_get_drvdata(dev);
struct regmap *t_map = pvt->t_map;
u32 stat, nbs;
int ret;
- u64 tmp;
switch (attr) {
case hwmon_temp_input:
@@ -201,9 +220,7 @@ static int pvt_read_temp(struct device *dev, u32 attr, int channel, long *val)
* Convert the register value to
* degrees centigrade temperature
*/
- tmp = nbs * PVT_H_CONST;
- do_div(tmp, PVT_CAL5_CONST);
- *val = tmp - PVT_G_CONST - pvt->ip_freq;
+ *val = pvt_calc_temp(pvt, nbs);
return 0;
default:
@@ -327,7 +344,7 @@ static int pvt_init(struct pvt_device *pvt)
(key >> 1) << CLK_SYNTH_HI_SFT |
(key >> 1) << CLK_SYNTH_HOLD_SFT | CLK_SYNTH_EN;
- pvt->ip_freq = sys_freq * 100 / (key + 2);
+ pvt->ip_freq = clk_get_rate(pvt->clk) / (key + 2);
if (t_num) {
ret = regmap_write(t_map, SDIF_SMPL_CTRL, 0x0);
--
2.37.1
next prev parent reply other threads:[~2022-09-06 8:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 8:33 [PATCH v4 00/21] Variety of fixes and new features for mr75203 driver Eliav Farber
2022-09-06 8:33 ` [PATCH v4 01/21] hwmon: (mr75203) fix coding style space errors Eliav Farber
2022-09-06 16:52 ` Guenter Roeck
2022-09-07 6:50 ` Farber, Eliav
2022-09-07 14:42 ` Andy Shevchenko
2022-09-07 15:57 ` Guenter Roeck
2022-09-06 8:33 ` [PATCH v4 02/21] dt-bindings: hwmon: (mr75203) fix "intel,vm-map" property to be optional Eliav Farber
2022-09-06 16:53 ` Guenter Roeck
2022-09-07 6:28 ` [PATCH v4 02/21] dt-bindings: hwmon: (mr75203) fix "intel, vm-map" " Farber, Eliav
2022-09-07 16:00 ` Guenter Roeck
2022-09-06 8:33 ` [PATCH v4 03/21] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined Eliav Farber
2022-09-06 8:33 ` [PATCH v4 04/21] hwmon: (mr75203) update pvt->v_num and vm_num to the actual number of used sensors Eliav Farber
2022-09-06 8:33 ` [PATCH v4 05/21] hwmon: (mr75203) fix voltage equation for negative source input Eliav Farber
2022-09-06 12:03 ` Andy Shevchenko
2022-09-06 13:27 ` Farber, Eliav
2022-09-06 14:01 ` Andy Shevchenko
2022-09-06 8:33 ` [PATCH v4 06/21] hwmon: (mr75203) fix multi-channel voltage reading Eliav Farber
2022-09-06 14:10 ` Andy Shevchenko
2022-09-07 5:15 ` Farber, Eliav
2022-09-07 14:41 ` Andy Shevchenko
2022-09-06 8:33 ` [PATCH v4 07/21] hwmon: (mr75203) enable polling for all VM channels Eliav Farber
2022-09-06 8:33 ` [PATCH v4 08/21] dt-bindings: hwmon: (mr75203) add description for Moortec's PVT controller Eliav Farber
2022-09-08 22:40 ` Rob Herring
2022-09-06 8:33 ` [PATCH v4 09/21] dt-bindings: hwmon: (mr75203) change "resets" property to be optional Eliav Farber
2022-09-08 22:40 ` Rob Herring
2022-09-06 8:33 ` [PATCH v4 10/21] hwmon: (mr75203) skip reset-control deassert for SOCs that don't support it Eliav Farber
2022-09-06 8:33 ` [PATCH v4 11/21] dt-bindings: vendor-prefixes: add vendor prefix for Moortec Eliav Farber
2022-09-06 8:33 ` [PATCH v4 12/21] dt-bindings: hwmon: (mr75203) add "moortec,vm-active-channels" property Eliav Farber
2022-09-06 17:08 ` Guenter Roeck
2022-09-07 5:21 ` [PATCH v4 12/21] dt-bindings: hwmon: (mr75203) add "moortec, vm-active-channels" property Farber, Eliav
2022-09-06 8:33 ` [PATCH v4 13/21] hwmon: (mr75203) add VM active channel support Eliav Farber
2022-09-06 8:33 ` [PATCH v4 14/21] dt-bindings: hwmon: (mr75203) add "moortec,vm-pre-scaler-x2" property Eliav Farber
2022-09-06 8:33 ` [PATCH v4 15/21] hwmon: (mr75203) add VM pre-scaler x2 support Eliav Farber
2022-09-06 8:33 ` Eliav Farber [this message]
2022-09-06 8:33 ` [PATCH v4 17/21] dt-bindings: hwmon: (mr75203) add "moortec,ts-series" property Eliav Farber
2022-09-06 8:33 ` [PATCH v4 18/21] hwmon: (mr75203) add support for series 6 temperature equation Eliav Farber
2022-09-06 8:33 ` [PATCH v4 19/21] dt-bindings: hwmon: (mr75203) add coefficient properties for the thermal equation Eliav Farber
2022-09-06 8:33 ` [PATCH v4 20/21] hwmon: (mr75203) parse temperature coefficients from device-tree Eliav Farber
2022-09-06 8:33 ` [PATCH v4 21/21] hwmon: (mr75203) add debugfs to read and write temperature coefficients Eliav Farber
2022-09-06 14:26 ` [PATCH v4 00/21] Variety of fixes and new features for mr75203 driver Andy Shevchenko
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=20220906083356.21067-17-farbere@amazon.com \
--to=farbere@amazon.com \
--cc=andriy.shevchenko@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=hhhawa@amazon.com \
--cc=jdelvare@suse.com \
--cc=jonnyc@amazon.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=rtanwar@maxlinear.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