diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-03-17 14:54:54 -0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-28 19:39:17 +0100 |
| commit | 86cf635a316e89ba6ae79f452cedb5acddccf570 (patch) | |
| tree | 74dd39d51e96abe81fd6495f9059b9ee5a4a1930 | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | op-kernel-dev-86cf635a316e89ba6ae79f452cedb5acddccf570.zip op-kernel-dev-86cf635a316e89ba6ae79f452cedb5acddccf570.tar.gz | |
regulator: Rename files for Maxim PMIC drivers
Most Maxim PMIC regulator drivers are for sub-devices of Multi-Function
Devices with drivers under drivers/mfd. But for many of these, the same
object file name was used for both the MFD and the regulator drivers.
Having 2 different drivers with the same name causes a lot of confusion
to Kbuild, specially if these are built as module since only one module
will be installed and also exported symbols will be undefined due being
overwritten by the other module during modpost.
For example, it fixes the following issue when both drivers are module:
$ make M=drivers/regulator/
...
CC [M] drivers/regulator//max14577.o
Building modules, stage 2.
MODPOST 1 modules
WARNING: "maxim_charger_calc_reg_current" [drivers/regulator//max14577.ko] undefined!
WARNING: "maxim_charger_currents" [drivers/regulator//max14577.ko] undefined!
Reported-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/regulator/Makefile | 6 | ||||
| -rw-r--r-- | drivers/regulator/max14577-regulator.c (renamed from drivers/regulator/max14577.c) | 0 | ||||
| -rw-r--r-- | drivers/regulator/max77693-regulator.c (renamed from drivers/regulator/max77693.c) | 0 | ||||
| -rw-r--r-- | drivers/regulator/max8997-regulator.c (renamed from drivers/regulator/max8997.c) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 03e00c7..e0b7b59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7019,9 +7019,9 @@ M: Chanwoo Choi <cw00.choi@samsung.com> M: Krzysztof Kozlowski <k.kozlowski@samsung.com> L: linux-kernel@vger.kernel.org S: Supported -F: drivers/*/max14577.c +F: drivers/*/max14577*.c F: drivers/*/max77686*.c -F: drivers/*/max77693.c +F: drivers/*/max77693*.c F: drivers/extcon/extcon-max14577.c F: drivers/extcon/extcon-max77693.c F: drivers/rtc/rtc-max77686.c diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 61bfbb9..8018b2e 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -46,7 +46,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o -obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o +obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o @@ -55,10 +55,10 @@ obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o -obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o +obj-$(CONFIG_REGULATOR_MAX8997) += max8997-regulator.o obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o -obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o +obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o diff --git a/drivers/regulator/max14577.c b/drivers/regulator/max14577-regulator.c index b2daa66..b2daa66 100644 --- a/drivers/regulator/max14577.c +++ b/drivers/regulator/max14577-regulator.c diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693-regulator.c index de730fd..de730fd 100644 --- a/drivers/regulator/max77693.c +++ b/drivers/regulator/max77693-regulator.c diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997-regulator.c index ea0196d..ea0196d 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997-regulator.c |
