| Message ID | 20230502-iio-adc-propagate-fw-node-label-v3-5-6be5db6e6b5a@somainline.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: qcom-spmi-vadc: Propagate fw node label to userspace | expand |
On 02/05/2023 02:17, Marijn Suijten wrote: > Set the read_label() callback to return a friendly name provided in DT > (firmware), in order to make in_{therm,voltage}X_label attributes show > up in sysfs for userspace to consume a channel name. This is > particularly useful for custom thermistors being attached to otherwise > generically named GPIOs, where the name is known by the board DT. > > If the channel name isn't set in DT, use the datasheet_name hardcoded in > the driver instead. > > Note that this doesn't fall back to fwnode_get_name() as that provides > suboptimally readable names, with an @xx address suffix from board DT. > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > drivers/iio/adc/qcom-spmi-vadc.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Sun, 7 May 2023 18:43:16 +0300 Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > On 02/05/2023 02:17, Marijn Suijten wrote: > > Set the read_label() callback to return a friendly name provided in DT > > (firmware), in order to make in_{therm,voltage}X_label attributes show > > up in sysfs for userspace to consume a channel name. This is > > particularly useful for custom thermistors being attached to otherwise > > generically named GPIOs, where the name is known by the board DT. > > > > If the channel name isn't set in DT, use the datasheet_name hardcoded in > > the driver instead. > > > > Note that this doesn't fall back to fwnode_get_name() as that provides > > suboptimally readable names, with an @xx address suffix from board DT. > > > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > > --- > > drivers/iio/adc/qcom-spmi-vadc.c | 19 ++++++++++++++++++- > > 1 file changed, 18 insertions(+), 1 deletion(-) > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Thanks, Series applied to the togreg branch of iio.git - initially pushed out as testing to let 0-day work it's magic before I go potentially making a mess in linux-next. Jonathan
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c index bcff0f62b70e0..f5c6f1f27b2c7 100644 --- a/drivers/iio/adc/qcom-spmi-vadc.c +++ b/drivers/iio/adc/qcom-spmi-vadc.c @@ -84,6 +84,7 @@ * that is an average of multiple measurements. * @scale_fn_type: Represents the scaling function to convert voltage * physical units desired by the client for the channel. + * @channel_name: Channel name used in device tree. */ struct vadc_channel_prop { unsigned int channel; @@ -93,6 +94,7 @@ struct vadc_channel_prop { unsigned int hw_settle_time; unsigned int avg_samples; enum vadc_scale_fn_type scale_fn_type; + const char *channel_name; }; /** @@ -495,8 +497,18 @@ static int vadc_fwnode_xlate(struct iio_dev *indio_dev, return -EINVAL; } +static int vadc_read_label(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, char *label) +{ + struct vadc_priv *vadc = iio_priv(indio_dev); + const char *name = vadc->chan_props[chan->address].channel_name; + + return sysfs_emit(label, "%s\n", name); +} + static const struct iio_info vadc_info = { .read_raw = vadc_read_raw, + .read_label = vadc_read_label, .fwnode_xlate = vadc_fwnode_xlate, }; @@ -652,7 +664,7 @@ static int vadc_get_fw_channel_data(struct device *dev, struct vadc_channel_prop *prop, struct fwnode_handle *fwnode) { - const char *name = fwnode_get_name(fwnode); + const char *name = fwnode_get_name(fwnode), *label; u32 chan, value, varr[2]; int ret; @@ -667,6 +679,11 @@ static int vadc_get_fw_channel_data(struct device *dev, return -EINVAL; } + ret = fwnode_property_read_string(fwnode, "label", &label); + if (ret) + label = vadc_chans[chan].datasheet_name; + prop->channel_name = label; + /* the channel has DT description */ prop->channel = chan;
Set the read_label() callback to return a friendly name provided in DT (firmware), in order to make in_{therm,voltage}X_label attributes show up in sysfs for userspace to consume a channel name. This is particularly useful for custom thermistors being attached to otherwise generically named GPIOs, where the name is known by the board DT. If the channel name isn't set in DT, use the datasheet_name hardcoded in the driver instead. Note that this doesn't fall back to fwnode_get_name() as that provides suboptimally readable names, with an @xx address suffix from board DT. Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> --- drivers/iio/adc/qcom-spmi-vadc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)