| Message ID | 1449035947-16758-1-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Dec 02, 2015 at 02:59:06PM +0900, Krzysztof Kozlowski wrote: > Actually reset/power off handlers do not really depend on power supply. > Move the power reset out of power supply block so it will appear in main > drivers section. This 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) nice catch. I don't really like the Makefile changes, though. I think it would be better to make the power/ entry in drivers/Makefile into "obj-y" and handle the details in drivers/power/Makefile. -- Sebastian
On 05.12.2015 09:59, Sebastian Reichel wrote: > Hi, > > On Wed, Dec 02, 2015 at 02:59:06PM +0900, Krzysztof Kozlowski wrote: >> Actually reset/power off handlers do not really depend on power supply. >> Move the power reset out of power supply block so it will appear in main >> drivers section. This 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) > > nice catch. I don't really like the Makefile changes, though. I think > it would be better to make the power/ entry in drivers/Makefile into > "obj-y" and handle the details in drivers/power/Makefile. You idea indeed looks better, I'll send a v2. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/Makefile b/drivers/Makefile index 795d0ca714bf..0ebb49d0e57e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -106,6 +106,7 @@ obj-y += i2c/ media/ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ obj-$(CONFIG_W1) += w1/ +obj-$(CONFIG_POWER_RESET) += power/reset/ obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 2f944d742ed4..c031f901b497 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -509,8 +509,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" diff --git a/drivers/power/Makefile b/drivers/power/Makefile index b656638f8b39..ac430b373f84 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -69,6 +69,5 @@ obj-$(CONFIG_POWER_AVS) += avs/ obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o -obj-$(CONFIG_POWER_RESET) += reset/ obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o obj-$(CONFIG_AXP288_CHARGER) += axp288_charger.o
Actually reset/power off handlers do not really depend on power supply. Move the power reset out of power supply block so it will appear in main drivers section. This 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> --- drivers/Makefile | 1 + drivers/power/Kconfig | 3 +-- drivers/power/Makefile | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)