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 v2 14/16] hwmon: (mr75203) parse thermal coefficients from device-tree
Date: Wed, 17 Aug 2022 05:43:19 +0000 [thread overview]
Message-ID: <20220817054321.6519-15-farbere@amazon.com> (raw)
In-Reply-To: <20220817054321.6519-1-farbere@amazon.com>
Use thermal coefficients from the device tree if they exist.
Otherwise, use default values.
The equation used in the driver is:
T = G + H * (n / cal5 - 0.5) + J * F
With this change we can support also Mode 1 Conversion, which
uses A instead of G, and B instead of H.
We can also support the series 6 equation that has different
coefficients and has a slightly different format:
T = G + H * (n / cal5 - 0.5)
by setting J to 0.
Signed-off-by: Eliav Farber <farbere@amazon.com>
---
drivers/hwmon/mr75203.c | 44 +++++++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index e500897585e4..e54a4d1803e4 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -131,6 +131,10 @@ struct pvt_device {
u32 p_num;
u32 v_num;
u32 ip_freq;
+ u32 ts_coeff_h;
+ u32 ts_coeff_g;
+ s32 ts_coeff_j;
+ u32 ts_coeff_cal5;
u8 vm_ch_max;
u8 vm_ch_total;
};
@@ -179,10 +183,10 @@ static int pvt_read_temp(struct device *dev, u32 attr, int channel, long *val)
* Convert the register value to degrees centigrade temperature:
* T = G + H * (n / cal5 - 0.5) + J * F
*/
- *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;
+ *val = pvt->ts_coeff_g;
+ *val += pvt->ts_coeff_h * nbs / pvt->ts_coeff_cal5;
+ *val -= pvt->ts_coeff_h / 2;
+ *val += pvt->ts_coeff_j * pvt->ip_freq / HZ_PER_MHZ;
return 0;
default:
@@ -619,6 +623,38 @@ static int mr75203_probe(struct platform_device *pdev)
memset32(temp_config, HWMON_T_INPUT, ts_num);
pvt_temp.config = temp_config;
pvt_info[index++] = &pvt_temp;
+
+ /*
+ * Incase ts-coeff-h/g/j/cal5 property is not defined, use
+ * default value.
+ */
+ ret = of_property_read_u32(np, "ts-coeff-h", &pvt->ts_coeff_h);
+ if (ret)
+ pvt->ts_coeff_h = PVT_H_CONST;
+
+ ret = of_property_read_u32(np, "ts-coeff-g", &pvt->ts_coeff_g);
+ if (ret)
+ pvt->ts_coeff_g = PVT_G_CONST;
+
+ ret = of_property_read_s32(np, "ts-coeff-j", &pvt->ts_coeff_j);
+ if (ret)
+ pvt->ts_coeff_j = PVT_J_CONST;
+
+ ret = of_property_read_u32(np, "ts-coeff-cal5",
+ &pvt->ts_coeff_cal5);
+ if (ret) {
+ pvt->ts_coeff_cal5 = PVT_CAL5_CONST;
+ } else {
+ if (pvt->ts_coeff_cal5 == 0) {
+ dev_err(dev, "invalid ts-coeff-cal5 (%u)\n",
+ pvt->ts_coeff_cal5);
+ return -EINVAL;
+ }
+ }
+
+ dev_dbg(dev, "ts-coeff: h = %u, g = %u, j = %d, cal5 = %u\n",
+ pvt->ts_coeff_h, pvt->ts_coeff_g, pvt->ts_coeff_j,
+ pvt->ts_coeff_cal5);
}
if (pd_num) {
--
2.37.1
next prev parent reply other threads:[~2022-08-17 5:44 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:43 [PATCH v2 00/16] Variety of fixes and new features for mr75203 driver Eliav Farber
2022-08-17 5:43 ` [PATCH v2 01/16] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined Eliav Farber
2022-08-18 19:40 ` Guenter Roeck
2022-08-18 20:01 ` [PATCH v2 01/16] hwmon: (mr75203) fix VM sensor allocation when "intel, vm-map" " Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 02/16] hwmon: (mr75203) update pvt->v_num to the actual number of used sensors Eliav Farber
2022-08-18 19:44 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 03/16] hwmon: (mr75203) update Moortec PVT controller intel,vm-map property Eliav Farber
2022-08-18 19:47 ` Guenter Roeck
2022-08-18 20:20 ` [PATCH v2 03/16] hwmon: (mr75203) update Moortec PVT controller intel, vm-map property Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 04/16] hwmon: (mr75203) add Moortec PVT controller reset-control-skip property Eliav Farber
2022-08-18 20:01 ` Guenter Roeck
2022-08-22 11:54 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 05/16] hwmon: (mr75203) add option to skip reset controller Eliav Farber
2022-08-17 5:43 ` [PATCH v2 06/16] hwmon: (mr75203) fix multi-channel voltage reading Eliav Farber
2022-08-18 20:03 ` Guenter Roeck
2022-08-22 12:37 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 07/16] hwmon: (mr75203) add VM active channels property for Moortec PVT controller Eliav Farber
2022-08-18 20:07 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 08/16] hwmon: (mr75203) add VM active channel support Eliav Farber
2022-08-17 5:43 ` [PATCH v2 09/16] hwmon: (mr75203) add VM pre-scalar property for Moortec PVT controller Eliav Farber
2022-08-18 20:11 ` Guenter Roeck
2022-08-19 7:13 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 10/16] hwmon: (mr75203) add VM pre-scalar support Eliav Farber
2022-08-17 5:43 ` [PATCH v2 11/16] hwmon: (mr75203) add protection for negative voltage value Eliav Farber
2022-08-18 20:13 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 12/16] hwmon: (mr75203) modify the temperature equation Eliav Farber
2022-08-18 20:23 ` Guenter Roeck
2022-08-19 7:44 ` Farber, Eliav
2022-08-19 11:35 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 13/16] hwmon: (mr75203) add thermal coefficient properties for Moortec PVT controller Eliav Farber
2022-08-18 20:25 ` Guenter Roeck
2022-08-22 13:24 ` Farber, Eliav
2022-08-22 16:25 ` Guenter Roeck
2022-08-29 18:46 ` Farber, Eliav
2022-08-17 5:43 ` Eliav Farber [this message]
2022-08-18 20:28 ` [PATCH v2 14/16] hwmon: (mr75203) parse thermal coefficients from device-tree Guenter Roeck
2022-08-19 7:57 ` Farber, Eliav
2022-08-19 11:36 ` Guenter Roeck
2022-08-19 11:38 ` Guenter Roeck
2022-08-22 13:41 ` Farber, Eliav
2022-08-22 16:31 ` Guenter Roeck
2022-08-29 18:59 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 15/16] hwmon: (mr75203) fix coding style space errors Eliav Farber
2022-08-17 5:43 ` [PATCH v2 16/16] hwmon: (mr75203) add debugfs to read and write temperature coefficients Eliav Farber
2022-08-18 23:11 ` Guenter Roeck
2022-08-22 13:59 ` Farber, Eliav
2022-08-22 16:28 ` Guenter Roeck
2022-08-29 18:41 ` Farber, Eliav
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=20220817054321.6519-15-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;
as well as URLs for NNTP newsgroup(s).