Skip to content

Commit

Permalink
power: wm831x_power: Support USB charger current limit management
Browse files Browse the repository at this point in the history
Integrate with the newly added USB charger interface to limit the current
we draw from the USB input based on the input device configuration
identified by the USB stack, allowing us to charge more quickly from high
current inputs without drawing more current than specified from others.

Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  • Loading branch information
Baolin Wang authored and Felipe Balbi committed Aug 15, 2017
1 parent a9081a0 commit 626b6cd
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mfd/wm831x.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Required properties:
../interrupt-controller/interrupts.txt

Optional sub-nodes:
- phys : Contains a phandle to the USB PHY.
- regulators : Contains sub-nodes for each of the regulators supplied by
the device. The regulators are bound using their names listed below:

Expand Down
72 changes: 72 additions & 0 deletions drivers/power/supply/wm831x_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <linux/platform_device.h>
#include <linux/power_supply.h>
#include <linux/slab.h>
#include <linux/usb/phy.h>

#include <linux/mfd/wm831x/core.h>
#include <linux/mfd/wm831x/auxadc.h>
Expand All @@ -31,6 +32,8 @@ struct wm831x_power {
char usb_name[20];
char battery_name[20];
bool have_battery;
struct usb_phy *usb_phy;
struct notifier_block usb_notify;
};

static int wm831x_power_check_online(struct wm831x *wm831x, int supply,
Expand Down Expand Up @@ -125,6 +128,43 @@ static enum power_supply_property wm831x_usb_props[] = {
POWER_SUPPLY_PROP_VOLTAGE_NOW,
};

/* In milliamps */
static const unsigned int wm831x_usb_limits[] = {
0,
2,
100,
500,
900,
1500,
1800,
550,
};

static int wm831x_usb_limit_change(struct notifier_block *nb,
unsigned long limit, void *data)
{
struct wm831x_power *wm831x_power = container_of(nb,
struct wm831x_power,
usb_notify);
unsigned int i, best;

/* Find the highest supported limit */
best = 0;
for (i = 0; i < ARRAY_SIZE(wm831x_usb_limits); i++) {
if (limit >= wm831x_usb_limits[i] &&
wm831x_usb_limits[best] < wm831x_usb_limits[i])
best = i;
}

dev_dbg(wm831x_power->wm831x->dev,
"Limiting USB current to %umA", wm831x_usb_limits[best]);

wm831x_set_bits(wm831x_power->wm831x, WM831X_POWER_STATE,
WM831X_USB_ILIM_MASK, best);

return 0;
}

/*********************************************************************
* Battery properties
*********************************************************************/
Expand Down Expand Up @@ -607,6 +647,33 @@ static int wm831x_power_probe(struct platform_device *pdev)
}
}

power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "phys", 0);
ret = PTR_ERR_OR_ZERO(power->usb_phy);

switch (ret) {
case 0:
power->usb_notify.notifier_call = wm831x_usb_limit_change;
ret = usb_register_notifier(power->usb_phy, &power->usb_notify);
if (ret) {
dev_err(&pdev->dev, "Failed to register notifier: %d\n",
ret);
goto err_bat_irq;
}
break;
case -EINVAL:
case -ENODEV:
/* ignore missing usb-phy, it's optional */
power->usb_phy = NULL;
ret = 0;
break;
default:
dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret);
/* fall-through */
case -EPROBE_DEFER:
goto err_bat_irq;
break;
}

return ret;

err_bat_irq:
Expand Down Expand Up @@ -637,6 +704,11 @@ static int wm831x_power_remove(struct platform_device *pdev)
struct wm831x *wm831x = wm831x_power->wm831x;
int irq, i;

if (wm831x_power->usb_phy) {
usb_unregister_notifier(wm831x_power->usb_phy,
&wm831x_power->usb_notify);
}

for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = wm831x_irq(wm831x,
platform_get_irq_byname(pdev,
Expand Down

0 comments on commit 626b6cd

Please sign in to comment.