diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-12-07 12:45:12 +0900 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-12-08 04:26:05 +0100 |
| commit | f96576bd63e5b9a7a9c33a7fc4209fffc4d433cc (patch) | |
| tree | 8f4308c59f6919f0499783ae255ea754494d6d47 | |
| parent | 703df6c097956d17a818e63961c82e8e9eef9fef (diff) | |
| download | linux-f96576bd63e5b9a7a9c33a7fc4209fffc4d433cc.tar.gz linux-f96576bd63e5b9a7a9c33a7fc4209fffc4d433cc.tar.bz2 linux-f96576bd63e5b9a7a9c33a7fc4209fffc4d433cc.zip | |
power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them
Currently the reset/power off handlers (POWER_RESET) and Adaptive Voltage
Scaling class (POWER_AVS) are not built when POWER_SUPPLY is disabled.
The POWER_RESET is also not visible in drivers main section of config.
However they do not really depend on power supply so they can be built
always. The objects for power supply drivers already depend on
particular Kconfig symbols so there is no need for any changes in
drivers/power/Makefile.
This allows selecting POWER_RESET from main drivers config section and
fixes following build warning (encountered on ARM exynos defconfig when
POWER_SUPPLY is disabled manually):
warning: (ARCH_HISI && ARCH_INTEGRATOR && ARCH_EXYNOS && ARCH_VEXPRESS && REALVIEW_DT) selects POWER_RESET which has unmet direct dependencies (POWER_SUPPLY)
warning: (ARCH_EXYNOS) selects POWER_RESET_SYSCON which has unmet direct dependencies (POWER_SUPPLY && POWER_RESET && OF)
warning: (ARCH_EXYNOS) selects POWER_RESET_SYSCON_POWEROFF which has unmet direct dependencies (POWER_SUPPLY && POWER_RESET && OF)
Reported-by: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/power/Kconfig | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 795d0ca714bf..8f5d076baeb0 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -106,7 +106,7 @@ obj-y += i2c/ media/ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ obj-$(CONFIG_W1) += w1/ -obj-$(CONFIG_POWER_SUPPLY) += power/ +obj-y += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ obj-$(CONFIG_WATCHDOG) += watchdog/ diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 42a5b51c3d2e..1ddd13cc0c07 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -502,8 +502,7 @@ config AXP20X_POWER This driver provides support for the power supply features of AXP20x PMIC. -source "drivers/power/reset/Kconfig" - endif # POWER_SUPPLY +source "drivers/power/reset/Kconfig" source "drivers/power/avs/Kconfig" |