Linux-PM Archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them
@ 2015-12-02  5:59 Krzysztof Kozlowski
  2015-12-02  5:59 ` [PATCH 2/2] power: Build power/avs when POWER_AVS is selected but POWER_SUPPLY is not Krzysztof Kozlowski
  2015-12-05  0:59 ` [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Sebastian Reichel
  0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2015-12-02  5:59 UTC (permalink / raw
  To: Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse,
	Greg Kroah-Hartman, linux-kernel, linux-pm, linux-samsung-soc
  Cc: Pavel Fedin, Arnd Bergmann, Olof Johansson, Krzysztof Kozlowski

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(-)

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
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] power: Build power/avs when POWER_AVS is selected but POWER_SUPPLY is not
  2015-12-02  5:59 [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Krzysztof Kozlowski
@ 2015-12-02  5:59 ` Krzysztof Kozlowski
  2015-12-05  0:59 ` [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Sebastian Reichel
  1 sibling, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2015-12-02  5:59 UTC (permalink / raw
  To: Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse,
	Greg Kroah-Hartman, linux-kernel, linux-pm, linux-samsung-soc
  Cc: Pavel Fedin, Arnd Bergmann, Olof Johansson, Krzysztof Kozlowski

POWER_AVS can be selected from top-drivers menu and it does not depend
on POWER_SUPPLY. However in such case (POWER_SUPPLY is not enabled) all
objects will be skipped by make.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/Makefile       | 1 +
 drivers/power/Makefile | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 0ebb49d0e57e..a3717decf3e7 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_AVS)		+= power/avs/
 obj-$(CONFIG_POWER_RESET)	+= power/reset/
 obj-$(CONFIG_POWER_SUPPLY)	+= power/
 obj-$(CONFIG_HWMON)		+= hwmon/
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index ac430b373f84..d6a1ddb20fec 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_CHARGER_BQ24190)	+= bq24190_charger.o
 obj-$(CONFIG_CHARGER_BQ24257)	+= bq24257_charger.o
 obj-$(CONFIG_CHARGER_BQ24735)	+= bq24735-charger.o
 obj-$(CONFIG_CHARGER_BQ25890)	+= bq25890_charger.o
-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
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them
  2015-12-02  5:59 [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Krzysztof Kozlowski
  2015-12-02  5:59 ` [PATCH 2/2] power: Build power/avs when POWER_AVS is selected but POWER_SUPPLY is not Krzysztof Kozlowski
@ 2015-12-05  0:59 ` Sebastian Reichel
  2015-12-07  2:12   ` Krzysztof Kozlowski
  1 sibling, 1 reply; 4+ messages in thread
From: Sebastian Reichel @ 2015-12-05  0:59 UTC (permalink / raw
  To: Krzysztof Kozlowski
  Cc: Dmitry Eremin-Solenikov, David Woodhouse, Greg Kroah-Hartman,
	linux-kernel, linux-pm, linux-samsung-soc, Pavel Fedin,
	Arnd Bergmann, Olof Johansson

[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them
  2015-12-05  0:59 ` [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Sebastian Reichel
@ 2015-12-07  2:12   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2015-12-07  2:12 UTC (permalink / raw
  To: Sebastian Reichel
  Cc: Dmitry Eremin-Solenikov, David Woodhouse, Greg Kroah-Hartman,
	linux-kernel, linux-pm, linux-samsung-soc, Pavel Fedin,
	Arnd Bergmann, Olof Johansson

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-12-07  2:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-02  5:59 [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Krzysztof Kozlowski
2015-12-02  5:59 ` [PATCH 2/2] power: Build power/avs when POWER_AVS is selected but POWER_SUPPLY is not Krzysztof Kozlowski
2015-12-05  0:59 ` [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Sebastian Reichel
2015-12-07  2:12   ` Krzysztof Kozlowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).