Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: bd71837: adobt MFD changes to regulator driver

MFD part for bd71837 was changed during the review. Clean regulator part to
match changed MFD:
- renamed header file => fix include
- remove unused platdata as also type definition was removed
- Kconfig option for MFD part was changed => fix depends on clause
- Rename Kconfig option for regulators
As Kconfig option for regulators gets now used (when dependency to MFD is
satisfied) change it so that it won't require new change when support for
bd71847 is added.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Matti Vaittinen and committed by
Mark Brown
410e8b4f 4f919ca2

+4 -9
+2 -2
drivers/regulator/Kconfig
··· 180 180 BCM590xx PMUs. This will enable support for the software 181 181 controllable LDO/Switching regulators. 182 182 183 - config REGULATOR_BD71837 183 + config REGULATOR_BD718XX 184 184 tristate "ROHM BD71837 Power Regulator" 185 - depends on MFD_BD71837 185 + depends on MFD_ROHM_BD718XX 186 186 help 187 187 This driver supports voltage regulators on ROHM BD71837 PMIC. 188 188 This will enable support for the software controllable buck
+1 -1
drivers/regulator/Makefile
··· 27 27 obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o 28 28 obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o 29 29 obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o 30 - obj-$(CONFIG_REGULATOR_BD71837) += bd71837-regulator.o 30 + obj-$(CONFIG_REGULATOR_BD718XX) += bd71837-regulator.o 31 31 obj-$(CONFIG_REGULATOR_BD9571MWV) += bd9571mwv-regulator.o 32 32 obj-$(CONFIG_REGULATOR_DA903X) += da903x.o 33 33 obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o
+1 -6
drivers/regulator/bd71837-regulator.c
··· 7 7 #include <linux/gpio.h> 8 8 #include <linux/interrupt.h> 9 9 #include <linux/kernel.h> 10 - #include <linux/mfd/bd71837.h> 10 + #include <linux/mfd/rohm-bd718x7.h> 11 11 #include <linux/module.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/regulator/driver.h> ··· 490 490 static int bd71837_probe(struct platform_device *pdev) 491 491 { 492 492 struct bd71837_pmic *pmic; 493 - struct bd71837_board *pdata; 494 493 struct regulator_config config = { 0 }; 495 494 struct reg_init pmic_regulator_inits[] = { 496 495 { ··· 557 558 goto err; 558 559 } 559 560 platform_set_drvdata(pdev, pmic); 560 - pdata = dev_get_platdata(pmic->mfd->dev); 561 561 562 562 /* Register LOCK release */ 563 563 err = regmap_update_bits(pmic->mfd->regmap, BD71837_REG_REGLOCK, ··· 575 577 struct regulator_dev *rdev; 576 578 577 579 desc = &pmic->descs[i]; 578 - 579 - if (pdata) 580 - config.init_data = pdata->init_data[i]; 581 580 582 581 config.dev = pdev->dev.parent; 583 582 config.driver_data = pmic;