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>, <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>, <dkl@amazon.com>,
<rahul.tanwar@linux.intel.com>, <andriy.shevchenko@intel.com>
Subject: [PATCH v3 11/19] hwmon: (mr75203) add VM pre-scaler support
Date: Tue, 30 Aug 2022 19:22:04 +0000 [thread overview]
Message-ID: <20220830192212.28570-12-farbere@amazon.com> (raw)
In-Reply-To: <20220830192212.28570-1-farbere@amazon.com>
Add mr76006 pre-scaler support to normalize the voltage output result for
channels that use pre-scaler units to get the measurement to be within
the range that the sensor supports.
For channels that are listed in the device-tree to have a pre-scaler, the
voltage result is multiplied by a factor of 2, to represent to the user
the actual voltage source which is measured.
Signed-off-by: Eliav Farber <farbere@amazon.com>
---
V3 -> V2:
- Modify code according to new property format.
drivers/hwmon/mr75203.c | 64 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 62 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index 6925e8490587..1cd5ff6eacce 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -13,10 +13,12 @@
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/mutex.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/reset.h>
+#include <linux/slab.h>
/* PVT Common register */
#define PVT_IP_CONFIG 0x04
@@ -108,9 +110,13 @@
#define PVT_N_CONST 90
#define PVT_R_CONST 245805
+#define PRE_SCALER_X1 1
+#define PRE_SCALER_X2 2
+
struct voltage_device {
u32 vm_map; /* Map channel number to VM index */
u32 ch_map; /* Map channel number to channel index */
+ u32 pre_scaler;
};
struct voltage_channels {
@@ -192,7 +198,7 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)
{
struct pvt_device *pvt = dev_get_drvdata(dev);
struct regmap *v_map = pvt->v_map;
- u32 n, stat;
+ u32 n, stat, pre_scaler;
u8 vm_idx, ch_idx;
int ret;
@@ -217,7 +223,9 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)
n &= SAMPLE_DATA_MSK;
/* Convert the N bitstream count into voltage */
- *val = (PVT_N_CONST * n - PVT_R_CONST) >> PVT_CONV_BITS;
+ pre_scaler = pvt->vd[channel].pre_scaler;
+ *val = pre_scaler * (PVT_N_CONST * n - PVT_R_CONST) >>
+ PVT_CONV_BITS;
return 0;
default:
@@ -582,6 +590,54 @@ static int pvt_get_active_channel(struct device *dev, struct pvt_device *pvt,
return 0;
}
+static int pvt_get_pre_scaler(struct device *dev, struct pvt_device *pvt)
+{
+ const struct device_node *np = dev->of_node;
+ u32 total_channels = pvt->vm_channels.total;
+ u32 channel;
+ u8 *pre_scaler_ch_list;
+ int i, ret, num_ch;
+
+ /* Set default pre-scaler value to be 1. */
+ for (i = 0; i < total_channels; i++)
+ pvt->vd[i].pre_scaler = PRE_SCALER_X1;
+
+ /* Get number of channels configured in "moortec,vm-pre-scaler". */
+ num_ch = of_property_count_u8_elems(np, "moortec,vm-pre-scaler");
+ if (num_ch <= 0)
+ return 0;
+
+ pre_scaler_ch_list = kcalloc(total_channels,
+ sizeof(*pre_scaler_ch_list), GFP_KERNEL);
+ if (!pre_scaler_ch_list)
+ return -ENOMEM;
+
+ /* Get list of all channels that have pre-scaler of 2. */
+ ret = device_property_read_u8_array(dev, "moortec,vm-pre-scaler",
+ pre_scaler_ch_list, num_ch);
+ if (ret)
+ goto out;
+
+ for (i = 0; i < num_ch; i++) {
+ channel = pre_scaler_ch_list[i];
+
+ if (channel >= total_channels) {
+ dev_err(dev,
+ "invalid channel (%u) in pre-scaler list\n",
+ channel);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ pvt->vd[channel].pre_scaler = PRE_SCALER_X2;
+ }
+
+out:
+ kfree(pre_scaler_ch_list);
+
+ return ret;
+}
+
static int mr75203_probe(struct platform_device *pdev)
{
const struct hwmon_channel_info **pvt_info;
@@ -697,6 +753,10 @@ static int mr75203_probe(struct platform_device *pdev)
if (ret)
return ret;
+ ret = pvt_get_pre_scaler(dev, pvt);
+ if (ret)
+ return ret;
+
in_config = devm_kcalloc(dev, pvt->vm_channels.total + 1,
sizeof(*in_config), GFP_KERNEL);
if (!in_config)
--
2.37.1
next prev parent reply other threads:[~2022-08-30 19:22 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 19:21 [PATCH v3 00/19] Variety of fixes and new features for mr75203 driver Eliav Farber
2022-08-30 19:21 ` [PATCH v3 01/19] dt-bindings: hwmon: (mr75203) update "intel,vm-map" property to be optional Eliav Farber
2022-09-02 19:50 ` Rob Herring
2022-08-30 19:21 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined Eliav Farber
2022-08-31 2:39 ` Guenter Roeck
2022-08-31 4:36 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel, vm-map" " Farber, Eliav
2022-08-31 5:36 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" " Guenter Roeck
2022-08-31 5:49 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel, vm-map" " Farber, Eliav
2022-08-31 6:09 ` Farber, Eliav
2022-08-31 11:48 ` Guenter Roeck
2022-09-01 8:39 ` Farber, Eliav
2022-09-01 14:44 ` Guenter Roeck
2022-09-01 15:24 ` Farber, Eliav
2022-09-01 17:11 ` Guenter Roeck
2022-09-01 18:36 ` Farber, Eliav
2022-09-01 19:25 ` Guenter Roeck
2022-09-01 19:49 ` Andy Shevchenko
2022-08-31 9:38 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" " Andy Shevchenko
2022-09-02 12:08 ` [PATCH v3 02/19] hwmon: (mr75203) fix VM sensor allocation when "intel, vm-map" " Farber, Eliav
2022-09-02 14:15 ` Andy Shevchenko
2022-08-30 19:21 ` [PATCH v3 03/19] hwmon: (mr75203) update pvt->v_num to the actual number of used sensors Eliav Farber
2022-08-31 2:41 ` Guenter Roeck
2022-08-31 4:50 ` Farber, Eliav
2022-08-31 5:31 ` Guenter Roeck
2022-08-30 19:21 ` [PATCH v3 04/19] dt-bindings: hwmon: (mr75203) change "reset" property to be optional Eliav Farber
2022-08-31 8:21 ` Philipp Zabel
2022-08-31 9:43 ` Farber, Eliav
2022-08-31 9:48 ` Philipp Zabel
2022-09-02 19:51 ` Rob Herring
2022-09-03 19:16 ` Farber, Eliav
2022-08-30 19:21 ` [PATCH v3 05/19] hwmon: (mr75203) skip reset-control deassert for SOCs that don't support it Eliav Farber
2022-08-31 8:19 ` Philipp Zabel
2022-08-30 19:21 ` [PATCH v3 06/19] hwmon: (mr75203) fix multi-channel voltage reading Eliav Farber
2022-08-31 9:46 ` Andy Shevchenko
2022-09-01 13:12 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 07/19] hwmon: (mr75203) enable polling for all VM channels Eliav Farber
2022-08-31 11:21 ` Andy Shevchenko
2022-08-31 11:55 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 08/19] dt-bindings: hwmon: (mr75203) add "moortec,vm-active-channels" property Eliav Farber
2022-08-31 11:39 ` Rob Herring
[not found] ` <a8557b5a-6e27-2e66-161e-814fc0f69c1d@amazon.com>
2022-08-31 12:17 ` [PATCH v3 08/19] dt-bindings: hwmon: (mr75203) add "moortec, vm-active-channels" property Rob Herring
2022-08-31 17:47 ` Farber, Eliav
2022-08-31 19:19 ` Rob Herring
2022-08-31 19:55 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 09/19] hwmon: (mr75203) add VM active channel support Eliav Farber
2022-08-31 11:48 ` Andy Shevchenko
2022-09-02 12:04 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 10/19] dt-bindings: hwmon: (mr75203) add "moortec,vm-pre-scaler" property Eliav Farber
2022-09-02 19:57 ` Rob Herring
2022-09-03 19:34 ` [PATCH v3 10/19] dt-bindings: hwmon: (mr75203) add "moortec, vm-pre-scaler" property Farber, Eliav
2022-08-30 19:22 ` Eliav Farber [this message]
2022-08-31 12:02 ` [PATCH v3 11/19] hwmon: (mr75203) add VM pre-scaler support Andy Shevchenko
2022-09-01 14:17 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 12/19] hwmon: (mr75203) fix voltage equation for negative source input Eliav Farber
2022-08-31 12:04 ` Andy Shevchenko
2022-09-01 12:47 ` Farber, Eliav
2022-09-01 20:08 ` Andy Shevchenko
2022-08-30 19:22 ` [PATCH v3 13/19] hwmon: (mr75203) modify the temperature equation according to series 5 datasheet Eliav Farber
2022-08-31 12:06 ` Andy Shevchenko
2022-09-01 12:22 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 14/19] dt-bindings: hwmon: (mr75203) add "moortec,ts-series" property Eliav Farber
2022-08-31 8:23 ` Philipp Zabel
2022-08-31 9:23 ` [PATCH v3 14/19] dt-bindings: hwmon: (mr75203) add "moortec, ts-series" property Farber, Eliav
2022-08-31 9:42 ` Philipp Zabel
2022-09-02 13:18 ` Farber, Eliav
2022-09-02 19:59 ` [PATCH v3 14/19] dt-bindings: hwmon: (mr75203) add "moortec,ts-series" property Rob Herring
2022-09-03 19:12 ` [PATCH v3 14/19] dt-bindings: hwmon: (mr75203) add "moortec, ts-series" property Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 15/19] hwmon: (mr75203) add support for series 6 temperature equation Eliav Farber
2022-08-31 12:08 ` Andy Shevchenko
2022-09-01 12:14 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 16/19] dt-bindings: hwmon: (mr75203) add coefficient properties for the thermal equation Eliav Farber
2022-09-02 20:03 ` Rob Herring
2022-09-03 19:16 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 17/19] hwmon: (mr75203) parse temperature coefficients from device-tree Eliav Farber
2022-08-31 12:11 ` Andy Shevchenko
2022-09-01 9:54 ` Farber, Eliav
2022-08-30 19:22 ` [PATCH v3 18/19] hwmon: (mr75203) add debugfs to read and write temperature coefficients Eliav Farber
2022-08-31 12:14 ` Andy Shevchenko
2022-09-01 6:54 ` Farber, Eliav
2022-09-01 14:28 ` Guenter Roeck
2022-09-01 19:46 ` Andy Shevchenko
2022-08-30 19:22 ` [PATCH v3 19/19] hwmon: (mr75203) fix coding style space errors Eliav Farber
2022-08-31 12:15 ` Andy Shevchenko
2022-09-01 14:21 ` Farber, Eliav
2022-09-01 14:46 ` Guenter Roeck
2022-09-01 15:31 ` Farber, Eliav
2022-09-01 17:09 ` Guenter Roeck
2022-09-01 18:40 ` 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=20220830192212.28570-12-farbere@amazon.com \
--to=farbere@amazon.com \
--cc=almogbs@amazon.com \
--cc=amitlavi@amazon.com \
--cc=andriy.shevchenko@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dkl@amazon.com \
--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=p.zabel@pengutronix.de \
--cc=rahul.tanwar@linux.intel.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).