Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio: dac: ti-dac082s085: Read chip spec from device table

Browse Source 
The two properties unique to each supported chip, resolution and number
of channels, are currently gleaned from the chip's name.
E.g. dac102s085 is a dual channel 10-bit DAC.
        ^^^
This was deemed unmaintainable by the subsystem maintainer once the
driver is extended to support further chips, hence it was requested
to add an explicit table for chip-specific information and use an
enum to reference into it.

This adds 17 LoC without any immediate gain, so make the change in a
separate commit which can be reverted if we determine in 10 years that
it was unnecessary.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lukas Wunner 2017-10-17 12:42:00 +02:00 committed by Jonathan Cameron
parent 61011264c1
commit f98677cf31
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/iio/dac/ti-dac082s085.c
View File

@ -20,6 +20,22 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
enum { dual_8bit, dual_10bit, dual_12bit, quad_8bit, quad_10bit, quad_12bit };
struct ti_dac_spec {
u8 num_channels;
u8 resolution;
};
static const struct ti_dac_spec ti_dac_spec[] = {
[dual_8bit] = { .num_channels = 2, .resolution = 8 },
[dual_10bit] = { .num_channels = 2, .resolution = 10 },
[dual_12bit] = { .num_channels = 2, .resolution = 12 },
[quad_8bit] = { .num_channels = 4, .resolution = 8 },
[quad_10bit] = { .num_channels = 4, .resolution = 10 },
[quad_12bit] = { .num_channels = 4, .resolution = 12 },
};
/** /**
* struct ti_dac_chip - TI DAC chip * struct ti_dac_chip - TI DAC chip
* @lock: protects write sequences * @lock: protects write sequences
@ -246,6 +262,7 @@ static const struct iio_info ti_dac_info = {
static int ti_dac_probe(struct spi_device *spi) static int ti_dac_probe(struct spi_device *spi)
{ {
struct device *dev = &spi->dev; struct device *dev = &spi->dev;
const struct ti_dac_spec *spec;
struct ti_dac_chip *ti_dac; struct ti_dac_chip *ti_dac;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
int ret; int ret;
@ -267,9 +284,9 @@ static int ti_dac_probe(struct spi_device *spi)
spi_message_init_with_transfers(&ti_dac->mesg, &ti_dac->xfer, 1); spi_message_init_with_transfers(&ti_dac->mesg, &ti_dac->xfer, 1);
ti_dac->mesg.spi = spi; ti_dac->mesg.spi = spi;
ret = sscanf(spi->modalias, "dac%2hhu%1d", spec = &ti_dac_spec[spi_get_device_id(spi)->driver_data];
&ti_dac->resolution, &indio_dev->num_channels); indio_dev->num_channels = spec->num_channels;
WARN_ON(ret != 2); ti_dac->resolution = spec->resolution;
ti_dac->vref = devm_regulator_get(dev, "vref"); ti_dac->vref = devm_regulator_get(dev, "vref");
if (IS_ERR(ti_dac->vref)) if (IS_ERR(ti_dac->vref))
@ -325,12 +342,12 @@ MODULE_DEVICE_TABLE(of, ti_dac_of_id);
#endif #endif
static const struct spi_device_id ti_dac_spi_id[] = { static const struct spi_device_id ti_dac_spi_id[] = {
{ "dac082s085" }, { "dac082s085", dual_8bit },
{ "dac102s085" }, { "dac102s085", dual_10bit },
{ "dac122s085" }, { "dac122s085", dual_12bit },
{ "dac084s085" }, { "dac084s085", quad_8bit },
{ "dac104s085" }, { "dac104s085", quad_10bit },
{ "dac124s085" }, { "dac124s085", quad_12bit },
{ } { }
}; };
MODULE_DEVICE_TABLE(spi, ti_dac_spi_id); MODULE_DEVICE_TABLE(spi, ti_dac_spi_id);