Commit 8414af1e authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Jonathan Cameron

iio: dac: mcp4725: Add OF device ID table

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have an
OF device ID table if the devices are registered via OF.
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 49926b12
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/of_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
...@@ -199,7 +200,7 @@ static ssize_t mcp4725_write_powerdown(struct iio_dev *indio_dev, ...@@ -199,7 +200,7 @@ static ssize_t mcp4725_write_powerdown(struct iio_dev *indio_dev,
return len; return len;
} }
enum { enum chip_id {
MCP4725, MCP4725,
MCP4726, MCP4726,
}; };
...@@ -406,7 +407,10 @@ static int mcp4725_probe(struct i2c_client *client, ...@@ -406,7 +407,10 @@ static int mcp4725_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
data->id = id->driver_data; if (client->dev.of_node)
data->id = (enum chip_id)of_device_get_match_data(&client->dev);
else
data->id = id->driver_data;
pdata = dev_get_platdata(&client->dev); pdata = dev_get_platdata(&client->dev);
if (!pdata) { if (!pdata) {
...@@ -525,9 +529,25 @@ static const struct i2c_device_id mcp4725_id[] = { ...@@ -525,9 +529,25 @@ static const struct i2c_device_id mcp4725_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, mcp4725_id); MODULE_DEVICE_TABLE(i2c, mcp4725_id);
#ifdef CONFIG_OF
static const struct of_device_id mcp4725_of_match[] = {
{
.compatible = "microchip,mcp4725",
.data = (void *)MCP4725
},
{
.compatible = "microchip,mcp4726",
.data = (void *)MCP4726
},
{ }
};
MODULE_DEVICE_TABLE(of, mcp4725_of_match);
#endif
static struct i2c_driver mcp4725_driver = { static struct i2c_driver mcp4725_driver = {
.driver = { .driver = {
.name = MCP4725_DRV_NAME, .name = MCP4725_DRV_NAME,
.of_match_table = of_match_ptr(mcp4725_of_match),
.pm = MCP4725_PM_OPS, .pm = MCP4725_PM_OPS,
}, },
.probe = mcp4725_probe, .probe = mcp4725_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment