Skip to content

Commit

Permalink
twl4030_charger: fix compile error when TWL4030_MADC not available.
Browse files Browse the repository at this point in the history
We can only use the madc to check for 'ac' availability if the madc has
been compiled in.  If not: assume always using USB.

Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: NeilBrown <neil@brown.name>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
  • Loading branch information
NeilBrown authored and Sebastian Reichel committed Aug 7, 2015
1 parent c9f85a9 commit b49d15d
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion drivers/power/twl4030_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,21 @@
#define TWL4030_MSTATEC_COMPLETE1 0x0b
#define TWL4030_MSTATEC_COMPLETE4 0x0e

#if IS_ENABLED(CONFIG_TWL4030_MADC)
/*
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
* then AC is available.
*/
static inline int ac_available(void)
{
return twl4030_get_madc_conversion(11) > 4500;
}
#else
static inline int ac_available(void)
{
return 0;
}
#endif
static bool allow_usb;
module_param(allow_usb, bool, 0644);
MODULE_PARM_DESC(allow_usb, "Allow USB charge drawing default current");
Expand Down Expand Up @@ -263,7 +278,7 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
* and AC is enabled, set current for 'ac'
*/
if (twl4030_get_madc_conversion(11) > 4500) {
if (ac_available()) {
cur = bci->ac_cur;
bci->ac_is_active = true;
} else {
Expand Down

0 comments on commit b49d15d

Please sign in to comment.