diff mbox

power: supply: cpcap-charger: add OMAP_USB2 dependency

Message ID 20170721161511.3334292-1-arnd@arndb.de
State Accepted
Commit 8b35bf5927b1e89e9b2f9ddbd701bd9b27456e78
Headers show

Commit Message

Arnd Bergmann July 21, 2017, 4:14 p.m. UTC
When CONFIG_OMAP_USB2 is set to 'm' and the charger driver is built-in,
we get this link failure:

drivers/power/supply/cpcap-charger.o: In function `cpcap_charger_probe':
cpcap-charger.c:(.text+0x48c): undefined reference to `omap_usb2_set_comparator'
drivers/power/supply/cpcap-charger.o: In function `cpcap_charger_remove':
cpcap-charger.c:(.text+0x774): undefined reference to `omap_usb2_set_comparator'

This adds a dependency to prevent that problem, while still allowing
compile-testing with the OMAP_USB2 driver completely disabled.

Fixes: 0c9888e3c192 ("power: supply: cpcap-charger: Add minimal CPCAP PMIC battery charger")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/power/supply/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Sebastian Reichel July 24, 2017, 6:51 p.m. UTC | #1
Hi,

On Fri, Jul 21, 2017 at 06:14:37PM +0200, Arnd Bergmann wrote:
> When CONFIG_OMAP_USB2 is set to 'm' and the charger driver is built-in,

> we get this link failure:

> 

> drivers/power/supply/cpcap-charger.o: In function `cpcap_charger_probe':

> cpcap-charger.c:(.text+0x48c): undefined reference to `omap_usb2_set_comparator'

> drivers/power/supply/cpcap-charger.o: In function `cpcap_charger_remove':

> cpcap-charger.c:(.text+0x774): undefined reference to `omap_usb2_set_comparator'

> 

> This adds a dependency to prevent that problem, while still allowing

> compile-testing with the OMAP_USB2 driver completely disabled.

> 

> Fixes: 0c9888e3c192 ("power: supply: cpcap-charger: Add minimal CPCAP PMIC battery charger")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---


Thanks, applied to power-supply's fixes branch.

-- Sebastian
diff mbox

Patch

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 969f5005669c..765f9ac0a4e7 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -365,6 +365,7 @@  config BATTERY_RX51
 config CHARGER_CPCAP
 	tristate "CPCAP PMIC Charger Driver"
 	depends on MFD_CPCAP && IIO
+	depends on OMAP_USB2 || (!OMAP_USB2 && COMPILE_TEST)
 	default MFD_CPCAP
 	help
 	  Say Y to enable support for CPCAP PMIC charger driver for Motorola