Commit 6a6939d5 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

regulator: pfuze100: Convert the driver to DT-only

Since 5.10-rc1 i.MX is a devicetree-only platform, so simplify the code
by removing the unused non-DT support.
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20201210212748.5849-1-festevam@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0da6736e
...@@ -830,7 +830,7 @@ config REGULATOR_PF8X00 ...@@ -830,7 +830,7 @@ config REGULATOR_PF8X00
config REGULATOR_PFUZE100 config REGULATOR_PFUZE100
tristate "Freescale PFUZE100/200/3000/3001 regulator driver" tristate "Freescale PFUZE100/200/3000/3001 regulator driver"
depends on I2C depends on I2C && OF
select REGMAP_I2C select REGMAP_I2C
help help
Say y here to support the regulators found on the Freescale Say y here to support the regulators found on the Freescale
......
...@@ -105,15 +105,6 @@ static const int pfuze3000_sw2hi[] = { ...@@ -105,15 +105,6 @@ static const int pfuze3000_sw2hi[] = {
2500000, 2800000, 2850000, 3000000, 3100000, 3150000, 3200000, 3300000, 2500000, 2800000, 2850000, 3000000, 3100000, 3150000, 3200000, 3300000,
}; };
static const struct i2c_device_id pfuze_device_id[] = {
{.name = "pfuze100", .driver_data = PFUZE100},
{.name = "pfuze200", .driver_data = PFUZE200},
{.name = "pfuze3000", .driver_data = PFUZE3000},
{.name = "pfuze3001", .driver_data = PFUZE3001},
{ }
};
MODULE_DEVICE_TABLE(i2c, pfuze_device_id);
static const struct of_device_id pfuze_dt_ids[] = { static const struct of_device_id pfuze_dt_ids[] = {
{ .compatible = "fsl,pfuze100", .data = (void *)PFUZE100}, { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100},
{ .compatible = "fsl,pfuze200", .data = (void *)PFUZE200}, { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200},
...@@ -440,7 +431,6 @@ static struct pfuze_regulator pfuze3001_regulators[] = { ...@@ -440,7 +431,6 @@ static struct pfuze_regulator pfuze3001_regulators[] = {
PFUZE100_VGEN_REG(PFUZE3001, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000), PFUZE100_VGEN_REG(PFUZE3001, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000),
}; };
#ifdef CONFIG_OF
/* PFUZE100 */ /* PFUZE100 */
static struct of_regulator_match pfuze100_matches[] = { static struct of_regulator_match pfuze100_matches[] = {
{ .name = "sw1ab", }, { .name = "sw1ab", },
...@@ -578,22 +568,6 @@ static inline struct device_node *match_of_node(int index) ...@@ -578,22 +568,6 @@ static inline struct device_node *match_of_node(int index)
{ {
return pfuze_matches[index].of_node; return pfuze_matches[index].of_node;
} }
#else
static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
{
return 0;
}
static inline struct regulator_init_data *match_init_data(int index)
{
return NULL;
}
static inline struct device_node *match_of_node(int index)
{
return NULL;
}
#endif
static struct pfuze_chip *syspm_pfuze_chip; static struct pfuze_chip *syspm_pfuze_chip;
...@@ -708,8 +682,6 @@ static int pfuze100_regulator_probe(struct i2c_client *client, ...@@ -708,8 +682,6 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct pfuze_chip *pfuze_chip; struct pfuze_chip *pfuze_chip;
struct pfuze_regulator_platform_data *pdata =
dev_get_platdata(&client->dev);
struct regulator_config config = { }; struct regulator_config config = { };
int i, ret; int i, ret;
const struct of_device_id *match; const struct of_device_id *match;
...@@ -802,9 +774,6 @@ static int pfuze100_regulator_probe(struct i2c_client *client, ...@@ -802,9 +774,6 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
desc = &pfuze_chip->regulator_descs[i].desc; desc = &pfuze_chip->regulator_descs[i].desc;
if (pdata)
init_data = pdata->init_data[i];
else
init_data = match_init_data(i); init_data = match_init_data(i);
/* SW2~SW4 high bit check and modify the voltage value table */ /* SW2~SW4 high bit check and modify the voltage value table */
...@@ -876,7 +845,6 @@ static int pfuze100_regulator_remove(struct i2c_client *client) ...@@ -876,7 +845,6 @@ static int pfuze100_regulator_remove(struct i2c_client *client)
} }
static struct i2c_driver pfuze_driver = { static struct i2c_driver pfuze_driver = {
.id_table = pfuze_device_id,
.driver = { .driver = {
.name = "pfuze100-regulator", .name = "pfuze100-regulator",
.of_match_table = pfuze_dt_ids, .of_match_table = pfuze_dt_ids,
......
...@@ -63,10 +63,4 @@ ...@@ -63,10 +63,4 @@
#define PFUZE3001_VLDO3 8 #define PFUZE3001_VLDO3 8
#define PFUZE3001_VLDO4 9 #define PFUZE3001_VLDO4 9
struct regulator_init_data;
struct pfuze_regulator_platform_data {
struct regulator_init_data *init_data[PFUZE100_MAX_REGULATOR];
};
#endif /* __LINUX_REG_PFUZE100_H */ #endif /* __LINUX_REG_PFUZE100_H */
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