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

Commit e07a5645 authored by Loic Pallardy's avatar Loic Pallardy Committed by Lee Jones
Browse files

pm2301: Update watchdog for pm2xxx support 



AB and PMxxx doesn't have same watchdog refresh period. Add watchdog
to refresh period parameters in x500 charger structure, this should
kick watchdog every 30sec. The AC charging should also kick both
pm2xxx and the AB charger watchdog.

Signed-off-by: default avatarRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: default avatarLoic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarMichel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-by: default avatarMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: default avatarJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: default avatarMichel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: default avatarJonas ABERG <jonas.aberg@stericsson.com>
parent e3455002

drivers/power/ab8500_charger.c

+6 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ 


#define CHARGER_STATUS_POLL 10 /* in ms */



#define CHG_WD_INTERVAL			(60 * HZ)



/* UsbLineStatus register - usb types */

enum ab8500_charger_link_status {

	USB_STAT_NOT_CONFIGURED,
@@ -2953,7 +2955,9 @@ static int ab8500_charger_probe(struct platform_device *pdev) 
		ARRAY_SIZE(ab8500_charger_voltage_map) - 1];

	di->ac_chg.max_out_curr = ab8500_charger_current_map[

		ARRAY_SIZE(ab8500_charger_current_map) - 1];

	di->ac_chg.wdt_refresh = CHG_WD_INTERVAL;

	di->ac_chg.enabled = di->pdata->ac_enabled;

	di->ac_chg.external = false;



	/* USB supply */

	/* power_supply base class */
@@ -2972,7 +2976,9 @@ static int ab8500_charger_probe(struct platform_device *pdev) 
		ARRAY_SIZE(ab8500_charger_voltage_map) - 1];

	di->usb_chg.max_out_curr = ab8500_charger_current_map[

		ARRAY_SIZE(ab8500_charger_current_map) - 1];

	di->usb_chg.wdt_refresh = CHG_WD_INTERVAL;

	di->usb_chg.enabled = di->pdata->usb_enabled;

	di->usb_chg.external = false;



	/* Create a work queue for the charger */

	di->charger_wq =

drivers/power/abx500_chargalg.c

+11 −1
Original line number Diff line number Diff line
@@ -445,8 +445,18 @@ static int abx500_chargalg_kick_watchdog(struct abx500_chargalg *di) 
{

	/* Check if charger exists and kick watchdog if charging */

	if (di->ac_chg && di->ac_chg->ops.kick_wd &&

			di->chg_info.online_chg & AC_CHG)

	    di->chg_info.online_chg & AC_CHG) {

		/*

		 * If AB charger watchdog expired, pm2xxx charging

		 * gets disabled. To be safe, kick both AB charger watchdog

		 * and pm2xxx watchdog.

		 */

		if (di->ac_chg->external &&

		    di->usb_chg && di->usb_chg->ops.kick_wd)

			di->usb_chg->ops.kick_wd(di->usb_chg);



		return di->ac_chg->ops.kick_wd(di->ac_chg);

	}

	else if (di->usb_chg && di->usb_chg->ops.kick_wd &&

			di->chg_info.online_chg & USB_CHG)

		return di->usb_chg->ops.kick_wd(di->usb_chg);

drivers/power/pm2301_charger.c

+2 −0
Original line number Diff line number Diff line
@@ -875,7 +875,9 @@ static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, 
		ARRAY_SIZE(pm2xxx_charger_voltage_map) - 1];

	pm2->ac_chg.max_out_curr = pm2xxx_charger_current_map[

		ARRAY_SIZE(pm2xxx_charger_current_map) - 1];

	pm2->ac_chg.wdt_refresh = WD_KICK_INTERVAL;

	pm2->ac_chg.enabled = true;

	pm2->ac_chg.external = true;



	/* Create a work queue for the charger */

	pm2->charger_wq =

drivers/power/pm2301_charger.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


/* Watchdog timeout constant */

#define WD_TIMER			0x30 /* 4min */

#define WD_KICK_INTERVAL		(60 * HZ)

#define WD_KICK_INTERVAL		(30 * HZ)



#define PM2XXX_NUM_INT_REG		0x6

include/linux/mfd/abx500/ux500_chargalg.h

+3 −0
Original line number Diff line number Diff line
@@ -28,13 +28,16 @@ struct ux500_charger_ops { 
 * @max_out_volt	maximum output charger voltage in mV

 * @max_out_curr	maximum output charger current in mA

 * @enabled		indicates if this charger is used or not

 * @external		external charger unit (pm2xxx)

 */

struct ux500_charger {

	struct power_supply psy;

	struct ux500_charger_ops ops;

	int max_out_volt;

	int max_out_curr;

	int wdt_refresh;

	bool enabled;

	bool external;

};



#endif