Introduce USB charger support in USB phy
Subsystems (5)
v4 cover Introduce USB charger support in USB phy
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. In future we will also cnvert below power drivers:drivers/power/supply/axp288_charger.c drivers/power/supply/bq24190_charger.c drivers/power/supply/charger-manager.c drivers/power/supply/qcom_smbb.c
Changes since v3:
- Bail out errors when failed to find usb phy for wm831x_power driver.
Changes since v2:
- Add DT binding documentation for wm831x_power driver.
- Change 'usb-phy' as one optional property for wm831x_power driver.
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
Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++ drivers/usb/phy/phy.c | 272 ++++++++++++++++++++++ include/linux/usb/phy.h | 49 ++++ include/uapi/linux/usb/charger.h | 31 +++ 5 files changed, 425 insertions(+) create mode 100644 include/uapi/linux/usb/charger.h
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 1/3 include: uapi: usb: Introduce USB charger type and state definition
Introducing USB charger type and state definition can help to support USB charging which will be added in USB phy core.
--- include/uapi/linux/usb/charger.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/uapi/linux/usb/charger.h
include/uapi/linux/usb/charger.h new file +31 -0
@@ -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 */
Signature · 1 line
1.7.9.5
PATCH v4 2/3 usb: phy: Add USB charger support
In reply to Baolin WangThis 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().
--- drivers/usb/phy/phy.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 49 +++++++++ 2 files changed, 321 insertions(+)
drivers/usb/phy/phy.c +272 -0
@@ -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,221 @@ 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); +} + +static void __usb_phy_get_charger_type (struct usb_phy *usb_phy) +{ +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); +} + +/** +* 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); + +__usb_phy_get_charger_type (usb_phy); +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 +351,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 +410,13 @@ 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 ; +if (x->type_nb.notifier_call) +__usb_phy_get_charger_type (x); +return 0 ; }
include/linux/usb/phy.h +49 -0
90 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 3/3 power: wm831x_power: Support USB charger current limit management
In reply to Baolin WangIntegrate 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.
--- Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+)
Documentation/devicetree/bindings/mfd/wm831x.txt +1 -0
@@ -31,6 +31,7 @@ Required properties: ../interrupt-controller/interrupts.txt Optional sub-nodes: + - usb-phy : 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:
drivers/power/supply/wm831x_power.c +72 -0
102 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Re: [PATCH v4 3/3] power: wm831x_power: Support USB charger current limit management
Hi,
Quoted 10 lines · Baolin Wang
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 <[email protected]>Signed-off-by Baolin Wang <[email protected]>Acked-by Lee Jones <[email protected]>Acked-by Charles Keepax <[email protected]>---
Looks ok now.
-- Sebastian
Quoted 130 lines
Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+)Documentation/devicetree/bindings/mfd/wm831x.txt +1
-0@@ -31,6 +31,7 @@ Required properties: ../interrupt-controller/interrupts.txt Optional sub-nodes: + - usb-phy : 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:drivers/power/supply/wm831x_power.c +72
-0@@ -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,33 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + power->usb_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,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:@@ -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,Signature · 1 line
1.7.9.5
Rob Herring
maintainerRe: [PATCH v4 3/3] power: wm831x_power: Support USB charger current limit management
In reply to Baolin WangQuoted 19 lines · Baolin Wang
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 <[email protected]>Signed-off-by Baolin Wang <[email protected]>Acked-by Lee Jones <[email protected]>Acked-by Charles Keepax <[email protected]>--- Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+)Documentation/devicetree/bindings/mfd/wm831x.txt +0
-0
Documentation/devicetree/bindings/mfd/wm831x.txt Required properties: · line 34
Quoted 4 lines
Documentation/devicetree/bindings/mfd/wm831x.txt +1
-0@@ -31,6 +31,7 @@ Required properties: ../interrupt-controller/interrupts.txt Optional sub-nodes: + - usb-phy : Contains a phandle to the USB PHY.
Use the phy binding ("phys") instead.
Quoted 117 lines
Documentation/devicetree/bindings/mfd/wm831x.txt +0
-0- regulators : Contains sub-nodes for each of the regulators supplied by the device. The regulators are bound using their names listed below:drivers/power/supply/wm831x_power.c +72
-0@@ -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,33 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + power->usb_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,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:@@ -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,Signature · 1 line
1.7.9.5
Re: [PATCH v4 3/3] power: wm831x_power: Support USB charger current limit management
Quoted 22 lines · Rob Herring
Quoted 21 lines · Baolin Wang
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 <[email protected]>Signed-off-by Baolin Wang <[email protected]>Acked-by Lee Jones <[email protected]>Acked-by Charles Keepax <[email protected]>--- Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+)Documentation/devicetree/bindings/mfd/wm831x.txt +0
-0@@ -31,6 +31,7 @@ Required properties: ../interrupt-controller/interrupts.txt
Quoted 4 lines
Documentation/devicetree/bindings/mfd/wm831x.txt Required properties: · line 34
Quoted 2 lines
Documentation/devicetree/bindings/mfd/wm831x.txt +1
-0Optional sub-nodes: + - usb-phy : Contains a phandle to the USB PHY.Use the phy binding ("phys") instead.
OK. Will fix in next version. Thanks.
Quoted 118 lines
Quoted 118 lines
Documentation/devicetree/bindings/mfd/wm831x.txt +0
-0- regulators : Contains sub-nodes for each of the regulators supplied by the device. The regulators are bound using their names listed below:drivers/power/supply/wm831x_power.c +72
-1@@ -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,33 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + power->usb_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,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:@@ -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, --1.7.9.5
Signature · 2 lines
Baolin.wang Best Regards
Hi Felipe,
Quoted 14 lines · Baolin Wang
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_powerto support and test the usb charger. In future we will also cnvert below power drivers:drivers/power/supply/axp288_charger.cdrivers/power/supply/bq24190_charger.cdrivers/power/supply/charger-manager.cdrivers/power/supply/qcom_smbb.c
Quoted 7 lines
Changes since v3:
- Bail out errors when failed to find usb phy forwm831x_powerdriver.
Changes since v2:
- Add DT binding documentation forwm831x_powerdriver.
- Change 'usb-phy' as one optional property forwm831x_powerdriver.
Changes since v1:
- Fix building errors.
Do you have any comments about usb charger support in usb phy core? Thanks.
Quoted 17 lines
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 managementDocumentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++ drivers/usb/phy/phy.c | 272 ++++++++++++++++++++++ include/linux/usb/phy.h | 49 ++++ include/uapi/linux/usb/charger.h | 31 +++ 5 files changed, 425 insertions(+) create mode 100644 include/uapi/linux/usb/charger.h--
1.7.9.5
Signature · 6 lines
Baolin.wang Best Regards -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 22 lines · Baolin Wang
Quoted 14 lines
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_powerto support and test the usb charger. In future we will also cnvert below power drivers:drivers/power/supply/axp288_charger.cdrivers/power/supply/bq24190_charger.cdrivers/power/supply/charger-manager.cdrivers/power/supply/qcom_smbb.cQuoted 7 lines
Changes since v3:
- Bail out errors when failed to find usb phy forwm831x_powerdriver.
Changes since v2:
- Add DT binding documentation forwm831x_powerdriver.
- Change 'usb-phy' as one optional property forwm831x_powerdriver.
Changes since v1:
- Fix building errors.
Quoted 1 line
Do you have any comments about usb charger support in usb phy core? Thanks.
No more comments from me
Signature · 1 line
balbi
Hi Felipe,
Quoted 26 lines · Felipe Balbi
Hi,
Quoted 22 lines · Baolin Wang
Quoted 21 lines
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_powerto support and test the usb charger. In future we will also cnvert below power drivers:drivers/power/supply/axp288_charger.cdrivers/power/supply/bq24190_charger.cdrivers/power/supply/charger-manager.cdrivers/power/supply/qcom_smbb.cChanges since v3:
- Bail out errors when failed to find usb phy forwm831x_powerdriver.
Changes since v2:
- Add DT binding documentation forwm831x_powerdriver.
- Change 'usb-phy' as one optional property forwm831x_powerdriver.
Changes since v1:
- Fix building errors.
Quoted 3 lines
Quoted 1 line
Do you have any comments about usb charger support in usb phy core? Thanks.
No more comments from me
Thanks for your feedback. I've send out V5 patchset which just changes phy phandle name from 'usb-phy' to 'phys' for patch 3 suggested by Rob. Hope you can apply this version patchset into your branch if there are no other comments.
Signature · 6 lines
Baolin.wang Best Regards -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html