* [PATCH v3 0/2] Driver for Microchip digital potentiometers @ 2015-09-22 12:39 Peter Rosin 2015-09-22 12:39 ` [PATCH v3 1/2] iio: resistance: Document that resistance can be output Peter Rosin 2015-09-22 12:39 ` [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers Peter Rosin 0 siblings, 2 replies; 7+ messages in thread From: Peter Rosin @ 2015-09-22 12:39 UTC (permalink / raw) To: linux-iio Cc: Peter Rosin, Crt Mori, Daniel Baluta, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Peter Rosin, linux-kernel From: Peter Rosin <peda@axentia.se> This is the third attempt for a driver for these chips. Thanks for review comments from Crt Mori, Daniel Baluta, Lars-Peter Clauson and Andreas Dannenberg. I think and hope I got it all sorted. Changes since v2: - Change naming from mcp4xxx_dpot to mcp4531 (Daniel) - Added links to datasheet in commit message and source (Daniel) - Rename from pot to potentiometer (Daniel, Crt) - Use IIO_RESISTANCE instead of IIO_STEPS (Crt, Lars-Peter) - Don't use wildcards in MAINTAINERS and point to the iio list (Crt) - Avoid races by not caching values (Crt) - Spell Microchip correctly (Andreas) Changes since v1: - Make it an IIO driver instead - Don't convolute the code with big obscure macros - Inline the bits from mcp4xxx_dpot.h that are actually used and drop that file - Better Changelog Cheers, Peter Peter Rosin (2): iio: resistance: Document that resistance can be output iio: mcp4531: Driver for Microchip digital potentiometers Documentation/ABI/testing/sysfs-bus-iio | 2 + MAINTAINERS | 6 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/potentiometer/Kconfig | 20 ++++ drivers/iio/potentiometer/Makefile | 6 + drivers/iio/potentiometer/mcp4531.c | 200 +++++++++++++++++++++++++++++++ 7 files changed, 236 insertions(+) create mode 100644 drivers/iio/potentiometer/Kconfig create mode 100644 drivers/iio/potentiometer/Makefile create mode 100644 drivers/iio/potentiometer/mcp4531.c -- 1.7.10.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] iio: resistance: Document that resistance can be output 2015-09-22 12:39 [PATCH v3 0/2] Driver for Microchip digital potentiometers Peter Rosin @ 2015-09-22 12:39 ` Peter Rosin 2015-09-22 12:48 ` Daniel Baluta 2015-09-22 12:39 ` [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers Peter Rosin 1 sibling, 1 reply; 7+ messages in thread From: Peter Rosin @ 2015-09-22 12:39 UTC (permalink / raw) To: linux-iio Cc: Peter Rosin, Crt Mori, Daniel Baluta, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Peter Rosin, linux-kernel From: Peter Rosin <peda@axentia.se> Signed-off-by: Peter Rosin <peda@axentia.se> --- Documentation/ABI/testing/sysfs-bus-iio | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 9398484196c4..2eea468f704d 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio @@ -1475,6 +1475,8 @@ Description: What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw +What: /sys/bus/iio/devices/iio:deviceX/out_resistance_raw +What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw KernelVersion: 4.3 Contact: linux-iio@vger.kernel.org Description: -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] iio: resistance: Document that resistance can be output 2015-09-22 12:39 ` [PATCH v3 1/2] iio: resistance: Document that resistance can be output Peter Rosin @ 2015-09-22 12:48 ` Daniel Baluta 2015-09-22 12:55 ` Peter Rosin 0 siblings, 1 reply; 7+ messages in thread From: Daniel Baluta @ 2015-09-22 12:48 UTC (permalink / raw) To: Peter Rosin Cc: linux-iio@vger.kernel.org, Peter Rosin, Crt Mori, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Linux Kernel Mailing List On Tue, Sep 22, 2015 at 3:39 PM, Peter Rosin <peda@lysator.liu.se> wrote: > From: Peter Rosin <peda@axentia.se> > > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > Documentation/ABI/testing/sysfs-bus-iio | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/= testing/sysfs-bus-iio > index 9398484196c4..2eea468f704d 100644 > --- a/Documentation/ABI/testing/sysfs-bus-iio > +++ b/Documentation/ABI/testing/sysfs-bus-iio > @@ -1475,6 +1475,8 @@ Description: > > What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw > What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw > +What: /sys/bus/iio/devices/iio:deviceX/out_resistance_raw > +What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw > KernelVersion: 4.3 > Contact: linux-iio@vger.kernel.org > Description: One more thing. The description for this sections says: =C2=BB =C2=BB Raw (unscaled no offset etc.) resistance reading = that can be processed =C2=BB =C2=BB into an ohm value. I'm not sure this still holds for out_resistanceX_raw. We have two options = here: * remove 'reading' because with the out_ file we are basically setting the resistance raw value OR * add a separate section for out_ files, with proper description. Any other comments? thanks, Daniel. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] iio: resistance: Document that resistance can be output 2015-09-22 12:48 ` Daniel Baluta @ 2015-09-22 12:55 ` Peter Rosin 2015-09-22 12:59 ` Daniel Baluta 0 siblings, 1 reply; 7+ messages in thread From: Peter Rosin @ 2015-09-22 12:55 UTC (permalink / raw) To: Daniel Baluta Cc: linux-iio@vger.kernel.org, Peter Rosin, Crt Mori, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Linux Kernel Mailing List On 2015-09-22 14:48, Daniel Baluta wrote: > On Tue, Sep 22, 2015 at 3:39 PM, Peter Rosin <peda@lysator.liu.se> wrote: >> From: Peter Rosin <peda@axentia.se> >> >> Signed-off-by: Peter Rosin <peda@axentia.se> >> --- >> Documentation/ABI/testing/sysfs-bus-iio | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio >> index 9398484196c4..2eea468f704d 100644 >> --- a/Documentation/ABI/testing/sysfs-bus-iio >> +++ b/Documentation/ABI/testing/sysfs-bus-iio >> @@ -1475,6 +1475,8 @@ Description: >> >> What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw >> What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw >> +What: /sys/bus/iio/devices/iio:deviceX/out_resistance_raw >> +What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw >> KernelVersion: 4.3 >> Contact: linux-iio@vger.kernel.org >> Description: > > One more thing. The description for this sections says: > > » » Raw (unscaled no offset etc.) resistance reading that > can be processed > » » into an ohm value. > > I'm not sure this still holds for out_resistanceX_raw. We have two options here: I figured it did hold, since you effectively select what reading the resistance inside the potentiometer should have. If it's really important I can of course make another spin, but is this somthing that is likely to be misunderstood? > * remove 'reading' because with the out_ file we are basically setting > the resistance > raw value OR > * add a separate section for out_ files, with proper description. > > Any other comments? > > thanks, > Daniel. > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] iio: resistance: Document that resistance can be output 2015-09-22 12:55 ` Peter Rosin @ 2015-09-22 12:59 ` Daniel Baluta 0 siblings, 0 replies; 7+ messages in thread From: Daniel Baluta @ 2015-09-22 12:59 UTC (permalink / raw) To: Peter Rosin Cc: linux-iio@vger.kernel.org, Peter Rosin, Crt Mori, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Linux Kernel Mailing List On Tue, Sep 22, 2015 at 3:55 PM, Peter Rosin <peda@lysator.liu.se> wrote: > On 2015-09-22 14:48, Daniel Baluta wrote: >> On Tue, Sep 22, 2015 at 3:39 PM, Peter Rosin <peda@lysator.liu.se> wrote= : >>> From: Peter Rosin <peda@axentia.se> >>> >>> Signed-off-by: Peter Rosin <peda@axentia.se> >>> --- >>> Documentation/ABI/testing/sysfs-bus-iio | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/AB= I/testing/sysfs-bus-iio >>> index 9398484196c4..2eea468f704d 100644 >>> --- a/Documentation/ABI/testing/sysfs-bus-iio >>> +++ b/Documentation/ABI/testing/sysfs-bus-iio >>> @@ -1475,6 +1475,8 @@ Description: >>> >>> What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw >>> What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw >>> +What: /sys/bus/iio/devices/iio:deviceX/out_resistance_raw >>> +What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw >>> KernelVersion: 4.3 >>> Contact: linux-iio@vger.kernel.org >>> Description: >> >> One more thing. The description for this sections says: >> >> =C2=BB =C2=BB Raw (unscaled no offset etc.) resistance readi= ng that >> can be processed >> =C2=BB =C2=BB into an ohm value. >> >> I'm not sure this still holds for out_resistanceX_raw. We have two optio= ns here: > > I figured it did hold, since you effectively select what reading the > resistance inside the potentiometer should have. If it's really > important I can of course make another spin, but is this somthing > that is likely to be misunderstood? Now, with your explanation it makes more sense. We can leave it like that. thanks, Daniel. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers 2015-09-22 12:39 [PATCH v3 0/2] Driver for Microchip digital potentiometers Peter Rosin 2015-09-22 12:39 ` [PATCH v3 1/2] iio: resistance: Document that resistance can be output Peter Rosin @ 2015-09-22 12:39 ` Peter Rosin 2015-09-22 13:01 ` Peter Meerwald 1 sibling, 1 reply; 7+ messages in thread From: Peter Rosin @ 2015-09-22 12:39 UTC (permalink / raw) To: linux-iio Cc: Peter Rosin, Crt Mori, Daniel Baluta, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, Peter Rosin, linux-kernel From: Peter Rosin <peda@axentia.se> Add support for Microchip digital potentiometers and rheostats MCP4531, MCP4532, MCP4551, MCP4552 MCP4631, MCP4632, MCP4651, MCP4652 These are either single (45xx) or dual (46xx) wipers with either 129 (4x3x) or 257 (4x5x) steps, and configured either as potentiometers (4xx1) or rheostats (4xx2). Datasheet: http://www.microchip.com/downloads/en/DeviceDoc/22096b.pdf Signed-off-by: Peter Rosin <peda@axentia.se> --- MAINTAINERS | 6 ++ drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/potentiometer/Kconfig | 20 ++++ drivers/iio/potentiometer/Makefile | 6 ++ drivers/iio/potentiometer/mcp4531.c | 200 +++++++++++++++++++++++++++++++++++ 6 files changed, 234 insertions(+) create mode 100644 drivers/iio/potentiometer/Kconfig create mode 100644 drivers/iio/potentiometer/Makefile create mode 100644 drivers/iio/potentiometer/mcp4531.c diff --git a/MAINTAINERS b/MAINTAINERS index b60e2b2369d2..27862156c7a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6600,6 +6600,12 @@ W: http://linuxtv.org S: Maintained F: drivers/media/radio/radio-maxiradio* +MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER +M: Peter Rosin <peda@axentia.se> +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/potentiometer/mcp4531.c + MEDIA DRIVERS FOR RENESAS - VSP1 M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: linux-media@vger.kernel.org diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index 4011effe4c05..7cc87f322655 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -73,6 +73,7 @@ source "drivers/iio/orientation/Kconfig" if IIO_TRIGGER source "drivers/iio/trigger/Kconfig" endif #IIO_TRIGGER +source "drivers/iio/potentiometer/Kconfig" source "drivers/iio/pressure/Kconfig" source "drivers/iio/proximity/Kconfig" source "drivers/iio/temperature/Kconfig" diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile index 698afc2d17ce..121c814e366b 100644 --- a/drivers/iio/Makefile +++ b/drivers/iio/Makefile @@ -23,6 +23,7 @@ obj-y += imu/ obj-y += light/ obj-y += magnetometer/ obj-y += orientation/ +obj-y += potentiometer/ obj-y += pressure/ obj-y += proximity/ obj-y += temperature/ diff --git a/drivers/iio/potentiometer/Kconfig b/drivers/iio/potentiometer/Kconfig new file mode 100644 index 000000000000..fd75db73e582 --- /dev/null +++ b/drivers/iio/potentiometer/Kconfig @@ -0,0 +1,20 @@ +# +# Potentiometer drivers +# +# When adding new entries keep the list in alphabetical order + +menu "Digital potentiometers" + +config MCP4531 + tristate "Microchip MCP45xx/MCP46xx Digital Potentiometer driver" + depends on I2C + help + Say yes here to build support for the Microchip + MCP4531, MCP4532, MCP4551, MCP4552, + MCP4631, MCP4632, MCP4651, MCP4652 + digital potentiomenter chips. + + To compile this driver as a module, choose M here: the + module will be called mcp4531. + +endmenu diff --git a/drivers/iio/potentiometer/Makefile b/drivers/iio/potentiometer/Makefile new file mode 100644 index 000000000000..8afe49227012 --- /dev/null +++ b/drivers/iio/potentiometer/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for industrial I/O potentiometer drivers +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_MCP4531) += mcp4531.o diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c new file mode 100644 index 000000000000..11039b215080 --- /dev/null +++ b/drivers/iio/potentiometer/mcp4531.c @@ -0,0 +1,200 @@ +/* + * Industrial I/O driver for Microchip digital potentiometers + * Copyright (c) 2015 Axentia Technologies AB + * Author: Peter Rosin <peda@axentia.se> + * + * Datasheet: http://www.microchip.com/downloads/en/DeviceDoc/22096b.pdf + * + * DEVID #Wipers #Positions Resistor Options (kOhm) + * mcp4531 1 129 5, 10, 50, 100 + * mcp4532 1 129 5, 10, 50, 100 + * mcp4551 1 257 5, 10, 50, 100 + * mcp4552 1 257 5, 10, 50, 100 + * mcp4631 2 129 5, 10, 50, 100 + * mcp4632 2 129 5, 10, 50, 100 + * mcp4651 2 257 5, 10, 50, 100 + * mcp4652 2 257 5, 10, 50, 100 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + */ + +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/err.h> + +#include <linux/iio/iio.h> + + +#define MCP4531_CONF(wipers, max_pos, uid) \ + ((((wipers) & 0xf) << 10) | \ + (((max_pos) & 0xf) << 6) | \ + ((uid) & 0x3f)) + +#define MCP4531_UID(conf) ((conf) & 0x3f) +#define MCP4531_MAX_POS(conf) (((conf) >> 6) & 0xf) +#define MCP4531_WIPERS(conf) (((conf) >> 10) & 0xf) + +enum mcp4531_devid { + MCP4531_ID = MCP4531_CONF(1, 7, 0), + MCP4532_ID = MCP4531_CONF(1, 7, 1), + MCP4551_ID = MCP4531_CONF(1, 8, 2), + MCP4552_ID = MCP4531_CONF(1, 8, 3), + MCP4631_ID = MCP4531_CONF(2, 7, 4), + MCP4632_ID = MCP4531_CONF(2, 7, 5), + MCP4651_ID = MCP4531_CONF(2, 8, 6), + MCP4652_ID = MCP4531_CONF(2, 8, 7), +}; + +struct mcp4531_data { + struct i2c_client *client; + unsigned int max_pos; + unsigned long devid; +}; + +static const struct iio_chan_spec mcp4531_channels[] = { + { + .type = IIO_RESISTANCE, + .indexed = 1, + .output = 1, + .channel = 0, + .address = 0 << 4, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + }, { + .type = IIO_RESISTANCE, + .indexed = 1, + .output = 1, + .channel = 1, + .address = 1 << 4, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + } +}; + +static int mcp4531_get_value(struct iio_dev *indio_dev, + int address, int *val) +{ + struct mcp4531_data *data = iio_priv(indio_dev); + s32 value; + + value = i2c_smbus_read_word_data(data->client, address | 0xc); + if (value < 0) + return value; + *val = ((value >> 8) & 0xff) | ((value & 0xff) << 8); + return 0; +} + +static int mcp4531_set_value(struct iio_dev *indio_dev, + int address, int val) +{ + struct mcp4531_data *data = iio_priv(indio_dev); + + if (val >= data->max_pos || val < 0) + return -EINVAL; + + return i2c_smbus_write_byte_data(data->client, + address | (val >> 8), + val & 0xff); +} + +static int mcp4531_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + int err; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + err = mcp4531_get_value(indio_dev, chan->address, val); + if (err < 0) + return err; + return IIO_VAL_INT; + } + + return -EINVAL; +} + +static int mcp4531_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_RAW: + return mcp4531_set_value(indio_dev, chan->address, val); + } + + return -EINVAL; +} + +static const struct iio_info mcp4531_info = { + .read_raw = mcp4531_read_raw, + .write_raw = mcp4531_write_raw, + .driver_module = THIS_MODULE, +}; + +static int mcp4531_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct device *dev = &client->dev; + unsigned long devid = id->driver_data; + struct mcp4531_data *data; + struct iio_dev *indio_dev; + + if (!i2c_check_functionality(client->adapter, + I2C_FUNC_SMBUS_WORD_DATA)) { + dev_err(dev, "SMBUS Word Data not supported\n"); + return -EIO; + } + + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) + return -ENOMEM; + data = iio_priv(indio_dev); + i2c_set_clientdata(client, indio_dev); + data->client = client; + data->devid = devid; + + data->max_pos = (1 << MCP4531_MAX_POS(devid)) + 1; + + indio_dev->dev.parent = dev; + indio_dev->info = &mcp4531_info; + indio_dev->channels = mcp4531_channels; + indio_dev->num_channels = MCP4531_WIPERS(devid); + indio_dev->name = client->name; + + return iio_device_register(indio_dev); +} + +static int mcp4531_remove(struct i2c_client *client) +{ + iio_device_unregister(i2c_get_clientdata(client)); + return 0; +} + +static const struct i2c_device_id mcp4531_id[] = { + { "mcp4531", MCP4531_ID }, + { "mcp4532", MCP4532_ID }, + { "mcp4551", MCP4551_ID }, + { "mcp4552", MCP4552_ID }, + { "mcp4631", MCP4631_ID }, + { "mcp4632", MCP4632_ID }, + { "mcp4651", MCP4651_ID }, + { "mcp4652", MCP4652_ID }, + {} +}; +MODULE_DEVICE_TABLE(i2c, mcp4531_id); + +static struct i2c_driver mcp4531_driver = { + .driver = { + .name = "mcp4531", + }, + .probe = mcp4531_probe, + .remove = mcp4531_remove, + .id_table = mcp4531_id, +}; + +module_i2c_driver(mcp4531_driver); + +MODULE_AUTHOR("Peter Rosin <peda@axentia.se>"); +MODULE_DESCRIPTION("MCP4531 digital potentiometer"); +MODULE_LICENSE("GPL"); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers 2015-09-22 12:39 ` [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers Peter Rosin @ 2015-09-22 13:01 ` Peter Meerwald 0 siblings, 0 replies; 7+ messages in thread From: Peter Meerwald @ 2015-09-22 13:01 UTC (permalink / raw) To: Peter Rosin Cc: linux-iio, Peter Rosin, Crt Mori, Daniel Baluta, Andreas Dannenberg, Greg Kroah-Hartman, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, linux-kernel > Add support for Microchip digital potentiometers and rheostats > MCP4531, MCP4532, MCP4551, MCP4552 > MCP4631, MCP4632, MCP4651, MCP4652 > > These are either single (45xx) or dual (46xx) wipers with either > 129 (4x3x) or 257 (4x5x) steps, and configured either as > potentiometers (4xx1) or rheostats (4xx2). > > Datasheet: http://www.microchip.com/downloads/en/DeviceDoc/22096b.pdf some comments below I find it useful to state the 7-bit i2c slave address somewhere, 0101xxx in this case > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > MAINTAINERS | 6 ++ > drivers/iio/Kconfig | 1 + > drivers/iio/Makefile | 1 + > drivers/iio/potentiometer/Kconfig | 20 ++++ > drivers/iio/potentiometer/Makefile | 6 ++ > drivers/iio/potentiometer/mcp4531.c | 200 +++++++++++++++++++++++++++++++++++ > 6 files changed, 234 insertions(+) > create mode 100644 drivers/iio/potentiometer/Kconfig > create mode 100644 drivers/iio/potentiometer/Makefile > create mode 100644 drivers/iio/potentiometer/mcp4531.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index b60e2b2369d2..27862156c7a7 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6600,6 +6600,12 @@ W: http://linuxtv.org > S: Maintained > F: drivers/media/radio/radio-maxiradio* > > +MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER > +M: Peter Rosin <peda@axentia.se> > +L: linux-iio@vger.kernel.org > +S: Maintained > +F: drivers/iio/potentiometer/mcp4531.c > + > MEDIA DRIVERS FOR RENESAS - VSP1 > M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > L: linux-media@vger.kernel.org > diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig > index 4011effe4c05..7cc87f322655 100644 > --- a/drivers/iio/Kconfig > +++ b/drivers/iio/Kconfig > @@ -73,6 +73,7 @@ source "drivers/iio/orientation/Kconfig" > if IIO_TRIGGER > source "drivers/iio/trigger/Kconfig" > endif #IIO_TRIGGER > +source "drivers/iio/potentiometer/Kconfig" > source "drivers/iio/pressure/Kconfig" > source "drivers/iio/proximity/Kconfig" > source "drivers/iio/temperature/Kconfig" > diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile > index 698afc2d17ce..121c814e366b 100644 > --- a/drivers/iio/Makefile > +++ b/drivers/iio/Makefile > @@ -23,6 +23,7 @@ obj-y += imu/ > obj-y += light/ > obj-y += magnetometer/ > obj-y += orientation/ > +obj-y += potentiometer/ > obj-y += pressure/ > obj-y += proximity/ > obj-y += temperature/ > diff --git a/drivers/iio/potentiometer/Kconfig b/drivers/iio/potentiometer/Kconfig > new file mode 100644 > index 000000000000..fd75db73e582 > --- /dev/null > +++ b/drivers/iio/potentiometer/Kconfig > @@ -0,0 +1,20 @@ > +# > +# Potentiometer drivers > +# > +# When adding new entries keep the list in alphabetical order > + > +menu "Digital potentiometers" > + > +config MCP4531 > + tristate "Microchip MCP45xx/MCP46xx Digital Potentiometer driver" > + depends on I2C > + help > + Say yes here to build support for the Microchip > + MCP4531, MCP4532, MCP4551, MCP4552, > + MCP4631, MCP4632, MCP4651, MCP4652 > + digital potentiomenter chips. > + > + To compile this driver as a module, choose M here: the > + module will be called mcp4531. > + > +endmenu > diff --git a/drivers/iio/potentiometer/Makefile b/drivers/iio/potentiometer/Makefile > new file mode 100644 > index 000000000000..8afe49227012 > --- /dev/null > +++ b/drivers/iio/potentiometer/Makefile > @@ -0,0 +1,6 @@ > +# > +# Makefile for industrial I/O potentiometer drivers > +# > + > +# When adding new entries keep the list in alphabetical order > +obj-$(CONFIG_MCP4531) += mcp4531.o > diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c > new file mode 100644 > index 000000000000..11039b215080 > --- /dev/null > +++ b/drivers/iio/potentiometer/mcp4531.c > @@ -0,0 +1,200 @@ > +/* > + * Industrial I/O driver for Microchip digital potentiometers > + * Copyright (c) 2015 Axentia Technologies AB > + * Author: Peter Rosin <peda@axentia.se> > + * > + * Datasheet: http://www.microchip.com/downloads/en/DeviceDoc/22096b.pdf > + * > + * DEVID #Wipers #Positions Resistor Options (kOhm) > + * mcp4531 1 129 5, 10, 50, 100 > + * mcp4532 1 129 5, 10, 50, 100 > + * mcp4551 1 257 5, 10, 50, 100 > + * mcp4552 1 257 5, 10, 50, 100 > + * mcp4631 2 129 5, 10, 50, 100 > + * mcp4632 2 129 5, 10, 50, 100 > + * mcp4651 2 257 5, 10, 50, 100 > + * mcp4652 2 257 5, 10, 50, 100 > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + */ > + > +#include <linux/module.h> > +#include <linux/i2c.h> > +#include <linux/err.h> > + > +#include <linux/iio/iio.h> > + drop extra newline > + > +#define MCP4531_CONF(wipers, max_pos, uid) \ > + ((((wipers) & 0xf) << 10) | \ > + (((max_pos) & 0xf) << 6) | \ > + ((uid) & 0x3f)) > + > +#define MCP4531_UID(conf) ((conf) & 0x3f) > +#define MCP4531_MAX_POS(conf) (((conf) >> 6) & 0xf) > +#define MCP4531_WIPERS(conf) (((conf) >> 10) & 0xf) > + > +enum mcp4531_devid { > + MCP4531_ID = MCP4531_CONF(1, 7, 0), > + MCP4532_ID = MCP4531_CONF(1, 7, 1), > + MCP4551_ID = MCP4531_CONF(1, 8, 2), > + MCP4552_ID = MCP4531_CONF(1, 8, 3), > + MCP4631_ID = MCP4531_CONF(2, 7, 4), > + MCP4632_ID = MCP4531_CONF(2, 7, 5), > + MCP4651_ID = MCP4531_CONF(2, 8, 6), > + MCP4652_ID = MCP4531_CONF(2, 8, 7), > +}; > + > +struct mcp4531_data { > + struct i2c_client *client; > + unsigned int max_pos; > + unsigned long devid; > +}; > + > +static const struct iio_chan_spec mcp4531_channels[] = { > + { could use a MACRO to deduplicate common channel parameters > + .type = IIO_RESISTANCE, > + .indexed = 1, > + .output = 1, > + .channel = 0, > + .address = 0 << 4, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + }, { > + .type = IIO_RESISTANCE, > + .indexed = 1, > + .output = 1, > + .channel = 1, > + .address = 1 << 4, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + } > +}; > + > +static int mcp4531_get_value(struct iio_dev *indio_dev, > + int address, int *val) > +{ > + struct mcp4531_data *data = iio_priv(indio_dev); > + s32 value; ret is arguably a more commonly used name > + > + value = i2c_smbus_read_word_data(data->client, address | 0xc); extra space before address what is 0xc? use a #define maybe > + if (value < 0) > + return value; > + *val = ((value >> 8) & 0xff) | ((value & 0xff) << 8); use i2c_smbus_read_word_swapped(), the chip uses MSB first; no need to shuffle bytes for endianness > + return 0; > +} > + > +static int mcp4531_set_value(struct iio_dev *indio_dev, > + int address, int val) > +{ > + struct mcp4531_data *data = iio_priv(indio_dev); > + > + if (val >= data->max_pos || val < 0) > + return -EINVAL; > + > + return i2c_smbus_write_byte_data(data->client, > + address | (val >> 8), > + val & 0xff); > +} > + > +static int mcp4531_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + int err; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + err = mcp4531_get_value(indio_dev, chan->address, val); > + if (err < 0) > + return err; > + return IIO_VAL_INT; > + } > + > + return -EINVAL; > +} > + > +static int mcp4531_write_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int val, int val2, long mask) > +{ > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + return mcp4531_set_value(indio_dev, chan->address, val); > + } > + > + return -EINVAL; > +} > + > +static const struct iio_info mcp4531_info = { > + .read_raw = mcp4531_read_raw, > + .write_raw = mcp4531_write_raw, > + .driver_module = THIS_MODULE, > +}; > + > +static int mcp4531_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct device *dev = &client->dev; > + unsigned long devid = id->driver_data; > + struct mcp4531_data *data; > + struct iio_dev *indio_dev; > + > + if (!i2c_check_functionality(client->adapter, > + I2C_FUNC_SMBUS_WORD_DATA)) { > + dev_err(dev, "SMBUS Word Data not supported\n"); > + return -EIO; > + } > + > + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > + if (!indio_dev) > + return -ENOMEM; > + data = iio_priv(indio_dev); > + i2c_set_clientdata(client, indio_dev); > + data->client = client; > + data->devid = devid; > + > + data->max_pos = (1 << MCP4531_MAX_POS(devid)) + 1; > + > + indio_dev->dev.parent = dev; > + indio_dev->info = &mcp4531_info; > + indio_dev->channels = mcp4531_channels; > + indio_dev->num_channels = MCP4531_WIPERS(devid); > + indio_dev->name = client->name; > + > + return iio_device_register(indio_dev); use devm_ ... > +} > + > +static int mcp4531_remove(struct i2c_client *client) > +{ ... and drop _remove() > + iio_device_unregister(i2c_get_clientdata(client)); > + return 0; > +} > + > +static const struct i2c_device_id mcp4531_id[] = { > + { "mcp4531", MCP4531_ID }, > + { "mcp4532", MCP4532_ID }, > + { "mcp4551", MCP4551_ID }, > + { "mcp4552", MCP4552_ID }, > + { "mcp4631", MCP4631_ID }, > + { "mcp4632", MCP4632_ID }, > + { "mcp4651", MCP4651_ID }, > + { "mcp4652", MCP4652_ID }, > + {} > +}; > +MODULE_DEVICE_TABLE(i2c, mcp4531_id); > + > +static struct i2c_driver mcp4531_driver = { > + .driver = { > + .name = "mcp4531", > + }, > + .probe = mcp4531_probe, > + .remove = mcp4531_remove, > + .id_table = mcp4531_id, > +}; > + > +module_i2c_driver(mcp4531_driver); > + > +MODULE_AUTHOR("Peter Rosin <peda@axentia.se>"); > +MODULE_DESCRIPTION("MCP4531 digital potentiometer"); > +MODULE_LICENSE("GPL"); > -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-22 13:01 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-22 12:39 [PATCH v3 0/2] Driver for Microchip digital potentiometers Peter Rosin 2015-09-22 12:39 ` [PATCH v3 1/2] iio: resistance: Document that resistance can be output Peter Rosin 2015-09-22 12:48 ` Daniel Baluta 2015-09-22 12:55 ` Peter Rosin 2015-09-22 12:59 ` Daniel Baluta 2015-09-22 12:39 ` [PATCH v3 2/2] iio: mcp4531: Driver for Microchip digital potentiometers Peter Rosin 2015-09-22 13:01 ` Peter Meerwald
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).