Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 405fea1c authored by Marcus Cooper's avatar Marcus Cooper Committed by Lee Jones
Browse files

pm2301-charger: Always compile the PM2301 Charger driver with AB8500 Battery Mgnt 



The PM2301 Charger should always be available when using the AB8500
Battery Management system, we're ensuring this will be the case.

Signed-off-by: default avatarMarcus Cooper <marcus.xm.cooper@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarHakan BERG <hakan.berg@stericsson.com>
Reviewed-by: default avatarMian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>
parent d4337660

drivers/power/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -353,13 +353,6 @@ config BATTERY_GOLDFISH 
	  Say Y to enable support for the battery and AC power in the

	  Goldfish emulator.



config CHARGER_PM2301

	bool "PM2301 Battery Charger Driver"

	depends on AB8500_BM

	help

	  Say Y to include support for PM2301 charger driver.

	  Depends on AB8500 battery management core.



source "drivers/power/reset/Kconfig"



endif # POWER_SUPPLY

drivers/power/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o 
obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o

obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o

obj-$(CONFIG_BATTERY_RX51)	+= rx51_battery.o

obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o

obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o

obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o

obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o

obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
@@ -47,7 +47,6 @@ obj-$(CONFIG_CHARGER_LP8727) += lp8727_charger.o 
obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o

obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o

obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o

obj-$(CONFIG_CHARGER_PM2301)	+= pm2301_charger.o

obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o

obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o

obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o

drivers/power/ab8500_charger.c

+3 −3
Original line number Diff line number Diff line
@@ -3387,10 +3387,10 @@ static int ab8500_charger_remove(struct platform_device *pdev) 
	flush_scheduled_work();

	if (di->usb_chg.enabled)

		power_supply_unregister(&di->usb_chg.psy);

#if !defined(CONFIG_CHARGER_PM2301)

	if (di->ac_chg.enabled)



	if (di->ac_chg.enabled && !di->ac_chg.external)

		power_supply_unregister(&di->ac_chg.psy);

#endif



	platform_set_drvdata(pdev, NULL);



	return 0;