Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45a86172 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mark Brown
Browse files

regulator: ltc3589: 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 avatarMark Brown <broonie@kernel.org>
parent fad9cd45

drivers/regulator/ltc3589.c

+24 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regulator/of_regulator.h>
@@ -470,6 +471,10 @@ static int ltc3589_probe(struct i2c_client *client, 
		return -ENOMEM;

		return -ENOMEM;





	i2c_set_clientdata(client, ltc3589);

	i2c_set_clientdata(client, ltc3589);

	if (client->dev.of_node)

		ltc3589->variant = (enum ltc3589_variant)

			of_device_get_match_data(&client->dev);

	else

		ltc3589->variant = id->driver_data;

		ltc3589->variant = id->driver_data;

	ltc3589->dev = dev;

	ltc3589->dev = dev;
@@ -542,9 +547,27 @@ static struct i2c_device_id ltc3589_i2c_id[] = { 
};

};

MODULE_DEVICE_TABLE(i2c, ltc3589_i2c_id);

MODULE_DEVICE_TABLE(i2c, ltc3589_i2c_id);





static const struct of_device_id ltc3589_of_match[] = {

	{

		.compatible = "lltc,ltc3589",

		.data = (void *)LTC3589,

	},

	{

		.compatible = "lltc,ltc3589-1",

		.data = (void *)LTC3589_1,

	},

	{

		.compatible = "lltc,ltc3589-2",

		.data = (void *)LTC3589_2,

	},

	{ },

};

MODULE_DEVICE_TABLE(of, ltc3589_of_match);



static struct i2c_driver ltc3589_driver = {

static struct i2c_driver ltc3589_driver = {

	.driver = {

	.driver = {

		.name = DRIVER_NAME,

		.name = DRIVER_NAME,

		.of_match_table = of_match_ptr(ltc3589_of_match),

	},

	},

	.probe = ltc3589_probe,

	.probe = ltc3589_probe,

	.id_table = ltc3589_i2c_id,

	.id_table = ltc3589_i2c_id,