public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Eliav Farber <farbere@amazon.com>
To: <jdelvare@suse.com>, <linux@roeck-us.net>, <robh+dt@kernel.org>,
	<mark.rutland@arm.com>, <linux-hwmon@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <farbere@amazon.com>, <talel@amazon.com>, <hhhawa@amazon.com>,
	<jonnyc@amazon.com>, <hanochu@amazon.com>, <ronenk@amazon.com>,
	<itamark@amazon.com>, <shellykz@amazon.com>, <shorer@amazon.com>,
	<amitlavi@amazon.com>, <almogbs@amazon.com>, <dwmw@amazon.co.uk>,
	<rtanwar@maxlinear.com>
Subject: [PATCH 12/16] hwmon: (mr75203) modify the temperature equation
Date: Tue, 16 Aug 2022 08:27:53 +0000	[thread overview]
Message-ID: <20220816082757.11990-13-farbere@amazon.com> (raw)
In-Reply-To: <20220816082757.11990-1-farbere@amazon.com>

Modify the equation and coefficients 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

The G, H and J coefficients are multiplied by 1000 to get the
temperature in milli-Celsius.

Signed-off-by: Eliav Farber <farbere@amazon.com>
---
 drivers/hwmon/mr75203.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index 8d8883301ff5..59e2dc8fa333 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -100,9 +100,10 @@
 
 #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_H_CONST		60000
+#define PVT_G_CONST		200000
+#define PVT_J_CONST		-100
+#define PVT_CAL5_CONST		4094
 #define PVT_CONV_BITS		10
 #define PVT_N_CONST		90
 #define PVT_R_CONST		245805
@@ -156,7 +157,6 @@ static int pvt_read_temp(struct device *dev, u32 attr, int channel, long *val)
 	struct regmap *t_map = pvt->t_map;
 	u32 stat, nbs;
 	int ret;
-	u64 tmp;
 
 	switch (attr) {
 	case hwmon_temp_input:
@@ -174,12 +174,13 @@ static int pvt_read_temp(struct device *dev, u32 attr, int channel, long *val)
 		nbs &= SAMPLE_DATA_MSK;
 
 		/*
-		 * Convert the register value to
-		 * degrees centigrade temperature
+		 * Convert the register value to degrees centigrade temperature:
+		 * T = G + H * (n / cal5 - 0.5) + J * F
 		 */
-		tmp = nbs * PVT_H_CONST;
-		do_div(tmp, PVT_CAL5_CONST);
-		*val = tmp - PVT_G_CONST - pvt->ip_freq;
+		*val = PVT_G_CONST;
+		*val += PVT_H_CONST * nbs / PVT_CAL5_CONST;
+		*val -= PVT_H_CONST / 2;
+		*val += PVT_J_CONST * pvt->ip_freq / HZ_PER_MHZ;
 
 		return 0;
 	default:
@@ -311,7 +312,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


  parent reply	other threads:[~2022-08-16  9:43 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-16  8:27 [PATCH 00/16] Variety of fixes and new features for mr75203 driver Eliav Farber
2022-08-16  8:27 ` [PATCH 01/16] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined Eliav Farber
2022-08-16  8:27 ` [PATCH 02/16] hwmon: (mr75203) update pvt->v_num to the actual number of used sensors Eliav Farber
2022-08-16  8:27 ` [PATCH 03/16] hwmon: (mr75203) update Moortec PVT controller intel,vm-map property Eliav Farber
2022-08-18 15:02   ` Rob Herring
2022-08-16  8:27 ` [PATCH 04/16] hwmon: (mr75203) add Moortec PVT controller reset-control-skip property Eliav Farber
2022-08-16  8:27 ` [PATCH 05/16] hwmon: (mr75203) add option to skip reset controller Eliav Farber
2022-08-16  8:27 ` [PATCH 06/16] hwmon: (mr75203) fix multi-channel voltage reading Eliav Farber
2022-08-16  8:27 ` [PATCH 07/16] hwmon: (mr75203) add VM active channels property for Moortec PVT controller Eliav Farber
2022-08-16  8:27 ` [PATCH 08/16] hwmon: (mr75203) add VM active channel support Eliav Farber
2022-08-16 16:52   ` kernel test robot
2022-08-16 18:17   ` kernel test robot
2022-08-16 19:55   ` kernel test robot
2022-08-16  8:27 ` [PATCH 09/16] hwmon: (mr75203) add VM pre-scalar property for Moortec PVT controller Eliav Farber
2022-08-16  8:27 ` [PATCH 10/16] hwmon: (mr75203) add VM pre-scalar support Eliav Farber
2022-08-16  8:27 ` [PATCH 11/16] hwmon: (mr75203) add protection for negative voltage value Eliav Farber
2022-08-16  8:27 ` Eliav Farber [this message]
2022-08-16  8:27 ` [PATCH 13/16] hwmon: (mr75203) add thermal coefficient properties for Moortec PVT controller Eliav Farber
2022-08-18 15:05   ` Rob Herring
2022-08-16  8:27 ` [PATCH 14/16] hwmon: (mr75203) parse thermal coefficients from device-tree Eliav Farber
2022-08-16  8:27 ` [PATCH 15/16] hwmon: (mr75203) fix coding style space errors Eliav Farber
2022-08-16  8:27 ` [PATCH 16/16] hwmon: (mr75203) add debugfs to read and write temperature coefficients Eliav Farber

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=20220816082757.11990-13-farbere@amazon.com \
    --to=farbere@amazon.com \
    --cc=almogbs@amazon.com \
    --cc=amitlavi@amazon.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dwmw@amazon.co.uk \
    --cc=hanochu@amazon.com \
    --cc=hhhawa@amazon.com \
    --cc=itamark@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=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=ronenk@amazon.com \
    --cc=rtanwar@maxlinear.com \
    --cc=shellykz@amazon.com \
    --cc=shorer@amazon.com \
    --cc=talel@amazon.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