IIO: extend dac/MCP4922 to MCP49x1 devices

PATCH In review Matt Walker 2 participants 2 messages Nov 8, 2018 – Nov 11, 2018 IIO

Share & tools

Matt Walker

author

2018-11-08 20:38 UTC #0 lore raw

PATCH 1/1 IIO: extend dac/MCP4922 to MCP49x1 devices

Extend the existing dual channel MCP4922 DAC driver to single channel MCP49x1 devices. These devices are simple and write only. The most significant bit of the transfer dictates what channel to write to.

Although there is no danger in writing to the non existant channel in the single channel devices, it's better to not register it at all. Therefore extend the driver to know how many channels a device has at probe time based on the ID table.

Signed-off-by Matt Walker <[email protected]>

---
 drivers/iio/dac/mcp4922.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

drivers/iio/dac/mcp4922.c +24 -6

index b5190d1dae8e..094f7dd560ca 100644
@@ -29,8 +29,11 @@
 #define MCP4922_NUM_CHANNELS	2
 
 enum mcp4922_supported_device_ids {
+	ID_MCP4901,
 	ID_MCP4902,
+	ID_MCP4911,
 	ID_MCP4912,
+	ID_MCP4921,
 	ID_MCP4922,
 };

@@ -115,10 +118,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev,
 	}
 }
 
-static const struct iio_chan_spec mcp4922_channels[3][MCP4922_NUM_CHANNELS] = {
-	[ID_MCP4902] = { MCP4922_CHAN(0, 8),	MCP4922_CHAN(1, 8) },
-	[ID_MCP4912] = { MCP4922_CHAN(0, 10),	MCP4922_CHAN(1, 10) },
-	[ID_MCP4922] = { MCP4922_CHAN(0, 12),	MCP4922_CHAN(1, 12) },
+static const unsigned int mcp4922_channel_counts[6] = {
+	[ID_MCP4901] = 1,
+	[ID_MCP4902] = 2,
+	[ID_MCP4911] = 1,
+	[ID_MCP4912] = 2,
+	[ID_MCP4921] = 1,
+	[ID_MCP4922] = 2,
+};
+
+static const struct iio_chan_spec mcp4922_channels[6][MCP4922_NUM_CHANNELS] = {
+	[ID_MCP4901] = { MCP4922_CHAN(0, 8),  {} },
+	[ID_MCP4902] = { MCP4922_CHAN(0, 8),  MCP4922_CHAN(1, 8) },
+	[ID_MCP4911] = { MCP4922_CHAN(0, 10), {} },
+	[ID_MCP4912] = { MCP4922_CHAN(0, 10), MCP4922_CHAN(1, 10) },
+	[ID_MCP4921] = { MCP4922_CHAN(0, 12), {} },
+	[ID_MCP4922] = { MCP4922_CHAN(0, 12), MCP4922_CHAN(1, 12) },
 };
 
 static const struct iio_info mcp4922_info = {

@@ -166,7 +181,7 @@ static int mcp4922_probe(struct spi_device *spi)
 	indio_dev->info = &mcp4922_info;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->channels = mcp4922_channels[id->driver_data];
-	indio_dev->num_channels = MCP4922_NUM_CHANNELS;
+	indio_dev->num_channels = mcp4922_channel_counts[id->driver_data];
 	indio_dev->name = id->name;
 
 	ret = iio_device_register(indio_dev);

@@ -197,8 +212,11 @@ static int mcp4922_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id mcp4922_id[] = {
+	{"mcp4901", ID_MCP4901},
 	{"mcp4902", ID_MCP4902},
+	{"mcp4911", ID_MCP4911},
 	{"mcp4912", ID_MCP4912},
+	{"mcp4921", ID_MCP4921},
 	{"mcp4922", ID_MCP4922},
 	{}
 };

@@ -215,5 +233,5 @@ static struct spi_driver mcp4922_driver = {
 module_spi_driver(mcp4922_driver);
 
 MODULE_AUTHOR("Michael Welling <[email protected]>");
-MODULE_DESCRIPTION("Microchip MCP4902, MCP4912, MCP4922 DAC");
+MODULE_DESCRIPTION("Microchip MCP49xx DAC");
 MODULE_LICENSE("GPL v2");

Signature · 1 line

2.17.1

Jonathan Cameron

maintainer

2018-11-11 12:49 UTC #1 lore raw

Quoted 8 lines · On Thu, 8 Nov 2018 15:36:53 -0500 Matt Walker <[email protected]> wrote:

Extend the existing dual channel MCP4922 DAC driver to single channel MCP49x1 devices. These devices are simple and write only. The most significant bit of the transfer dictates what channel to write to.
Although there is no danger in writing to the non existant channel in the single channel devices, it's better to not register it at all. Therefore extend the driver to know how many channels a device has at probe time based on the ID table.

Definitely!

Quoted 2 lines

Signed-off-by Matt Walker <[email protected]>

Hi Matt,

Patch looks good, but I think this is now become complex enough we should be looking at a level of indirection to give us something more extensible on the long run.

See inline,

Thanks,

Jonathan

Quoted 35 lines

---
 drivers/iio/dac/mcp4922.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

drivers/iio/dac/mcp4922.c +10 -4

index b5190d1dae8e..094f7dd560ca 100644
@@ -29,8 +29,11 @@
 #define MCP4922_NUM_CHANNELS	2
 
 enum mcp4922_supported_device_ids {
+	ID_MCP4901,
 	ID_MCP4902,
+	ID_MCP4911,
 	ID_MCP4912,
+	ID_MCP4921,
 	ID_MCP4922,
 };

@@ -115,10 +118,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev,
 	}
 }
 
-static const struct iio_chan_spec mcp4922_channels[3][MCP4922_NUM_CHANNELS] = {
-	[ID_MCP4902] = { MCP4922_CHAN(0, 8),	MCP4922_CHAN(1, 8) },
-	[ID_MCP4912] = { MCP4922_CHAN(0, 10),	MCP4922_CHAN(1, 10) },
-	[ID_MCP4922] = { MCP4922_CHAN(0, 12),	MCP4922_CHAN(1, 12) },
+static const unsigned int mcp4922_channel_counts[6] = {
+	[ID_MCP4901] = 1,
+	[ID_MCP4902] = 2,
+	[ID_MCP4911] = 1,
+	[ID_MCP4912] = 2,
+	[ID_MCP4921] = 1,
+	[ID_MCP4922] = 2,

drivers/iio/dac/mcp4922.c static int mcp4922_write_raw(struct iio_dev *indio_dev, · line 137

Quoted 10 lines

drivers/iio/dac/mcp4922.c +9 -0

+};
+
+static const struct iio_chan_spec mcp4922_channels[6][MCP4922_NUM_CHANNELS] = {
+	[ID_MCP4901] = { MCP4922_CHAN(0, 8),  {} },
+	[ID_MCP4902] = { MCP4922_CHAN(0, 8),  MCP4922_CHAN(1, 8) },
+	[ID_MCP4911] = { MCP4922_CHAN(0, 10), {} },
+	[ID_MCP4912] = { MCP4922_CHAN(0, 10), MCP4922_CHAN(1, 10) },
+	[ID_MCP4921] = { MCP4922_CHAN(0, 12), {} },
+	[ID_MCP4922] = { MCP4922_CHAN(0, 12), MCP4922_CHAN(1, 12) },
 };

It is getting to the point where a spot of indirection would make for a cleaner result and prove easier to build on for future additions.

struct mcp4922_data {
	static const struct iio_chan_spec *channels;
	int num_channels;
};

//could use macros to simplify this but probably not worth it as only 3 copies.

static const struct iio_chan_spec mcp4902_channels[] = {
	MCP4922_CHAN(0, 8), MCP3922_CHAN(1, 8),
};

static const struct mcp4922_data[] = {
	[ID_MCP4901] = { mcp4902_channels, 1 },
	[ID_MCP4902] = { mcp4902_channels, 2 },
	... 
};

Quoted 24 lines

drivers/iio/dac/mcp4922.c +4 -1

 static const struct iio_info mcp4922_info = {

@@ -166,7 +181,7 @@ static int mcp4922_probe(struct spi_device *spi)
 	indio_dev->info = &mcp4922_info;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->channels = mcp4922_channels[id->driver_data];
-	indio_dev->num_channels = MCP4922_NUM_CHANNELS;
+	indio_dev->num_channels = mcp4922_channel_counts[id->driver_data];
 	indio_dev->name = id->name;
 
 	ret = iio_device_register(indio_dev);

@@ -197,8 +212,11 @@ static int mcp4922_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id mcp4922_id[] = {
+	{"mcp4901", ID_MCP4901},
 	{"mcp4902", ID_MCP4902},
+	{"mcp4911", ID_MCP4911},
 	{"mcp4912", ID_MCP4912},
+	{"mcp4921", ID_MCP4921},
 	{"mcp4922", ID_MCP4922},
 	{}
 };

drivers/iio/dac/mcp4922.c static struct spi_driver mcp4922_driver = { · line 236

Quoted 5 lines

drivers/iio/dac/mcp4922.c +1 -1

@@ -215,5 +233,5 @@ static struct spi_driver mcp4922_driver = {
 module_spi_driver(mcp4922_driver);
 
 MODULE_AUTHOR("Michael Welling <[email protected]>");
-MODULE_DESCRIPTION("Microchip MCP4902, MCP4912, MCP4922 DAC");
+MODULE_DESCRIPTION("Microchip MCP49xx DAC");

That wild card seems far to likely to hit devices it doesn't support and end up causing confusion. The usual nasty trick here is to say something like

Microchip MCP4902 and similar DACs.

Quoted 1 line

drivers/iio/dac/mcp4922.c +0 -0
 MODULE_LICENSE("GPL v2");