hwmon: (max6697) 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: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>hifive-unleashed-5.1
parent
5ada7055f2
commit
9e427083c3
|
@ -24,6 +24,7 @@
|
||||||
#include <linux/hwmon-sysfs.h>
|
#include <linux/hwmon-sysfs.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/of_device.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
|
||||||
#include <linux/platform_data/max6697.h>
|
#include <linux/platform_data/max6697.h>
|
||||||
|
@ -632,7 +633,10 @@ static int max6697_probe(struct i2c_client *client,
|
||||||
if (!data)
|
if (!data)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
data->type = id->driver_data;
|
if (client->dev.of_node)
|
||||||
|
data->type = (enum chips)of_device_get_match_data(&client->dev);
|
||||||
|
else
|
||||||
|
data->type = id->driver_data;
|
||||||
data->chip = &max6697_chip_data[data->type];
|
data->chip = &max6697_chip_data[data->type];
|
||||||
data->client = client;
|
data->client = client;
|
||||||
mutex_init(&data->update_lock);
|
mutex_init(&data->update_lock);
|
||||||
|
@ -662,10 +666,56 @@ static const struct i2c_device_id max6697_id[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, max6697_id);
|
MODULE_DEVICE_TABLE(i2c, max6697_id);
|
||||||
|
|
||||||
|
static const struct of_device_id max6697_of_match[] = {
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6581",
|
||||||
|
.data = (void *)max6581
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6602",
|
||||||
|
.data = (void *)max6602
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6622",
|
||||||
|
.data = (void *)max6622
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6636",
|
||||||
|
.data = (void *)max6636
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6689",
|
||||||
|
.data = (void *)max6689
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6693",
|
||||||
|
.data = (void *)max6693
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6694",
|
||||||
|
.data = (void *)max6694
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6697",
|
||||||
|
.data = (void *)max6697
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6698",
|
||||||
|
.data = (void *)max6698
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.compatible = "maxim,max6699",
|
||||||
|
.data = (void *)max6699
|
||||||
|
},
|
||||||
|
{ },
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, max6697_of_match);
|
||||||
|
|
||||||
static struct i2c_driver max6697_driver = {
|
static struct i2c_driver max6697_driver = {
|
||||||
.class = I2C_CLASS_HWMON,
|
.class = I2C_CLASS_HWMON,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "max6697",
|
.name = "max6697",
|
||||||
|
.of_match_table = of_match_ptr(max6697_of_match),
|
||||||
},
|
},
|
||||||
.probe = max6697_probe,
|
.probe = max6697_probe,
|
||||||
.id_table = max6697_id,
|
.id_table = max6697_id,
|
||||||
|
|
Loading…
Reference in New Issue