Merge tag 'iio-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[karo-tx-linux.git] / drivers / iio / adc / mcp320x.c

diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 8569c8e1f4b276db3e968356626c67fab9b60c16..d1c05f6eed18124a907ab4e04fd255b1677c280b 100644 (file)
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -354,6 +354,7 @@ static int mcp320x_remove(struct spi_device *spi)
 
 #if defined(CONFIG_OF)
 static const struct of_device_id mcp320x_dt_ids[] = {
+       /* NOTE: The use of compatibles with no vendor prefix is deprecated. */
        {
                .compatible = "mcp3001",
                .data = &mcp320x_chip_infos[mcp3001],
@@ -381,6 +382,33 @@ static const struct of_device_id mcp320x_dt_ids[] = {
        }, {
                .compatible = "mcp3301",
                .data = &mcp320x_chip_infos[mcp3301],
+       }, {
+               .compatible = "microchip,mcp3001",
+               .data = &mcp320x_chip_infos[mcp3001],
+       }, {
+               .compatible = "microchip,mcp3002",
+               .data = &mcp320x_chip_infos[mcp3002],
+       }, {
+               .compatible = "microchip,mcp3004",
+               .data = &mcp320x_chip_infos[mcp3004],
+       }, {
+               .compatible = "microchip,mcp3008",
+               .data = &mcp320x_chip_infos[mcp3008],
+       }, {
+               .compatible = "microchip,mcp3201",
+               .data = &mcp320x_chip_infos[mcp3201],
+       }, {
+               .compatible = "microchip,mcp3202",
+               .data = &mcp320x_chip_infos[mcp3202],
+       }, {
+               .compatible = "microchip,mcp3204",
+               .data = &mcp320x_chip_infos[mcp3204],
+       }, {
+               .compatible = "microchip,mcp3208",
+               .data = &mcp320x_chip_infos[mcp3208],
+       }, {
+               .compatible = "microchip,mcp3301",
+               .data = &mcp320x_chip_infos[mcp3301],
        }, {
        }
 };