* [PATCH v2 0/3] Introduce USB charger support in USB phy
@ 2017-07-03 6:07 Baolin Wang
2017-07-03 6:07 ` [PATCH v2 1/3] include: uapi: usb: Introduce USB charger type and state definition Baolin Wang
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Baolin Wang @ 2017-07-03 6:07 UTC (permalink / raw)
To: balbi, gregkh, sre
Cc: jun.li, peter.chen, broonie, john.stultz, neilb, patches,
baolin.wang, linux-pm, linux-usb, device-mainlining,
linux-kernel
Currently the Linux kernel does not provide any standard integration of this
feature that integrates the USB subsystem with the system power regulation
provided by PMICs meaning that either vendors must add this in their kernels
or USB gadget devices based on Linux (such as mobile phones) may not behave
as they should. Thus provide a standard USB charger support in USB phy core
for doing this in kernel.
Now introduce one user with wm831x_power to support and test the usb charger.
Changes since v1:
- Fix building errors.
Baolin Wang (3):
include: uapi: usb: Introduce USB charger type and state definition
usb: phy: Add USB charger support
power: wm831x_power: Support USB charger current limit management
drivers/power/supply/wm831x_power.c | 61 ++++++++
drivers/usb/phy/phy.c | 265 +++++++++++++++++++++++++++++++++++
include/linux/usb/phy.h | 49 +++++++
include/uapi/linux/usb/charger.h | 31 ++++
4 files changed, 406 insertions(+)
create mode 100644 include/uapi/linux/usb/charger.h
--
1.7.9.5
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 1/3] include: uapi: usb: Introduce USB charger type and state definition 2017-07-03 6:07 [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang @ 2017-07-03 6:07 ` Baolin Wang 2017-07-03 6:07 ` [PATCH v2 2/3] usb: phy: Add USB charger support Baolin Wang ` (2 subsequent siblings) 3 siblings, 0 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-03 6:07 UTC (permalink / raw) To: balbi, gregkh, sre Cc: jun.li, peter.chen, broonie, john.stultz, neilb, patches, baolin.wang, linux-pm, linux-usb, device-mainlining, linux-kernel Introducing USB charger type and state definition can help to support USB charging which will be added in USB phy core. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- include/uapi/linux/usb/charger.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/uapi/linux/usb/charger.h diff --git a/include/uapi/linux/usb/charger.h b/include/uapi/linux/usb/charger.h new file mode 100644 index 0000000..5f72af3 --- /dev/null +++ b/include/uapi/linux/usb/charger.h @@ -0,0 +1,31 @@ +/* + * This file defines the USB charger type and state that are needed for + * USB device APIs. + */ + +#ifndef _UAPI__LINUX_USB_CHARGER_H +#define _UAPI__LINUX_USB_CHARGER_H + +/* + * USB charger type: + * SDP (Standard Downstream Port) + * DCP (Dedicated Charging Port) + * CDP (Charging Downstream Port) + * ACA (Accessory Charger Adapters) + */ +enum usb_charger_type { + UNKNOWN_TYPE, + SDP_TYPE, + DCP_TYPE, + CDP_TYPE, + ACA_TYPE, +}; + +/* USB charger state */ +enum usb_charger_state { + USB_CHARGER_DEFAULT, + USB_CHARGER_PRESENT, + USB_CHARGER_ABSENT, +}; + +#endif /* _UAPI__LINUX_USB_CHARGER_H */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] usb: phy: Add USB charger support 2017-07-03 6:07 [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang 2017-07-03 6:07 ` [PATCH v2 1/3] include: uapi: usb: Introduce USB charger type and state definition Baolin Wang @ 2017-07-03 6:07 ` Baolin Wang 2017-07-03 6:07 ` [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management Baolin Wang 2017-07-18 7:13 ` [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang 3 siblings, 0 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-03 6:07 UTC (permalink / raw) To: balbi, gregkh, sre Cc: jun.li, peter.chen, broonie, john.stultz, neilb, patches, baolin.wang, linux-pm, linux-usb, device-mainlining, linux-kernel This patch introduces the usb charger support based on usb phy that makes an enhancement to a power driver. The basic conception of the usb charger is that, when one usb charger is added or removed by reporting from the extcon device state change, the usb charger will report to power user to set the current limitation. Power user can register a notifiee on the usb phy by issuing usb_register_notifier() to get notified by charger status changes or charger current changes. we can notify what current to be drawn to power user according to different charger type, and now we have 2 methods to get charger type. One is get charger type from extcon subsystem, which also means the charger state changes. Another is we can get the charger type from USB controller detecting or PMIC detecting, and the charger state changes should be told by issuing usb_phy_set_charger_state(). Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- drivers/usb/phy/phy.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 49 +++++++++ 2 files changed, 314 insertions(+) diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 032f5af..db72802 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -18,6 +18,18 @@ #include <linux/usb/phy.h> +/* Default current range by charger type. */ +#define DEFAULT_SDP_CUR_MIN 2 +#define DEFAULT_SDP_CUR_MAX 500 +#define DEFAULT_SDP_CUR_MIN_SS 150 +#define DEFAULT_SDP_CUR_MAX_SS 900 +#define DEFAULT_DCP_CUR_MIN 500 +#define DEFAULT_DCP_CUR_MAX 5000 +#define DEFAULT_CDP_CUR_MIN 1500 +#define DEFAULT_CDP_CUR_MAX 5000 +#define DEFAULT_ACA_CUR_MIN 1500 +#define DEFAULT_ACA_CUR_MAX 5000 + static LIST_HEAD(phy_list); static LIST_HEAD(phy_bind_list); static DEFINE_SPINLOCK(phy_lock); @@ -77,6 +89,216 @@ static struct usb_phy *__of_usb_find_phy(struct device_node *node) return ERR_PTR(-EPROBE_DEFER); } +static void usb_phy_set_default_current(struct usb_phy *usb_phy) +{ + usb_phy->chg_cur.sdp_min = DEFAULT_SDP_CUR_MIN; + usb_phy->chg_cur.sdp_max = DEFAULT_SDP_CUR_MAX; + usb_phy->chg_cur.dcp_min = DEFAULT_DCP_CUR_MIN; + usb_phy->chg_cur.dcp_max = DEFAULT_DCP_CUR_MAX; + usb_phy->chg_cur.cdp_min = DEFAULT_CDP_CUR_MIN; + usb_phy->chg_cur.cdp_max = DEFAULT_CDP_CUR_MAX; + usb_phy->chg_cur.aca_min = DEFAULT_ACA_CUR_MIN; + usb_phy->chg_cur.aca_max = DEFAULT_ACA_CUR_MAX; +} + +/** + * usb_phy_notify_charger_work - notify the USB charger state + * @work - the charger work to notify the USB charger state + * + * This work can be issued when USB charger state has been changed or + * USB charger current has been changed, then we can notify the current + * what can be drawn to power user and the charger state to userspace. + * + * If we get the charger type from extcon subsystem, we can notify the + * charger state to power user automatically by usb_phy_get_charger_type() + * issuing from extcon subsystem. + * + * If we get the charger type from ->charger_detect() instead of extcon + * subsystem, the usb phy driver should issue usb_phy_set_charger_state() + * to set charger state when the charger state has been changed. + */ +static void usb_phy_notify_charger_work(struct work_struct *work) +{ + struct usb_phy *usb_phy = container_of(work, struct usb_phy, chg_work); + char uchger_state[50] = { 0 }; + char *envp[] = { uchger_state, NULL }; + unsigned int min, max; + + switch (usb_phy->chg_state) { + case USB_CHARGER_PRESENT: + usb_phy_get_charger_current(usb_phy, &min, &max); + + atomic_notifier_call_chain(&usb_phy->notifier, max, usb_phy); + snprintf(uchger_state, ARRAY_SIZE(uchger_state), + "USB_CHARGER_STATE=%s", "USB_CHARGER_PRESENT"); + break; + case USB_CHARGER_ABSENT: + usb_phy_set_default_current(usb_phy); + + atomic_notifier_call_chain(&usb_phy->notifier, 0, usb_phy); + snprintf(uchger_state, ARRAY_SIZE(uchger_state), + "USB_CHARGER_STATE=%s", "USB_CHARGER_ABSENT"); + break; + default: + dev_warn(usb_phy->dev, "Unknown USB charger state: %d\n", + usb_phy->chg_state); + return; + } + + kobject_uevent_env(&usb_phy->dev->kobj, KOBJ_CHANGE, envp); +} + +/** + * usb_phy_get_charger_type - get charger type from extcon subsystem + * @nb -the notifier block to determine charger type + * @state - the cable state + * @data - private data + * + * Determin the charger type from extcon subsystem which also means the + * charger state has been chaned, then we should notify this event. + */ +static int usb_phy_get_charger_type(struct notifier_block *nb, + unsigned long state, void *data) +{ + struct usb_phy *usb_phy = container_of(nb, struct usb_phy, type_nb); + + if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_SDP) > 0) { + usb_phy->chg_type = SDP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_CDP) > 0) { + usb_phy->chg_type = CDP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_DCP) > 0) { + usb_phy->chg_type = DCP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_ACA) > 0) { + usb_phy->chg_type = ACA_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else { + usb_phy->chg_type = UNKNOWN_TYPE; + usb_phy->chg_state = USB_CHARGER_ABSENT; + } + + schedule_work(&usb_phy->chg_work); + return NOTIFY_OK; +} + +/** + * usb_phy_set_charger_current - set the USB charger current + * @usb_phy - the USB phy to be used + * @mA - the current need to be set + * + * Usually we only change the charger default current when USB finished the + * enumeration as one SDP charger. As one SDP charger, usb_phy_set_power() + * will issue this function to change charger current when after setting USB + * configuration, or suspend/resume USB. For other type charger, we should + * use the default charger current and we do not suggest to issue this function + * to change the charger current. + * + * When USB charger current has been changed, we need to notify the power users. + */ +void usb_phy_set_charger_current(struct usb_phy *usb_phy, unsigned int mA) +{ + switch (usb_phy->chg_type) { + case SDP_TYPE: + if (usb_phy->chg_cur.sdp_max == mA) + return; + + usb_phy->chg_cur.sdp_max = (mA > DEFAULT_SDP_CUR_MAX_SS) ? + DEFAULT_SDP_CUR_MAX_SS : mA; + break; + case DCP_TYPE: + if (usb_phy->chg_cur.dcp_max == mA) + return; + + usb_phy->chg_cur.dcp_max = (mA > DEFAULT_DCP_CUR_MAX) ? + DEFAULT_DCP_CUR_MAX : mA; + break; + case CDP_TYPE: + if (usb_phy->chg_cur.cdp_max == mA) + return; + + usb_phy->chg_cur.cdp_max = (mA > DEFAULT_CDP_CUR_MAX) ? + DEFAULT_CDP_CUR_MAX : mA; + break; + case ACA_TYPE: + if (usb_phy->chg_cur.aca_max == mA) + return; + + usb_phy->chg_cur.aca_max = (mA > DEFAULT_ACA_CUR_MAX) ? + DEFAULT_ACA_CUR_MAX : mA; + break; + default: + return; + } + + schedule_work(&usb_phy->chg_work); +} +EXPORT_SYMBOL_GPL(usb_phy_set_charger_current); + +/** + * usb_phy_get_charger_current - get the USB charger current + * @usb_phy - the USB phy to be used + * @min - the minimum current + * @max - the maximum current + * + * Usually we will notify the maximum current to power user, but for some + * special case, power user also need the minimum current value. Then the + * power user can issue this function to get the suitable current. + */ +void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, unsigned int *max) +{ + switch (usb_phy->chg_type) { + case SDP_TYPE: + *min = usb_phy->chg_cur.sdp_min; + *max = usb_phy->chg_cur.sdp_max; + break; + case DCP_TYPE: + *min = usb_phy->chg_cur.dcp_min; + *max = usb_phy->chg_cur.dcp_max; + break; + case CDP_TYPE: + *min = usb_phy->chg_cur.cdp_min; + *max = usb_phy->chg_cur.cdp_max; + break; + case ACA_TYPE: + *min = usb_phy->chg_cur.aca_min; + *max = usb_phy->chg_cur.aca_max; + break; + default: + *min = 0; + *max = 0; + break; + } +} +EXPORT_SYMBOL_GPL(usb_phy_get_charger_current); + +/** + * usb_phy_set_charger_state - set the USB charger state + * @usb_phy - the USB phy to be used + * @state - the new state need to be set for charger + * + * The usb phy driver can issue this function when the usb phy driver + * detected the charger state has been changed, in this case the charger + * type should be get from ->charger_detect(). + */ +void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state) +{ + if (usb_phy->chg_state == state || !usb_phy->charger_detect) + return; + + usb_phy->chg_state = state; + if (usb_phy->chg_state == USB_CHARGER_PRESENT) + usb_phy->chg_type = usb_phy->charger_detect(usb_phy); + else + usb_phy->chg_type = UNKNOWN_TYPE; + + schedule_work(&usb_phy->chg_work); +} +EXPORT_SYMBOL_GPL(usb_phy_set_charger_state); + static void devm_usb_phy_release(struct device *dev, void *res) { struct usb_phy *phy = *(struct usb_phy **)res; @@ -124,6 +346,44 @@ static int usb_add_extcon(struct usb_phy *x) "register VBUS notifier failed\n"); return ret; } + } else { + x->type_nb.notifier_call = usb_phy_get_charger_type; + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_SDP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB SDP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_CDP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB CDP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_DCP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB DCP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_ACA, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB ACA failed.\n"); + return ret; + } } if (x->id_nb.notifier_call) { @@ -145,6 +405,11 @@ static int usb_add_extcon(struct usb_phy *x) } } + usb_phy_set_default_current(x); + INIT_WORK(&x->chg_work, usb_phy_notify_charger_work); + x->chg_type = UNKNOWN_TYPE; + x->chg_state = USB_CHARGER_DEFAULT; + return 0; } diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 2992451..de881b1 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,7 @@ #include <linux/extcon.h> #include <linux/notifier.h> #include <linux/usb.h> +#include <uapi/linux/usb/charger.h> enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, @@ -72,6 +73,17 @@ struct usb_phy_io_ops { int (*write)(struct usb_phy *x, u32 val, u32 reg); }; +struct usb_charger_current { + unsigned int sdp_min; + unsigned int sdp_max; + unsigned int dcp_min; + unsigned int dcp_max; + unsigned int cdp_min; + unsigned int cdp_max; + unsigned int aca_min; + unsigned int aca_max; +}; + struct usb_phy { struct device *dev; const char *label; @@ -91,6 +103,13 @@ struct usb_phy { struct extcon_dev *id_edev; struct notifier_block vbus_nb; struct notifier_block id_nb; + struct notifier_block type_nb; + + /* Support USB charger */ + enum usb_charger_type chg_type; + enum usb_charger_state chg_state; + struct usb_charger_current chg_cur; + struct work_struct chg_work; /* for notification of usb_phy_events */ struct atomic_notifier_head notifier; @@ -129,6 +148,12 @@ struct usb_phy { enum usb_device_speed speed); int (*notify_disconnect)(struct usb_phy *x, enum usb_device_speed speed); + + /* + * Charger detection method can be implemented if you need to + * manually detect the charger type. + */ + enum usb_charger_type (*charger_detect)(struct usb_phy *x); }; /** @@ -219,6 +244,12 @@ extern struct usb_phy *devm_usb_get_phy_by_node(struct device *dev, extern int usb_bind_phy(const char *dev_name, u8 index, const char *phy_dev_name); extern void usb_phy_set_event(struct usb_phy *x, unsigned long event); +extern void usb_phy_set_charger_current(struct usb_phy *usb_phy, + unsigned int mA); +extern void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, unsigned int *max); +extern void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state); #else static inline struct usb_phy *usb_get_phy(enum usb_phy_type type) { @@ -270,11 +301,29 @@ static inline int usb_bind_phy(const char *dev_name, u8 index, static inline void usb_phy_set_event(struct usb_phy *x, unsigned long event) { } + +static inline void usb_phy_set_charger_current(struct usb_phy *usb_phy, + unsigned int mA) +{ +} + +static inline void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, + unsigned int *max) +{ +} + +static inline void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state) +{ +} #endif static inline int usb_phy_set_power(struct usb_phy *x, unsigned mA) { + usb_phy_set_charger_current(x, mA); + if (x && x->set_power) return x->set_power(x, mA); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management 2017-07-03 6:07 [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang 2017-07-03 6:07 ` [PATCH v2 1/3] include: uapi: usb: Introduce USB charger type and state definition Baolin Wang 2017-07-03 6:07 ` [PATCH v2 2/3] usb: phy: Add USB charger support Baolin Wang @ 2017-07-03 6:07 ` Baolin Wang 2017-07-03 8:53 ` Charles Keepax 2017-07-03 15:50 ` Sebastian Reichel 2017-07-18 7:13 ` [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang 3 siblings, 2 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-03 6:07 UTC (permalink / raw) To: balbi, gregkh, sre Cc: jun.li, peter.chen, broonie, john.stultz, neilb, patches, baolin.wang, linux-pm, linux-usb, device-mainlining, linux-kernel 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> --- drivers/power/supply/wm831x_power.c | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c index 7082301..3e3480708 100644 --- a/drivers/power/supply/wm831x_power.c +++ b/drivers/power/supply/wm831x_power.c @@ -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> @@ -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, @@ -125,6 +128,43 @@ static int wm831x_usb_get_prop(struct power_supply *psy, 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 *********************************************************************/ @@ -607,6 +647,22 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, + "usb-phy", 0); + if (IS_ERR(power->usb_phy)) { + ret = PTR_ERR(power->usb_phy); + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); + goto err_bat_irq; + } + + 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; + } + return ret; err_bat_irq: @@ -637,6 +693,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, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management 2017-07-03 6:07 ` [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management Baolin Wang @ 2017-07-03 8:53 ` Charles Keepax 2017-07-04 7:27 ` Baolin Wang 2017-07-03 15:50 ` Sebastian Reichel 1 sibling, 1 reply; 9+ messages in thread From: Charles Keepax @ 2017-07-03 8:53 UTC (permalink / raw) To: Baolin Wang Cc: balbi, gregkh, sre, jun.li, peter.chen, broonie, john.stultz, neilb, patches, linux-pm, linux-usb, device-mainlining, linux-kernel On Mon, Jul 03, 2017 at 02:07:15PM +0800, Baolin Wang wrote: > 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> > --- <snip> > /********************************************************************* > * Battery properties > *********************************************************************/ > @@ -607,6 +647,22 @@ static int wm831x_power_probe(struct platform_device *pdev) > } > } > > + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, > + "usb-phy", 0); > + if (IS_ERR(power->usb_phy)) { > + ret = PTR_ERR(power->usb_phy); > + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); > + goto err_bat_irq; > + } > + We should probably update the binding documentation for this as well: mfd/wm831x.txt Also I am not sure this needs to be implemented now, but what is the plan regarding pdata systems? Generally the driver supports both and it would be nice to know there is a way forward for that even if we don't implement it yet. Thanks, Charles ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management 2017-07-03 8:53 ` Charles Keepax @ 2017-07-04 7:27 ` Baolin Wang 0 siblings, 0 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-04 7:27 UTC (permalink / raw) To: Charles Keepax Cc: Felipe Balbi, Greg KH, Sebastian Reichel, Jun Li, Peter Chen, Mark Brown, John Stultz, NeilBrown, patches, Linux PM list, USB, device-mainlining, LKML Hi, On 3 July 2017 at 16:53, Charles Keepax <ckeepax@opensource.cirrus.com> wrote: > On Mon, Jul 03, 2017 at 02:07:15PM +0800, Baolin Wang wrote: >> 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> >> --- > <snip> >> /********************************************************************* >> * Battery properties >> *********************************************************************/ >> @@ -607,6 +647,22 @@ static int wm831x_power_probe(struct platform_device *pdev) >> } >> } >> >> + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, >> + "usb-phy", 0); >> + if (IS_ERR(power->usb_phy)) { >> + ret = PTR_ERR(power->usb_phy); >> + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); >> + goto err_bat_irq; >> + } >> + > > We should probably update the binding documentation for this as > well: mfd/wm831x.txt Yes, I will update the binding documentation. > > Also I am not sure this needs to be implemented now, but what is > the plan regarding pdata systems? Generally the driver supports > both and it would be nice to know there is a way forward for that > even if we don't implement it yet. OK, I'll modify this in next version. Thanks. -- Baolin.wang Best Regards ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management 2017-07-03 6:07 ` [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management Baolin Wang 2017-07-03 8:53 ` Charles Keepax @ 2017-07-03 15:50 ` Sebastian Reichel 2017-07-04 7:20 ` Baolin Wang 1 sibling, 1 reply; 9+ messages in thread From: Sebastian Reichel @ 2017-07-03 15:50 UTC (permalink / raw) To: Baolin Wang Cc: balbi, gregkh, jun.li, peter.chen, broonie, john.stultz, neilb, patches, linux-pm, linux-usb, device-mainlining, linux-kernel [-- Attachment #1: Type: text/plain, Size: 4013 bytes --] Hi, On Mon, Jul 03, 2017 at 02:07:15PM +0800, Baolin Wang wrote: > 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> Missing DT binding documentation, otherwise fine with me. Would be nice to convert existing drivers: $ git grep -l extcon -- drivers/power/supply drivers/power/supply/axp288_charger.c drivers/power/supply/bq24190_charger.c drivers/power/supply/charger-manager.c drivers/power/supply/qcom_smbb.c -- Sebastian > --- > drivers/power/supply/wm831x_power.c | 61 +++++++++++++++++++++++++++++++++++ > 1 file changed, 61 insertions(+) > > diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c > index 7082301..3e3480708 100644 > --- a/drivers/power/supply/wm831x_power.c > +++ b/drivers/power/supply/wm831x_power.c > @@ -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> > @@ -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, > @@ -125,6 +128,43 @@ static int wm831x_usb_get_prop(struct power_supply *psy, > 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 > *********************************************************************/ > @@ -607,6 +647,22 @@ static int wm831x_power_probe(struct platform_device *pdev) > } > } > > + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, > + "usb-phy", 0); > + if (IS_ERR(power->usb_phy)) { > + ret = PTR_ERR(power->usb_phy); > + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); > + goto err_bat_irq; > + } > + > + 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; > + } > + > return ret; > > err_bat_irq: > @@ -637,6 +693,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, > -- > 1.7.9.5 > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management 2017-07-03 15:50 ` Sebastian Reichel @ 2017-07-04 7:20 ` Baolin Wang 0 siblings, 0 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-04 7:20 UTC (permalink / raw) To: Sebastian Reichel Cc: Felipe Balbi, Greg KH, Jun Li, Peter Chen, Mark Brown, John Stultz, NeilBrown, patches, Linux PM list, USB, device-mainlining, LKML Hi, On 3 July 2017 at 23:50, Sebastian Reichel <sebastian.reichel@collabora.co.uk> wrote: > Hi, > > On Mon, Jul 03, 2017 at 02:07:15PM +0800, Baolin Wang wrote: >> 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> > > Missing DT binding documentation, otherwise fine with me. > Would be nice to convert existing drivers: > > $ git grep -l extcon -- drivers/power/supply > drivers/power/supply/axp288_charger.c > drivers/power/supply/bq24190_charger.c > drivers/power/supply/charger-manager.c > drivers/power/supply/qcom_smbb.c I'll create new patches with adding the DT binding documentation if there are no objections for USB phy modification, moreover I will help to convert these drivers you listed. Thanks. > > -- Sebastian > >> --- >> drivers/power/supply/wm831x_power.c | 61 +++++++++++++++++++++++++++++++++++ >> 1 file changed, 61 insertions(+) >> >> diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c >> index 7082301..3e3480708 100644 >> --- a/drivers/power/supply/wm831x_power.c >> +++ b/drivers/power/supply/wm831x_power.c >> @@ -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> >> @@ -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, >> @@ -125,6 +128,43 @@ static int wm831x_usb_get_prop(struct power_supply *psy, >> 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 >> *********************************************************************/ >> @@ -607,6 +647,22 @@ static int wm831x_power_probe(struct platform_device *pdev) >> } >> } >> >> + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, >> + "usb-phy", 0); >> + if (IS_ERR(power->usb_phy)) { >> + ret = PTR_ERR(power->usb_phy); >> + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); >> + goto err_bat_irq; >> + } >> + >> + 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; >> + } >> + >> return ret; >> >> err_bat_irq: >> @@ -637,6 +693,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, >> -- >> 1.7.9.5 >> -- Baolin.wang Best Regards ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/3] Introduce USB charger support in USB phy 2017-07-03 6:07 [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang ` (2 preceding siblings ...) 2017-07-03 6:07 ` [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management Baolin Wang @ 2017-07-18 7:13 ` Baolin Wang 3 siblings, 0 replies; 9+ messages in thread From: Baolin Wang @ 2017-07-18 7:13 UTC (permalink / raw) To: Felipe Balbi, Greg KH, Sebastian Reichel Cc: Jun Li, Peter Chen, Mark Brown, John Stultz, NeilBrown, patches, Baolin Wang, Linux PM list, USB, device-mainlining, LKML Hi, On 3 July 2017 at 14:07, Baolin Wang <baolin.wang@linaro.org> wrote: > Currently the Linux kernel does not provide any standard integration of this > feature that integrates the USB subsystem with the system power regulation > provided by PMICs meaning that either vendors must add this in their kernels > or USB gadget devices based on Linux (such as mobile phones) may not behave > as they should. Thus provide a standard USB charger support in USB phy core > for doing this in kernel. > > Now introduce one user with wm831x_power to support and test the usb charger. > > Changes since v1: > - Fix building errors. > > Baolin Wang (3): > include: uapi: usb: Introduce USB charger type and state definition > usb: phy: Add USB charger support > power: wm831x_power: Support USB charger current limit management Any suggestion for the USB charger support in USB phy core? Thanks. > > drivers/power/supply/wm831x_power.c | 61 ++++++++ > drivers/usb/phy/phy.c | 265 +++++++++++++++++++++++++++++++++++ > include/linux/usb/phy.h | 49 +++++++ > include/uapi/linux/usb/charger.h | 31 ++++ > 4 files changed, 406 insertions(+) > create mode 100644 include/uapi/linux/usb/charger.h > > -- > 1.7.9.5 > -- Baolin.wang Best Regards ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-07-18 7:13 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-07-03 6:07 [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang 2017-07-03 6:07 ` [PATCH v2 1/3] include: uapi: usb: Introduce USB charger type and state definition Baolin Wang 2017-07-03 6:07 ` [PATCH v2 2/3] usb: phy: Add USB charger support Baolin Wang 2017-07-03 6:07 ` [PATCH v2 3/3] power: wm831x_power: Support USB charger current limit management Baolin Wang 2017-07-03 8:53 ` Charles Keepax 2017-07-04 7:27 ` Baolin Wang 2017-07-03 15:50 ` Sebastian Reichel 2017-07-04 7:20 ` Baolin Wang 2017-07-18 7:13 ` [PATCH v2 0/3] Introduce USB charger support in USB phy Baolin Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).