Add dt-bindings and support for Maxim DS3502 into existing ds1803 driver.
DS3502 is a 7 bit Nonvolatile Digital Potentiometer.
Changes since v4:
1. Included property.h header which has device_get_match_data()
function prototype.
2. Removed blank space in tag block of the commit message.
3. Style changes for ds1803_cfg structure.
Changes since v3:
1. Dropped the chip type switch statement in read_raw function.
2. Added device specific read function pointer in their structure.
3. Added two separate functions to read values from two different types
of devices.
Changes since v2:
1. Addressed Andy Shevchenko comments.
2. Adding device name in Kconfig file.
3. Spliting up of patch into 3 patches.
4. Adding channel info into ds1803_cfg in separate patch.
5. Dropping the use of enum in firmware data instead using previous
pointer method for accessing device specific data.
6. Separate patch for using firmware provided data instead of
id->driver_data.
7. Adding DS3502 support in separate patch.
Changes since v1:
1. Fixes the alignment to match the open parenthesis in separate patch.
2. Adding available functionality for ds1803 driver in separate patch.
3. Moving maxim_potentiometer members into ds1803_cfg structure.
4. Droping of the INFO_ENABLE channel type.
5. Firmware entry with data is used instead of id->driver_data to
to retrieve the chip specific data.
Jagath Jog J (7):
iio: potentiometer: Alignment to match the open parenthesis
iio: potentiometer: Add available functionality
iio: potentiometer: Add channel information in device data
iio: potentiometer: Change to firmware provided data
iio: potentiometer: Add device specific read_raw function
iio: potentiometer: Add support for Maxim DS3502
dt-bindings: iio: potentiometer: Add Maxim DS3502 in trivial-devices
.../devicetree/bindings/trivial-devices.yaml | 2 +
drivers/iio/potentiometer/Kconfig | 6 +-
drivers/iio/potentiometer/ds1803.c | 170 ++++++++++++++----
3 files changed, 138 insertions(+), 40 deletions(-)
--
2.17.1
Maxim DS3502 is a 7 bit nonvolatile digital potentiometer.
Add DS3502 binding into trivial-devices.yaml.
Signed-off-by: Jagath Jog J <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
Documentation/devicetree/bindings/trivial-devices.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index 091792ba993e..b6187603317a 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -157,6 +157,8 @@ properties:
- maxim,ds1803-050
# 100 kOhm digital potentiometer with I2C interface
- maxim,ds1803-100
+ # 10 kOhm digital potentiometer with I2C interface
+ - maxim,ds3502
# Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
- maxim,max1237
# Temperature Sensor, I2C interface
--
2.17.1
Fix following checkpatch.pl check by removing blank space.
CHECK: Alignment should match open parenthesis.
Signed-off-by: Jagath Jog J <[email protected]>
---
drivers/iio/potentiometer/ds1803.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index 20b45407eaac..3c542a50ece6 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -55,8 +55,8 @@ static const struct iio_chan_spec ds1803_channels[] = {
};
static int ds1803_read_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int *val, int *val2, long mask)
+ struct iio_chan_spec const *chan,
+ int *val, int *val2, long mask)
{
struct ds1803_data *data = iio_priv(indio_dev);
int pot = chan->channel;
@@ -66,7 +66,7 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_RAW:
ret = i2c_master_recv(data->client, result,
- indio_dev->num_channels);
+ indio_dev->num_channels);
if (ret < 0)
return ret;
@@ -83,8 +83,8 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
}
static int ds1803_write_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int val, int val2, long mask)
+ struct iio_chan_spec const *chan,
+ int val, int val2, long mask)
{
struct ds1803_data *data = iio_priv(indio_dev);
int pot = chan->channel;
@@ -109,8 +109,7 @@ static const struct iio_info ds1803_info = {
.write_raw = ds1803_write_raw,
};
-static int ds1803_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int ds1803_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
struct ds1803_data *data;
--
2.17.1
Adding available functionality for DS1803 driver which
will show the minimum, step and maximum values that the
driver can accepts through sysfs entry.
Now using the max value present in avail array instead of chip
type specific macro to make the driver flexible to add other
type of potentiometer with different max position value.
Signed-off-by: Jagath Jog J <[email protected]>
---
drivers/iio/potentiometer/ds1803.c | 61 ++++++++++++++++++++++--------
1 file changed, 45 insertions(+), 16 deletions(-)
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index 3c542a50ece6..9610269bed7f 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/mod_devicetable.h>
-#define DS1803_MAX_POS 255
#define DS1803_WRITE(chan) (0xa8 | ((chan) + 1))
enum ds1803_type {
@@ -26,27 +25,23 @@ enum ds1803_type {
};
struct ds1803_cfg {
+ int avail[3];
int kohms;
};
-static const struct ds1803_cfg ds1803_cfg[] = {
- [DS1803_010] = { .kohms = 10, },
- [DS1803_050] = { .kohms = 50, },
- [DS1803_100] = { .kohms = 100, },
-};
-
struct ds1803_data {
struct i2c_client *client;
const struct ds1803_cfg *cfg;
};
-#define DS1803_CHANNEL(ch) { \
- .type = IIO_RESISTANCE, \
- .indexed = 1, \
- .output = 1, \
- .channel = (ch), \
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+#define DS1803_CHANNEL(ch) { \
+ .type = IIO_RESISTANCE, \
+ .indexed = 1, \
+ .output = 1, \
+ .channel = (ch), \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+ .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_RAW), \
}
static const struct iio_chan_spec ds1803_channels[] = {
@@ -54,6 +49,21 @@ static const struct iio_chan_spec ds1803_channels[] = {
DS1803_CHANNEL(1),
};
+static const struct ds1803_cfg ds1803_cfg[] = {
+ [DS1803_010] = {
+ .avail = { 0, 1, 255 },
+ .kohms = 10,
+ },
+ [DS1803_050] = {
+ .avail = { 0, 1, 255 },
+ .kohms = 50,
+ },
+ [DS1803_100] = {
+ .avail = { 0, 1, 255 },
+ .kohms = 100,
+ },
+};
+
static int ds1803_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long mask)
@@ -75,7 +85,7 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SCALE:
*val = 1000 * data->cfg->kohms;
- *val2 = DS1803_MAX_POS;
+ *val2 = data->cfg->avail[2]; /* Max wiper position */
return IIO_VAL_FRACTIONAL;
}
@@ -88,13 +98,14 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
{
struct ds1803_data *data = iio_priv(indio_dev);
int pot = chan->channel;
+ int max_pos = data->cfg->avail[2];
if (val2 != 0)
return -EINVAL;
switch (mask) {
case IIO_CHAN_INFO_RAW:
- if (val > DS1803_MAX_POS || val < 0)
+ if (val > max_pos || val < 0)
return -EINVAL;
break;
default:
@@ -104,9 +115,27 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
return i2c_smbus_write_byte_data(data->client, DS1803_WRITE(pot), val);
}
+static int ds1803_read_avail(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ const int **vals, int *type,
+ int *length, long mask)
+{
+ struct ds1803_data *data = iio_priv(indio_dev);
+
+ switch (mask) {
+ case IIO_CHAN_INFO_RAW:
+ *vals = data->cfg->avail;
+ *length = ARRAY_SIZE(data->cfg->avail);
+ *type = IIO_VAL_INT;
+ return IIO_AVAIL_RANGE;
+ }
+ return -EINVAL;
+}
+
static const struct iio_info ds1803_info = {
.read_raw = ds1803_read_raw,
.write_raw = ds1803_write_raw,
+ .read_avail = ds1803_read_avail,
};
static int ds1803_probe(struct i2c_client *client, const struct i2c_device_id *id)
--
2.17.1
Added function pointer in the device specific structure to
call the appropriate device read_raw function, so that the
other type of devices with different read method can be
handled.
Signed-off-by: Jagath Jog J <[email protected]>
---
drivers/iio/potentiometer/ds1803.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index aeb74ee46fbc..878188351f8f 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -32,6 +32,8 @@ struct ds1803_cfg {
int kohms;
const struct iio_chan_spec *channels;
u8 num_channels;
+ int (*read)(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan, int *val);
};
struct ds1803_data {
@@ -55,6 +57,22 @@ static const struct iio_chan_spec ds1803_channels[] = {
DS1803_CHANNEL(1, DS1803_WIPER_1),
};
+static int ds1803_read(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val)
+{
+ struct ds1803_data *data = iio_priv(indio_dev);
+ int ret;
+ u8 result[ARRAY_SIZE(ds1803_channels)];
+
+ ret = i2c_master_recv(data->client, result, indio_dev->num_channels);
+ if (ret < 0)
+ return ret;
+
+ *val = result[chan->channel];
+ return ret;
+}
+
static const struct ds1803_cfg ds1803_cfg[] = {
[DS1803_010] = {
.wipers = 2,
@@ -62,6 +80,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
.kohms = 10,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
+ .read = ds1803_read,
},
[DS1803_050] = {
.wipers = 2,
@@ -69,6 +88,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
.kohms = 50,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
+ .read = ds1803_read,
},
[DS1803_100] = {
.wipers = 2,
@@ -76,6 +96,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
.kohms = 100,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
+ .read = ds1803_read,
},
};
@@ -84,20 +105,15 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask)
{
struct ds1803_data *data = iio_priv(indio_dev);
- int pot = chan->channel;
int ret;
- u8 result[ARRAY_SIZE(ds1803_channels)];
switch (mask) {
case IIO_CHAN_INFO_RAW:
- ret = i2c_master_recv(data->client, result,
- indio_dev->num_channels);
+ ret = data->cfg->read(indio_dev, chan, val);
if (ret < 0)
return ret;
- *val = result[pot];
return IIO_VAL_INT;
-
case IIO_CHAN_INFO_SCALE:
*val = 1000 * data->cfg->kohms;
*val2 = data->cfg->avail[2]; /* Max wiper position */
--
2.17.1
On Wed, Feb 23, 2022 at 6:35 PM Jagath Jog J <[email protected]> wrote:
>
> Added function pointer in the device specific structure to
> call the appropriate device read_raw function, so that the
> other type of devices with different read method can be
> handled.
>
> Signed-off-by: Jagath Jog J <[email protected]>
> ---
> drivers/iio/potentiometer/ds1803.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
> index aeb74ee46fbc..878188351f8f 100644
> --- a/drivers/iio/potentiometer/ds1803.c
> +++ b/drivers/iio/potentiometer/ds1803.c
> @@ -32,6 +32,8 @@ struct ds1803_cfg {
> int kohms;
> const struct iio_chan_spec *channels;
> u8 num_channels;
> + int (*read)(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan, int *val);
> };
>
> struct ds1803_data {
> @@ -55,6 +57,22 @@ static const struct iio_chan_spec ds1803_channels[] = {
> DS1803_CHANNEL(1, DS1803_WIPER_1),
> };
>
> +static int ds1803_read(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val)
> +{
> + struct ds1803_data *data = iio_priv(indio_dev);
> + int ret;
> + u8 result[ARRAY_SIZE(ds1803_channels)];
> +
> + ret = i2c_master_recv(data->client, result, indio_dev->num_channels);
> + if (ret < 0)
> + return ret;
> +
> + *val = result[chan->channel];
> + return ret;
> +}
> +
> static const struct ds1803_cfg ds1803_cfg[] = {
> [DS1803_010] = {
> .wipers = 2,
> @@ -62,6 +80,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> .kohms = 10,
> .channels = ds1803_channels,
> .num_channels = ARRAY_SIZE(ds1803_channels),
> + .read = ds1803_read,
> },
> [DS1803_050] = {
> .wipers = 2,
> @@ -69,6 +88,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> .kohms = 50,
> .channels = ds1803_channels,
> .num_channels = ARRAY_SIZE(ds1803_channels),
> + .read = ds1803_read,
> },
> [DS1803_100] = {
> .wipers = 2,
> @@ -76,6 +96,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> .kohms = 100,
> .channels = ds1803_channels,
> .num_channels = ARRAY_SIZE(ds1803_channels),
> + .read = ds1803_read,
> },
> };
>
> @@ -84,20 +105,15 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
> int *val, int *val2, long mask)
> {
> struct ds1803_data *data = iio_priv(indio_dev);
> - int pot = chan->channel;
> int ret;
> - u8 result[ARRAY_SIZE(ds1803_channels)];
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - ret = i2c_master_recv(data->client, result,
> - indio_dev->num_channels);
> + ret = data->cfg->read(indio_dev, chan, val);
> if (ret < 0)
> return ret;
>
> - *val = result[pot];
> return IIO_VAL_INT;
> -
Seems like a stray change. Up to Jonathan to decide what to do (no
need for resend b/c of this).
> case IIO_CHAN_INFO_SCALE:
> *val = 1000 * data->cfg->kohms;
> *val2 = data->cfg->avail[2]; /* Max wiper position */
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
On Wed, Feb 23, 2022 at 6:35 PM Jagath Jog J <[email protected]> wrote:
>
> Add dt-bindings and support for Maxim DS3502 into existing ds1803 driver.
> DS3502 is a 7 bit Nonvolatile Digital Potentiometer.
LGTM, thanks!
Reviewed-by: Andy Shevchenko <[email protected]>
for the entire series,
> Changes since v4:
> 1. Included property.h header which has device_get_match_data()
> function prototype.
> 2. Removed blank space in tag block of the commit message.
> 3. Style changes for ds1803_cfg structure.
>
> Changes since v3:
> 1. Dropped the chip type switch statement in read_raw function.
> 2. Added device specific read function pointer in their structure.
> 3. Added two separate functions to read values from two different types
> of devices.
>
> Changes since v2:
> 1. Addressed Andy Shevchenko comments.
> 2. Adding device name in Kconfig file.
> 3. Spliting up of patch into 3 patches.
> 4. Adding channel info into ds1803_cfg in separate patch.
> 5. Dropping the use of enum in firmware data instead using previous
> pointer method for accessing device specific data.
> 6. Separate patch for using firmware provided data instead of
> id->driver_data.
> 7. Adding DS3502 support in separate patch.
>
> Changes since v1:
> 1. Fixes the alignment to match the open parenthesis in separate patch.
> 2. Adding available functionality for ds1803 driver in separate patch.
> 3. Moving maxim_potentiometer members into ds1803_cfg structure.
> 4. Droping of the INFO_ENABLE channel type.
> 5. Firmware entry with data is used instead of id->driver_data to
> to retrieve the chip specific data.
>
> Jagath Jog J (7):
> iio: potentiometer: Alignment to match the open parenthesis
> iio: potentiometer: Add available functionality
> iio: potentiometer: Add channel information in device data
> iio: potentiometer: Change to firmware provided data
> iio: potentiometer: Add device specific read_raw function
> iio: potentiometer: Add support for Maxim DS3502
> dt-bindings: iio: potentiometer: Add Maxim DS3502 in trivial-devices
>
> .../devicetree/bindings/trivial-devices.yaml | 2 +
> drivers/iio/potentiometer/Kconfig | 6 +-
> drivers/iio/potentiometer/ds1803.c | 170 ++++++++++++++----
> 3 files changed, 138 insertions(+), 40 deletions(-)
>
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
On Wed, 23 Feb 2022 22:05:20 +0530
Jagath Jog J <[email protected]> wrote:
> Adding available functionality for DS1803 driver which
> will show the minimum, step and maximum values that the
> driver can accepts through sysfs entry.
> Now using the max value present in avail array instead of chip
> type specific macro to make the driver flexible to add other
> type of potentiometer with different max position value.
>
> Signed-off-by: Jagath Jog J <[email protected]>
> ---
> drivers/iio/potentiometer/ds1803.c | 61 ++++++++++++++++++++++--------
> 1 file changed, 45 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
> index 3c542a50ece6..9610269bed7f 100644
> --- a/drivers/iio/potentiometer/ds1803.c
> +++ b/drivers/iio/potentiometer/ds1803.c
> @@ -16,7 +16,6 @@
> #include <linux/module.h>
> #include <linux/mod_devicetable.h>
>
> -#define DS1803_MAX_POS 255
> #define DS1803_WRITE(chan) (0xa8 | ((chan) + 1))
>
> enum ds1803_type {
> @@ -26,27 +25,23 @@ enum ds1803_type {
> };
>
> struct ds1803_cfg {
> + int avail[3];
> int kohms;
> };
>
> -static const struct ds1803_cfg ds1803_cfg[] = {
> - [DS1803_010] = { .kohms = 10, },
> - [DS1803_050] = { .kohms = 50, },
> - [DS1803_100] = { .kohms = 100, },
> -};
> -
> struct ds1803_data {
> struct i2c_client *client;
> const struct ds1803_cfg *cfg;
> };
>
> -#define DS1803_CHANNEL(ch) { \
> - .type = IIO_RESISTANCE, \
> - .indexed = 1, \
> - .output = 1, \
> - .channel = (ch), \
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
> - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
> +#define DS1803_CHANNEL(ch) { \
> + .type = IIO_RESISTANCE, \
> + .indexed = 1, \
> + .output = 1, \
> + .channel = (ch), \
> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
> + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
> + .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_RAW), \
> }
>
> static const struct iio_chan_spec ds1803_channels[] = {
> @@ -54,6 +49,21 @@ static const struct iio_chan_spec ds1803_channels[] = {
> DS1803_CHANNEL(1),
> };
>
> +static const struct ds1803_cfg ds1803_cfg[] = {
> + [DS1803_010] = {
> + .avail = { 0, 1, 255 },
Why non standard indenting. These should be a tab in rather than
a couple of spaces.
I'll fixup whilst applying.
Jonathan
> + .kohms = 10,
> + },
> + [DS1803_050] = {
> + .avail = { 0, 1, 255 },
> + .kohms = 50,
> + },
> + [DS1803_100] = {
> + .avail = { 0, 1, 255 },
> + .kohms = 100,
> + },
> +};
> +
> static int ds1803_read_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *chan,
> int *val, int *val2, long mask)
> @@ -75,7 +85,7 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
>
> case IIO_CHAN_INFO_SCALE:
> *val = 1000 * data->cfg->kohms;
> - *val2 = DS1803_MAX_POS;
> + *val2 = data->cfg->avail[2]; /* Max wiper position */
> return IIO_VAL_FRACTIONAL;
> }
>
> @@ -88,13 +98,14 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
> {
> struct ds1803_data *data = iio_priv(indio_dev);
> int pot = chan->channel;
> + int max_pos = data->cfg->avail[2];
>
> if (val2 != 0)
> return -EINVAL;
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - if (val > DS1803_MAX_POS || val < 0)
> + if (val > max_pos || val < 0)
> return -EINVAL;
> break;
> default:
> @@ -104,9 +115,27 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
> return i2c_smbus_write_byte_data(data->client, DS1803_WRITE(pot), val);
> }
>
> +static int ds1803_read_avail(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + const int **vals, int *type,
> + int *length, long mask)
> +{
> + struct ds1803_data *data = iio_priv(indio_dev);
> +
> + switch (mask) {
> + case IIO_CHAN_INFO_RAW:
> + *vals = data->cfg->avail;
> + *length = ARRAY_SIZE(data->cfg->avail);
> + *type = IIO_VAL_INT;
> + return IIO_AVAIL_RANGE;
> + }
> + return -EINVAL;
> +}
> +
> static const struct iio_info ds1803_info = {
> .read_raw = ds1803_read_raw,
> .write_raw = ds1803_write_raw,
> + .read_avail = ds1803_read_avail,
> };
>
> static int ds1803_probe(struct i2c_client *client, const struct i2c_device_id *id)
On Thu, 24 Feb 2022 02:46:34 +0200
Andy Shevchenko <[email protected]> wrote:
> On Wed, Feb 23, 2022 at 6:35 PM Jagath Jog J <[email protected]> wrote:
> >
> > Added function pointer in the device specific structure to
> > call the appropriate device read_raw function, so that the
> > other type of devices with different read method can be
> > handled.
> >
> > Signed-off-by: Jagath Jog J <[email protected]>
> > ---
> > drivers/iio/potentiometer/ds1803.c | 28 ++++++++++++++++++++++------
> > 1 file changed, 22 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
> > index aeb74ee46fbc..878188351f8f 100644
> > --- a/drivers/iio/potentiometer/ds1803.c
> > +++ b/drivers/iio/potentiometer/ds1803.c
> > @@ -32,6 +32,8 @@ struct ds1803_cfg {
> > int kohms;
> > const struct iio_chan_spec *channels;
> > u8 num_channels;
> > + int (*read)(struct iio_dev *indio_dev,
> > + struct iio_chan_spec const *chan, int *val);
> > };
> >
> > struct ds1803_data {
> > @@ -55,6 +57,22 @@ static const struct iio_chan_spec ds1803_channels[] = {
> > DS1803_CHANNEL(1, DS1803_WIPER_1),
> > };
> >
> > +static int ds1803_read(struct iio_dev *indio_dev,
> > + struct iio_chan_spec const *chan,
> > + int *val)
> > +{
> > + struct ds1803_data *data = iio_priv(indio_dev);
> > + int ret;
> > + u8 result[ARRAY_SIZE(ds1803_channels)];
> > +
> > + ret = i2c_master_recv(data->client, result, indio_dev->num_channels);
> > + if (ret < 0)
> > + return ret;
> > +
> > + *val = result[chan->channel];
> > + return ret;
> > +}
> > +
> > static const struct ds1803_cfg ds1803_cfg[] = {
> > [DS1803_010] = {
> > .wipers = 2,
> > @@ -62,6 +80,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> > .kohms = 10,
> > .channels = ds1803_channels,
> > .num_channels = ARRAY_SIZE(ds1803_channels),
> > + .read = ds1803_read,
> > },
> > [DS1803_050] = {
> > .wipers = 2,
> > @@ -69,6 +88,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> > .kohms = 50,
> > .channels = ds1803_channels,
> > .num_channels = ARRAY_SIZE(ds1803_channels),
> > + .read = ds1803_read,
> > },
> > [DS1803_100] = {
> > .wipers = 2,
> > @@ -76,6 +96,7 @@ static const struct ds1803_cfg ds1803_cfg[] = {
> > .kohms = 100,
> > .channels = ds1803_channels,
> > .num_channels = ARRAY_SIZE(ds1803_channels),
> > + .read = ds1803_read,
> > },
> > };
> >
> > @@ -84,20 +105,15 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
> > int *val, int *val2, long mask)
> > {
> > struct ds1803_data *data = iio_priv(indio_dev);
> > - int pot = chan->channel;
> > int ret;
> > - u8 result[ARRAY_SIZE(ds1803_channels)];
> >
> > switch (mask) {
> > case IIO_CHAN_INFO_RAW:
> > - ret = i2c_master_recv(data->client, result,
> > - indio_dev->num_channels);
> > + ret = data->cfg->read(indio_dev, chan, val);
> > if (ret < 0)
> > return ret;
> >
> > - *val = result[pot];
> > return IIO_VAL_INT;
>
> > -
>
> Seems like a stray change. Up to Jonathan to decide what to do (no
> need for resend b/c of this).
Good spot. Given I was tweaking this series a fair bit anyway whilst
applying I tidied this up as well.
Thanks,
Jonathan
>
> > case IIO_CHAN_INFO_SCALE:
> > *val = 1000 * data->cfg->kohms;
> > *val2 = data->cfg->avail[2]; /* Max wiper position */
> > --
> > 2.17.1
> >
>
>
On Wed, 23 Feb 2022 22:05:19 +0530
Jagath Jog J <[email protected]> wrote:
> Fix following checkpatch.pl check by removing blank space.
> CHECK: Alignment should match open parenthesis.
>
> Signed-off-by: Jagath Jog J <[email protected]>
I didn't noticed before, but for future please put the driver name
in the patch titles!
iio: potentiometer: ds1803: xxxx
I'll fix up.
> ---
> drivers/iio/potentiometer/ds1803.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
> index 20b45407eaac..3c542a50ece6 100644
> --- a/drivers/iio/potentiometer/ds1803.c
> +++ b/drivers/iio/potentiometer/ds1803.c
> @@ -55,8 +55,8 @@ static const struct iio_chan_spec ds1803_channels[] = {
> };
>
> static int ds1803_read_raw(struct iio_dev *indio_dev,
> - struct iio_chan_spec const *chan,
> - int *val, int *val2, long mask)
> + struct iio_chan_spec const *chan,
> + int *val, int *val2, long mask)
> {
> struct ds1803_data *data = iio_priv(indio_dev);
> int pot = chan->channel;
> @@ -66,7 +66,7 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> ret = i2c_master_recv(data->client, result,
> - indio_dev->num_channels);
> + indio_dev->num_channels);
> if (ret < 0)
> return ret;
>
> @@ -83,8 +83,8 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
> }
>
> static int ds1803_write_raw(struct iio_dev *indio_dev,
> - struct iio_chan_spec const *chan,
> - int val, int val2, long mask)
> + struct iio_chan_spec const *chan,
> + int val, int val2, long mask)
> {
> struct ds1803_data *data = iio_priv(indio_dev);
> int pot = chan->channel;
> @@ -109,8 +109,7 @@ static const struct iio_info ds1803_info = {
> .write_raw = ds1803_write_raw,
> };
>
> -static int ds1803_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int ds1803_probe(struct i2c_client *client, const struct i2c_device_id *id)
> {
> struct device *dev = &client->dev;
> struct ds1803_data *data;
On Thu, 24 Feb 2022 02:47:53 +0200
Andy Shevchenko <[email protected]> wrote:
> On Wed, Feb 23, 2022 at 6:35 PM Jagath Jog J <[email protected]> wrote:
> >
> > Add dt-bindings and support for Maxim DS3502 into existing ds1803 driver.
> > DS3502 is a 7 bit Nonvolatile Digital Potentiometer.
>
> LGTM, thanks!
> Reviewed-by: Andy Shevchenko <[email protected]>
> for the entire series,
Applied to the togreg branch of iio.git with the various tweaks I mentioned
in reply to individual patches.
Pushed out initially as testing to let 0-day run it's much more comprehensive
set of build tests against it than I run locally.
Thanks,
Jonathan
>
> > Changes since v4:
> > 1. Included property.h header which has device_get_match_data()
> > function prototype.
> > 2. Removed blank space in tag block of the commit message.
> > 3. Style changes for ds1803_cfg structure.
> >
> > Changes since v3:
> > 1. Dropped the chip type switch statement in read_raw function.
> > 2. Added device specific read function pointer in their structure.
> > 3. Added two separate functions to read values from two different types
> > of devices.
> >
> > Changes since v2:
> > 1. Addressed Andy Shevchenko comments.
> > 2. Adding device name in Kconfig file.
> > 3. Spliting up of patch into 3 patches.
> > 4. Adding channel info into ds1803_cfg in separate patch.
> > 5. Dropping the use of enum in firmware data instead using previous
> > pointer method for accessing device specific data.
> > 6. Separate patch for using firmware provided data instead of
> > id->driver_data.
> > 7. Adding DS3502 support in separate patch.
> >
> > Changes since v1:
> > 1. Fixes the alignment to match the open parenthesis in separate patch.
> > 2. Adding available functionality for ds1803 driver in separate patch.
> > 3. Moving maxim_potentiometer members into ds1803_cfg structure.
> > 4. Droping of the INFO_ENABLE channel type.
> > 5. Firmware entry with data is used instead of id->driver_data to
> > to retrieve the chip specific data.
> >
> > Jagath Jog J (7):
> > iio: potentiometer: Alignment to match the open parenthesis
> > iio: potentiometer: Add available functionality
> > iio: potentiometer: Add channel information in device data
> > iio: potentiometer: Change to firmware provided data
> > iio: potentiometer: Add device specific read_raw function
> > iio: potentiometer: Add support for Maxim DS3502
> > dt-bindings: iio: potentiometer: Add Maxim DS3502 in trivial-devices
> >
> > .../devicetree/bindings/trivial-devices.yaml | 2 +
> > drivers/iio/potentiometer/Kconfig | 6 +-
> > drivers/iio/potentiometer/ds1803.c | 170 ++++++++++++++----
> > 3 files changed, 138 insertions(+), 40 deletions(-)
> >
> > --
> > 2.17.1
> >
>
>