Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (ucd9200) Add OF device ID table

Browse Source 
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>
This commit is contained in:
Javier Martinez Canillas 2017-02-24 10:13:08 -03:00 committed by Guenter Roeck
parent 8881a19187
commit 02331c3a1a
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/hwmon/pmbus/ucd9200.c
View File

@ -20,6 +20,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -46,12 +47,50 @@ static const struct i2c_device_id ucd9200_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, ucd9200_id); MODULE_DEVICE_TABLE(i2c, ucd9200_id);
static const struct of_device_id ucd9200_of_match[] = {
{
.compatible = "ti,cd9200",
.data = (void *)ucd9200
},
{
.compatible = "ti,cd9220",
.data = (void *)ucd9220
},
{
.compatible = "ti,cd9222",
.data = (void *)ucd9222
},
{
.compatible = "ti,cd9224",
.data = (void *)ucd9224
},
{
.compatible = "ti,cd9240",
.data = (void *)ucd9240
},
{
.compatible = "ti,cd9244",
.data = (void *)ucd9244
},
{
.compatible = "ti,cd9246",
.data = (void *)ucd9246
},
{
.compatible = "ti,cd9248",
.data = (void *)ucd9248
},
{ },
};
MODULE_DEVICE_TABLE(of, ucd9200_of_match);
static int ucd9200_probe(struct i2c_client *client, static int ucd9200_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1]; u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
struct pmbus_driver_info *info; struct pmbus_driver_info *info;
const struct i2c_device_id *mid; const struct i2c_device_id *mid;
enum chips chip;
int i, j, ret; int i, j, ret;
if (!i2c_check_functionality(client->adapter, if (!i2c_check_functionality(client->adapter,
@ -76,7 +115,13 @@ static int ucd9200_probe(struct i2c_client *client,
dev_err(&client->dev, "Unsupported device\n"); dev_err(&client->dev, "Unsupported device\n");
return -ENODEV; return -ENODEV;
} }
if (id->driver_data != ucd9200 && id->driver_data != mid->driver_data)
if (client->dev.of_node)
chip = (enum chips)of_device_get_match_data(&client->dev);
else
chip = id->driver_data;
if (chip != ucd9200 && chip != mid->driver_data)
dev_notice(&client->dev, dev_notice(&client->dev,
"Device mismatch: Configured %s, detected %s\n", "Device mismatch: Configured %s, detected %s\n",
id->name, mid->name); id->name, mid->name);
@ -167,6 +212,7 @@ static int ucd9200_probe(struct i2c_client *client,
static struct i2c_driver ucd9200_driver = { static struct i2c_driver ucd9200_driver = {
.driver = { .driver = {
.name = "ucd9200", .name = "ucd9200",
.of_match_table = of_match_ptr(ucd9200_of_match),
}, },
.probe = ucd9200_probe, .probe = ucd9200_probe,
.remove = pmbus_do_remove, .remove = pmbus_do_remove,