diff options
| author | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> | 2017-04-18 06:43:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-25 11:35:45 -0400 |
| commit | 7e6425968bf742b9772aa5bae1250158c9312e31 (patch) | |
| tree | bd24c3d062c5160cf95b29c6a689e5d24d6bff68 /drivers/regulator | |
| parent | 9095bf25ea08135a5b74875dd0e3eeaddc4218a0 (diff) | |
regulator: arizona: Split KConfig options for LDO1 and MICSUPP regulators
The CS47L24 Arizona codec and most Madera codecs do not have a LDO1
regulator. Split the LDO1 and MICSUPP regulators into separate KConfig
options so the LDO1 is only built into the kernel if needed.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/regulator/Makefile | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index be06eb29c681..c026b09c479c 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig | |||
| @@ -125,12 +125,20 @@ config REGULATOR_AB8500 | |||
| 125 | This driver supports the regulators found on the ST-Ericsson mixed | 125 | This driver supports the regulators found on the ST-Ericsson mixed |
| 126 | signal AB8500 PMIC | 126 | signal AB8500 PMIC |
| 127 | 127 | ||
| 128 | config REGULATOR_ARIZONA | 128 | config REGULATOR_ARIZONA_LDO1 |
| 129 | tristate "Wolfson Arizona class devices" | 129 | tristate "Wolfson Arizona class devices LDO1" |
| 130 | depends on MFD_ARIZONA | 130 | depends on MFD_ARIZONA |
| 131 | depends on SND_SOC | 131 | depends on SND_SOC |
| 132 | help | 132 | help |
| 133 | Support for the regulators found on Wolfson Arizona class | 133 | Support for the LDO1 regulators found on Wolfson Arizona class |
| 134 | devices. | ||
| 135 | |||
| 136 | config REGULATOR_ARIZONA_MICSUPP | ||
| 137 | tristate "Wolfson Arizona class devices MICSUPP" | ||
| 138 | depends on MFD_ARIZONA | ||
| 139 | depends on SND_SOC | ||
| 140 | help | ||
| 141 | Support for the MICSUPP regulators found on Wolfson Arizona class | ||
| 134 | devices. | 142 | devices. |
| 135 | 143 | ||
| 136 | config REGULATOR_AS3711 | 144 | config REGULATOR_AS3711 |
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index ef7725e2592a..313a7ca97b4d 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -19,7 +19,8 @@ obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o | |||
| 19 | obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o | 19 | obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o |
| 20 | obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o | 20 | obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o |
| 21 | obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o | 21 | obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o |
| 22 | obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o | 22 | obj-$(CONFIG_REGULATOR_ARIZONA_LDO1) += arizona-ldo1.o |
| 23 | obj-$(CONFIG_REGULATOR_ARIZONA_MICSUPP) += arizona-micsupp.o | ||
| 23 | obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o | 24 | obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o |
| 24 | obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o | 25 | obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o |
| 25 | obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o | 26 | obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o |
