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 15/21] hwmon: (mr75203) add VM pre-scaler x2 support
Date: Tue, 6 Sep 2022 08:33:50 +0000 [thread overview]
Message-ID: <20220906083356.21067-16-farbere@amazon.com> (raw)
In-Reply-To: <20220906083356.21067-1-farbere@amazon.com>
Add support for mr76006 pre-scaler which provides divide-by-2 scaling
of the input voltage, so that it can be presented to the VM for
measurement within its range (the VM input range is limited from -0.1V
to 1V).
The driver reads from the device-tree all the channels that use the
mr76006 pre-scaler and multiplies the voltage result by a factor of 2,
to represent to the user with the actual voltage input source.
Channels that are not in the device-tree are multiplied by a factor
of 1.
Signed-off-by: Eliav Farber <farbere@amazon.com>
---
V4 -> V3:
- Replace of_property_count_u8_elems() with device_property_count_u8().
- Remove unnecessary blank line.
- Remove code that validated the YAML.
V3 -> V2:
- Modify code according to new property format.
drivers/hwmon/mr75203.c | 55 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index 5aa694fd9118..66f151082c11 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -17,6 +17,7 @@
#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,17 +109,24 @@
#define PVT_N_CONST 90
#define PVT_R_CONST 245805
+#define PRE_SCALER_X1 1
+#define PRE_SCALER_X2 2
+
/**
* struct voltage_device - VM single input parameters.
* @vm_map: Map channel number to VM index.
* @ch_map: Map channel number to channel index.
+ * @pre_scaler: Pre scaler value (1 or 2) used to normalize the voltage output
+ * result.
*
* The structure provides mapping between channel-number (0..N-1) to VM-index
* (0..num_vm-1) and channel-index (0..ch_num-1) where N = num_vm * ch_num.
+ * It also provides normalization factor for the VM equation.
*/
struct voltage_device {
u32 vm_map;
u32 ch_map;
+ u32 pre_scaler;
};
/**
@@ -207,8 +215,8 @@ 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, pre_scaler;
u8 vm_idx, ch_idx;
- u32 n, stat;
int ret;
if (channel >= pvt->vm_channels.total)
@@ -232,7 +240,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 * (long)n - PVT_R_CONST) / (1 << PVT_CONV_BITS);
+ pre_scaler = pvt->vd[channel].pre_scaler;
+ *val = pre_scaler * (PVT_N_CONST * (long)n - PVT_R_CONST) /
+ (1 << PVT_CONV_BITS);
return 0;
default:
@@ -594,6 +604,43 @@ 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)
+{
+ u8 *pre_scaler_ch_list;
+ int i, ret, num_ch;
+ u32 channel;
+
+ /* Set default pre-scaler value to be 1. */
+ for (i = 0; i < pvt->vm_channels.total; i++)
+ pvt->vd[i].pre_scaler = PRE_SCALER_X1;
+
+ /* Get number of channels configured in "moortec,vm-pre-scaler-x2". */
+ num_ch = device_property_count_u8(dev, "moortec,vm-pre-scaler-x2");
+ if (num_ch <= 0)
+ return 0;
+
+ pre_scaler_ch_list = kcalloc(num_ch, 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-x2",
+ pre_scaler_ch_list, num_ch);
+ if (ret)
+ goto out;
+
+ for (i = 0; i < num_ch; i++) {
+ channel = pre_scaler_ch_list[i];
+ pvt->vd[channel].pre_scaler = PRE_SCALER_X2;
+ }
+
+out:
+ kfree(pre_scaler_ch_list);
+
+ return ret;
+}
+
static int mr75203_probe(struct platform_device *pdev)
{
u32 ts_num, vm_num, pd_num, ch_num, val, index, i;
@@ -709,6 +756,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-09-06 8:35 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 ` Eliav Farber [this message]
2022-09-06 8:33 ` [PATCH v4 16/21] hwmon: (mr75203) modify the temperature equation according to series 5 datasheet Eliav Farber
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-16-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.