regulator: pfuze100: Convert the driver to DT-only
PATCH 1/1 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.
--- drivers/regulator/Kconfig | 2 +- drivers/regulator/pfuze100-regulator.c | 34 +------------------------- include/linux/regulator/pfuze100.h | 6 ----- 3 files changed, 2 insertions(+), 40 deletions(-)
drivers/regulator/Kconfig +1 -1
@@ -830,7 +830,7 @@ config REGULATOR_PF8X00 config REGULATOR_PFUZE100 tristate "Freescale PFUZE100/200/3000/3001 regulator driver" - depends on I2C + depends on I2C && OF select REGMAP_I2C help Say y here to support the regulators found on the Freescale
drivers/regulator/pfuze100-regulator.c +1 -33
@@ -105,15 +105,6 @@ static const int pfuze3000_sw2hi[] = { 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[] = { { .compatible ="fsl,pfuze100" , .data = (void *)PFUZE100 }, { .compatible ="fsl,pfuze200" , .data = (void *)PFUZE200 },
@@ -440,7 +431,6 @@ static struct pfuze_regulator pfuze3001_regulators[] = { PFUZE100_VGEN_REG(PFUZE3001, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000), }; -#ifdef CONFIG_OF /* PFUZE100 */ static struct of_regulator_match pfuze100_matches[] = { { .name ="sw1ab" , },
@@ -578,22 +568,6 @@ static inline struct device_node *match_of_node(int index) {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;
@@ -708,8 +682,6 @@ static int pfuze100_regulator_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct pfuze_chip *pfuze_chip; -struct pfuze_regulator_platform_data *pdata = -dev_get_platdata (&client->dev);struct regulator_config config = { };int i, ret;const struct of_device_id *match;
@@ -802,10 +774,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client, 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 */ if (i >= sw_check_start && i <= sw_check_end) {
@@ -879,7 +848,6 @@ static int pfuze100_regulator_remove(struct i2c_client *client) }static struct i2c_driver pfuze_driver = { - .id_table = pfuze_device_id, .driver = { .name ="pfuze100-regulator" , .of_match_table = pfuze_dt_ids,
include/linux/regulator/pfuze100.h +0 -6
@@ -63,10 +63,4 @@#define PFUZE3001_VLDO3 8#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 */
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 2 lines · Fabio Estevam
Since 5.10-rc1 i.MX is a devicetree-only platform, so simplify the code by removing the unused non-DT support.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: pfuze100: Convert the driver to DT-only
commit: 6a6939d5f588b40db32b82ebcec20ee5189c8376
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark