diff mbox

[v10,1/4] gadget: Introduce the usb charger framework

Message ID 6b323d5168c10ccb47882687b1251c31b6cad587.1460029375.git.baolin.wang@linaro.org (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

(Exiting) Baolin Wang April 7, 2016, 11:48 a.m. UTC
This patch introduces the usb charger driver based on usb gadget that
makes an enhancement to a power driver. It works well in practice but
that requires a system with suitable hardware.

The basic conception of the usb charger is that, when one usb charger
is added or removed by reporting from the usb gadget state change or
the extcon device state change, the usb charger will report to power
user to set the current limitation.

The usb charger will register notifiees on the usb gadget or the extcon
device to get notified the usb charger state. It also supplies the
notification mechanism to userspace When the usb charger state is changed.

Power user will register a notifiee on the usb charger to get notified
by status changes from the usb charger. It will report to power user
to set the current limitation when detecting the usb charger is added
or removed from extcon device state or usb gadget state.

This patch doesn't yet integrate with the gadget code, so some functions
which rely on the 'gadget' are not completed, that will be implemented
in the following patches.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/usb/gadget/Kconfig       |    7 +
 drivers/usb/gadget/udc/Makefile  |    1 +
 drivers/usb/gadget/udc/charger.c |  729 ++++++++++++++++++++++++++++++++++++++
 include/linux/usb/charger.h      |  173 +++++++++
 include/uapi/linux/usb/charger.h |   31 ++
 5 files changed, 941 insertions(+)
 create mode 100644 drivers/usb/gadget/udc/charger.c
 create mode 100644 include/linux/usb/charger.h
 create mode 100644 include/uapi/linux/usb/charger.h

Comments

Jun Li April 8, 2016, 8:04 a.m. UTC | #1
Hi, Baolin

> -----Original Message-----
> From: linux-usb-owner@vger.kernel.org [mailto:linux-usb-
> owner@vger.kernel.org] On Behalf Of Baolin Wang
> Sent: Thursday, April 07, 2016 7:49 PM
> To: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;
> dbaryshkov@gmail.com; dwmw2@infradead.org
> Cc: peter.chen@freescale.com; stern@rowland.harvard.edu;
> r.baldyga@samsung.com; yoshihiro.shimoda.uh@renesas.com;
> lee.jones@linaro.org; broonie@kernel.org;
> ckeepax@opensource.wolfsonmicro.com; patches@opensource.wolfsonmicro.com;
> baolin.wang@linaro.org; linux-pm@vger.kernel.org; linux-
> usb@vger.kernel.org; device-mainlining@lists.linuxfoundation.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH v10 1/4] gadget: Introduce the usb charger framework
> 
> This patch introduces the usb charger driver based on usb gadget that
> makes an enhancement to a power driver. It works well in practice but that
> requires a system with suitable hardware.
> 
> The basic conception of the usb charger is that, when one usb charger is
> added or removed by reporting from the usb gadget state change or the
> extcon device state change, the usb charger will report to power user to
> set the current limitation.
> 
> The usb charger will register notifiees on the usb gadget or the extcon
> device to get notified the usb charger state. It also supplies the
> notification mechanism to userspace When the usb charger state is changed.
> 
> Power user will register a notifiee on the usb charger to get notified by
> status changes from the usb charger. It will report to power user to set
> the current limitation when detecting the usb charger is added or removed
> from extcon device state or usb gadget state.
> 
> This patch doesn't yet integrate with the gadget code, so some functions
> which rely on the 'gadget' are not completed, that will be implemented in
> the following patches.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
> ---
>  drivers/usb/gadget/Kconfig       |    7 +
>  drivers/usb/gadget/udc/Makefile  |    1 +
>  drivers/usb/gadget/udc/charger.c |  729
> ++++++++++++++++++++++++++++++++++++++
>  include/linux/usb/charger.h      |  173 +++++++++
>  include/uapi/linux/usb/charger.h |   31 ++
>  5 files changed, 941 insertions(+)
>  create mode 100644 drivers/usb/gadget/udc/charger.c  create mode 100644
> include/linux/usb/charger.h  create mode 100644
> include/uapi/linux/usb/charger.h
> 

...

> +
> +/*
> + * usb_charger_detect_type() - detect the charger type manually.
> + * @uchger - usb charger device
> + *
> + * Note: You should ensure you need to detect the charger type manually
> +on your
> + * platform.
> + * You should call it at the right gadget state to avoid affecting
> +gadget
> + * enumeration.
> + */
> +int usb_charger_detect_type(struct usb_charger *uchger) {
> +	enum usb_charger_type type;
> +
> +	if (WARN(!uchger->charger_detect,
> +		 "charger detection method should not be NULL"))
> +		return -EINVAL;
> +
> +	type = uchger->charger_detect(uchger);
> +
> +	mutex_lock(&uchger->lock);
> +	uchger->type = type;
> +	mutex_unlock(&uchger->lock);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);

I still recommend have a central place to call usb_charger_detect_type()
to cover real charger detection instead of leaving this question open to
diff users. This can be done after vbus-on is detected and before do gadget
connect. I don't think this will make your framework complicated.

Hi Felipe, what do you think of this?

Li Jun

> +
> +/*
> + * usb_charger_get_type_by_others() - Get the usb charger type by the
> +callback
> + * which is implemented by users.
> + * @uchger - the usb charger device.
> + *
> + * Note: This function is just used for getting the charger type, not
> +for
> + * detecting charger type which might affect the DP/DM line when gadget
> +is on
> + * enumeration state.
> + */
> +static enum usb_charger_type
> +usb_charger_get_type_by_others(struct usb_charger *uchger) {
> +	if (uchger->type != UNKNOWN_TYPE)
> +		return uchger->type;
> +
> +	if (uchger->psy) {
> +		union power_supply_propval val;
> +
> +		power_supply_get_property(uchger->psy,
> +					  POWER_SUPPLY_PROP_CHARGE_TYPE,
> +					  &val);
> +		switch (val.intval) {
> +		case POWER_SUPPLY_TYPE_USB:
> +			uchger->type = SDP_TYPE;
> +			break;
> +		case POWER_SUPPLY_TYPE_USB_DCP:
> +			uchger->type = DCP_TYPE;
> +			break;
> +		case POWER_SUPPLY_TYPE_USB_CDP:
> +			uchger->type = CDP_TYPE;
> +			break;
> +		case POWER_SUPPLY_TYPE_USB_ACA:
> +			uchger->type = ACA_TYPE;
> +			break;
> +		default:
> +			uchger->type = UNKNOWN_TYPE;
> +			break;
> +		}
> +	} else if (uchger->get_charger_type) {
> +		uchger->type = uchger->get_charger_type(uchger);
> +	} else {
> +		uchger->type = UNKNOWN_TYPE;
> +	}
> +
> +	return uchger->type;
> +}
> +
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
(Exiting) Baolin Wang April 8, 2016, 9:56 a.m. UTC | #2
Hi Jun,

On 8 April 2016 at 16:04, Jun Li <jun.li@nxp.com> wrote:
> Hi, Baolin
>
>> +/*
>> + * usb_charger_detect_type() - detect the charger type manually.
>> + * @uchger - usb charger device
>> + *
>> + * Note: You should ensure you need to detect the charger type manually
>> +on your
>> + * platform.
>> + * You should call it at the right gadget state to avoid affecting
>> +gadget
>> + * enumeration.
>> + */
>> +int usb_charger_detect_type(struct usb_charger *uchger) {
>> +     enum usb_charger_type type;
>> +
>> +     if (WARN(!uchger->charger_detect,
>> +              "charger detection method should not be NULL"))
>> +             return -EINVAL;
>> +
>> +     type = uchger->charger_detect(uchger);
>> +
>> +     mutex_lock(&uchger->lock);
>> +     uchger->type = type;
>> +     mutex_unlock(&uchger->lock);
>> +
>> +     return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);
>
> I still recommend have a central place to call usb_charger_detect_type()
> to cover real charger detection instead of leaving this question open to
> diff users. This can be done after vbus-on is detected and before do gadget
> connect. I don't think this will make your framework complicated.

This API is used for detecting the charger type manually (software
charger detection), so if user's udc driver is needed to do this, then
they can issue it at their right place to make it more flexible. But
let us see other people's suggestion. Thanks.

>
> Hi Felipe, what do you think of this?
>
> Li Jun
>
>> +
>> +/*
>> + * usb_charger_get_type_by_others() - Get the usb charger type by the
>> +callback
>> + * which is implemented by users.
>> + * @uchger - the usb charger device.
>> + *
>> + * Note: This function is just used for getting the charger type, not
>> +for
>> + * detecting charger type which might affect the DP/DM line when gadget
>> +is on
>> + * enumeration state.
>> + */
>> +static enum usb_charger_type
>> +usb_charger_get_type_by_others(struct usb_charger *uchger) {
>> +     if (uchger->type != UNKNOWN_TYPE)
>> +             return uchger->type;
>> +
>> +     if (uchger->psy) {
>> +             union power_supply_propval val;
>> +
>> +             power_supply_get_property(uchger->psy,
>> +                                       POWER_SUPPLY_PROP_CHARGE_TYPE,
>> +                                       &val);
>> +             switch (val.intval) {
>> +             case POWER_SUPPLY_TYPE_USB:
>> +                     uchger->type = SDP_TYPE;
>> +                     break;
>> +             case POWER_SUPPLY_TYPE_USB_DCP:
>> +                     uchger->type = DCP_TYPE;
>> +                     break;
>> +             case POWER_SUPPLY_TYPE_USB_CDP:
>> +                     uchger->type = CDP_TYPE;
>> +                     break;
>> +             case POWER_SUPPLY_TYPE_USB_ACA:
>> +                     uchger->type = ACA_TYPE;
>> +                     break;
>> +             default:
>> +                     uchger->type = UNKNOWN_TYPE;
>> +                     break;
>> +             }
>> +     } else if (uchger->get_charger_type) {
>> +             uchger->type = uchger->get_charger_type(uchger);
>> +     } else {
>> +             uchger->type = UNKNOWN_TYPE;
>> +     }
>> +
>> +     return uchger->type;
>> +}
>> +
Jun Li April 8, 2016, 10:18 a.m. UTC | #3
SGkNCg0KPiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBCYW9saW4gV2FuZyBb
bWFpbHRvOmJhb2xpbi53YW5nQGxpbmFyby5vcmddDQo+IFNlbnQ6IEZyaWRheSwgQXByaWwgMDgs
IDIwMTYgNTo1NiBQTQ0KPiBUbzogSnVuIExpIDxqdW4ubGlAbnhwLmNvbT4NCj4gQ2M6IGJhbGJp
QGtlcm5lbC5vcmc7IGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnOyBzcmVAa2VybmVsLm9yZzsN
Cj4gZGJhcnlzaGtvdkBnbWFpbC5jb207IGR3bXcyQGluZnJhZGVhZC5vcmc7IHBldGVyLmNoZW5A
ZnJlZXNjYWxlLmNvbTsNCj4gc3Rlcm5Acm93bGFuZC5oYXJ2YXJkLmVkdTsgci5iYWxkeWdhQHNh
bXN1bmcuY29tOw0KPiB5b3NoaWhpcm8uc2hpbW9kYS51aEByZW5lc2FzLmNvbTsgbGVlLmpvbmVz
QGxpbmFyby5vcmc7IGJyb29uaWVAa2VybmVsLm9yZzsNCj4gY2tlZXBheEBvcGVuc291cmNlLndv
bGZzb25taWNyby5jb207IHBhdGNoZXNAb3BlbnNvdXJjZS53b2xmc29ubWljcm8uY29tOw0KPiBs
aW51eC1wbUB2Z2VyLmtlcm5lbC5vcmc7IGxpbnV4LXVzYkB2Z2VyLmtlcm5lbC5vcmc7IGRldmlj
ZS0NCj4gbWFpbmxpbmluZ0BsaXN0cy5saW51eGZvdW5kYXRpb24ub3JnOyBsaW51eC1rZXJuZWxA
dmdlci5rZXJuZWwub3JnDQo+IFN1YmplY3Q6IFJlOiBbUEFUQ0ggdjEwIDEvNF0gZ2FkZ2V0OiBJ
bnRyb2R1Y2UgdGhlIHVzYiBjaGFyZ2VyIGZyYW1ld29yaw0KPiANCj4gSGkgSnVuLA0KPiANCj4g
T24gOCBBcHJpbCAyMDE2IGF0IDE2OjA0LCBKdW4gTGkgPGp1bi5saUBueHAuY29tPiB3cm90ZToN
Cj4gPiBIaSwgQmFvbGluDQo+ID4NCj4gPj4gKy8qDQo+ID4+ICsgKiB1c2JfY2hhcmdlcl9kZXRl
Y3RfdHlwZSgpIC0gZGV0ZWN0IHRoZSBjaGFyZ2VyIHR5cGUgbWFudWFsbHkuDQo+ID4+ICsgKiBA
dWNoZ2VyIC0gdXNiIGNoYXJnZXIgZGV2aWNlDQo+ID4+ICsgKg0KPiA+PiArICogTm90ZTogWW91
IHNob3VsZCBlbnN1cmUgeW91IG5lZWQgdG8gZGV0ZWN0IHRoZSBjaGFyZ2VyIHR5cGUNCj4gPj4g
K21hbnVhbGx5IG9uIHlvdXINCj4gPj4gKyAqIHBsYXRmb3JtLg0KPiA+PiArICogWW91IHNob3Vs
ZCBjYWxsIGl0IGF0IHRoZSByaWdodCBnYWRnZXQgc3RhdGUgdG8gYXZvaWQgYWZmZWN0aW5nDQo+
ID4+ICtnYWRnZXQNCj4gPj4gKyAqIGVudW1lcmF0aW9uLg0KPiA+PiArICovDQo+ID4+ICtpbnQg
dXNiX2NoYXJnZXJfZGV0ZWN0X3R5cGUoc3RydWN0IHVzYl9jaGFyZ2VyICp1Y2hnZXIpIHsNCj4g
Pj4gKyAgICAgZW51bSB1c2JfY2hhcmdlcl90eXBlIHR5cGU7DQo+ID4+ICsNCj4gPj4gKyAgICAg
aWYgKFdBUk4oIXVjaGdlci0+Y2hhcmdlcl9kZXRlY3QsDQo+ID4+ICsgICAgICAgICAgICAgICJj
aGFyZ2VyIGRldGVjdGlvbiBtZXRob2Qgc2hvdWxkIG5vdCBiZSBOVUxMIikpDQo+ID4+ICsgICAg
ICAgICAgICAgcmV0dXJuIC1FSU5WQUw7DQo+ID4+ICsNCj4gPj4gKyAgICAgdHlwZSA9IHVjaGdl
ci0+Y2hhcmdlcl9kZXRlY3QodWNoZ2VyKTsNCj4gPj4gKw0KPiA+PiArICAgICBtdXRleF9sb2Nr
KCZ1Y2hnZXItPmxvY2spOw0KPiA+PiArICAgICB1Y2hnZXItPnR5cGUgPSB0eXBlOw0KPiA+PiAr
ICAgICBtdXRleF91bmxvY2soJnVjaGdlci0+bG9jayk7DQo+ID4+ICsNCj4gPj4gKyAgICAgcmV0
dXJuIDA7DQo+ID4+ICt9DQo+ID4+ICtFWFBPUlRfU1lNQk9MX0dQTCh1c2JfY2hhcmdlcl9kZXRl
Y3RfdHlwZSk7DQo+ID4NCj4gPiBJIHN0aWxsIHJlY29tbWVuZCBoYXZlIGEgY2VudHJhbCBwbGFj
ZSB0byBjYWxsDQo+ID4gdXNiX2NoYXJnZXJfZGV0ZWN0X3R5cGUoKSB0byBjb3ZlciByZWFsIGNo
YXJnZXIgZGV0ZWN0aW9uIGluc3RlYWQgb2YNCj4gPiBsZWF2aW5nIHRoaXMgcXVlc3Rpb24gb3Bl
biB0byBkaWZmIHVzZXJzLiBUaGlzIGNhbiBiZSBkb25lIGFmdGVyDQo+ID4gdmJ1cy1vbiBpcyBk
ZXRlY3RlZCBhbmQgYmVmb3JlIGRvIGdhZGdldCBjb25uZWN0LiBJIGRvbid0IHRoaW5rIHRoaXMN
Cj4gd2lsbCBtYWtlIHlvdXIgZnJhbWV3b3JrIGNvbXBsaWNhdGVkLg0KPiANCj4gVGhpcyBBUEkg
aXMgdXNlZCBmb3IgZGV0ZWN0aW5nIHRoZSBjaGFyZ2VyIHR5cGUgbWFudWFsbHkgKHNvZnR3YXJl
IGNoYXJnZXINCj4gZGV0ZWN0aW9uKSwgc28gaWYgdXNlcidzIHVkYyBkcml2ZXIgaXMgbmVlZGVk
IHRvIGRvIHRoaXMsIHRoZW4gdGhleSBjYW4NCj4gaXNzdWUgaXQgYXQgdGhlaXIgcmlnaHQgcGxh
Y2UgdG8gbWFrZSBpdCBtb3JlIGZsZXhpYmxlLiBCdXQgbGV0IHVzIHNlZQ0KPiBvdGhlciBwZW9w
bGUncyBzdWdnZXN0aW9uLiBUaGFua3MuDQoNCk9rLCBhY3R1YWxseSB0aGlzIEFQSSBjYW4gYmUg
dXNlZCBmb3Igd2hhdCBldmVyIGNoYXJnZXIgZGV0ZWN0aW9uDQp0eXBlLCB1c2VyIGNhbiBpbXBs
ZW1lbnQgYW55IG1ldGhvZChtYW51YWwgZGV0ZWN0aW9uLCBkaXJlY3RseSByZWFkDQpyZXN1bHQg
ZnJvbSBzb21lIEhXLi4ud2hhdCBldmVyKSBpbiB1Y2hnZXItPmNoYXJnZXJfZGV0ZWN0KCksIHRh
cmdldCBpcw0KdG8gaGF2ZSB0aGUgY2hhcmdlciB0eXBlIGFuZCBzZXQgdWNoZ2VyLT50eXBlLCB0
aGVuIHlvdSBubyBuZWVkIHRvIGFkZCB0aGUgY29tbWVudHMvZGVzY3JpcHRpb24gdG8gbGltaXQg
aXQgdXNhZ2UuIEFsc28gSSBkbyBzZWUgdGhlcmUgaXMgcG9zc2libGUNCmNlbnRyYWwgcGxhY2Ug
dG8gZG8gdGhpcy4NCg0KPiANCj4gPg0KPiA+IEhpIEZlbGlwZSwgd2hhdCBkbyB5b3UgdGhpbmsg
b2YgdGhpcz8NCj4gPg0KPiA+IExpIEp1bg0KPiA+DQo+ID4+ICsNCj4gPj4gKy8qDQo+ID4+ICsg
KiB1c2JfY2hhcmdlcl9nZXRfdHlwZV9ieV9vdGhlcnMoKSAtIEdldCB0aGUgdXNiIGNoYXJnZXIg
dHlwZSBieQ0KPiA+PiArdGhlIGNhbGxiYWNrDQo+ID4+ICsgKiB3aGljaCBpcyBpbXBsZW1lbnRl
ZCBieSB1c2Vycy4NCj4gPj4gKyAqIEB1Y2hnZXIgLSB0aGUgdXNiIGNoYXJnZXIgZGV2aWNlLg0K
PiA+PiArICoNCj4gPj4gKyAqIE5vdGU6IFRoaXMgZnVuY3Rpb24gaXMganVzdCB1c2VkIGZvciBn
ZXR0aW5nIHRoZSBjaGFyZ2VyIHR5cGUsDQo+ID4+ICtub3QgZm9yDQo+ID4+ICsgKiBkZXRlY3Rp
bmcgY2hhcmdlciB0eXBlIHdoaWNoIG1pZ2h0IGFmZmVjdCB0aGUgRFAvRE0gbGluZSB3aGVuDQo+
ID4+ICtnYWRnZXQgaXMgb24NCj4gPj4gKyAqIGVudW1lcmF0aW9uIHN0YXRlLg0KPiA+PiArICov
DQo+ID4+ICtzdGF0aWMgZW51bSB1c2JfY2hhcmdlcl90eXBlDQo+ID4+ICt1c2JfY2hhcmdlcl9n
ZXRfdHlwZV9ieV9vdGhlcnMoc3RydWN0IHVzYl9jaGFyZ2VyICp1Y2hnZXIpIHsNCj4gPj4gKyAg
ICAgaWYgKHVjaGdlci0+dHlwZSAhPSBVTktOT1dOX1RZUEUpDQo+ID4+ICsgICAgICAgICAgICAg
cmV0dXJuIHVjaGdlci0+dHlwZTsNCj4gPj4gKw0KPiA+PiArICAgICBpZiAodWNoZ2VyLT5wc3kp
IHsNCj4gPj4gKyAgICAgICAgICAgICB1bmlvbiBwb3dlcl9zdXBwbHlfcHJvcHZhbCB2YWw7DQo+
ID4+ICsNCj4gPj4gKyAgICAgICAgICAgICBwb3dlcl9zdXBwbHlfZ2V0X3Byb3BlcnR5KHVjaGdl
ci0+cHN5LA0KPiA+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUE9X
RVJfU1VQUExZX1BST1BfQ0hBUkdFX1RZUEUsDQo+ID4+ICsgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAmdmFsKTsNCj4gPj4gKyAgICAgICAgICAgICBzd2l0Y2ggKHZhbC5p
bnR2YWwpIHsNCj4gPj4gKyAgICAgICAgICAgICBjYXNlIFBPV0VSX1NVUFBMWV9UWVBFX1VTQjoN
Cj4gPj4gKyAgICAgICAgICAgICAgICAgICAgIHVjaGdlci0+dHlwZSA9IFNEUF9UWVBFOw0KPiA+
PiArICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQo+ID4+ICsgICAgICAgICAgICAgY2FzZSBQ
T1dFUl9TVVBQTFlfVFlQRV9VU0JfRENQOg0KPiA+PiArICAgICAgICAgICAgICAgICAgICAgdWNo
Z2VyLT50eXBlID0gRENQX1RZUEU7DQo+ID4+ICsgICAgICAgICAgICAgICAgICAgICBicmVhazsN
Cj4gPj4gKyAgICAgICAgICAgICBjYXNlIFBPV0VSX1NVUFBMWV9UWVBFX1VTQl9DRFA6DQo+ID4+
ICsgICAgICAgICAgICAgICAgICAgICB1Y2hnZXItPnR5cGUgPSBDRFBfVFlQRTsNCj4gPj4gKyAg
ICAgICAgICAgICAgICAgICAgIGJyZWFrOw0KPiA+PiArICAgICAgICAgICAgIGNhc2UgUE9XRVJf
U1VQUExZX1RZUEVfVVNCX0FDQToNCj4gPj4gKyAgICAgICAgICAgICAgICAgICAgIHVjaGdlci0+
dHlwZSA9IEFDQV9UWVBFOw0KPiA+PiArICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQo+ID4+
ICsgICAgICAgICAgICAgZGVmYXVsdDoNCj4gPj4gKyAgICAgICAgICAgICAgICAgICAgIHVjaGdl
ci0+dHlwZSA9IFVOS05PV05fVFlQRTsNCj4gPj4gKyAgICAgICAgICAgICAgICAgICAgIGJyZWFr
Ow0KPiA+PiArICAgICAgICAgICAgIH0NCj4gPj4gKyAgICAgfSBlbHNlIGlmICh1Y2hnZXItPmdl
dF9jaGFyZ2VyX3R5cGUpIHsNCj4gPj4gKyAgICAgICAgICAgICB1Y2hnZXItPnR5cGUgPSB1Y2hn
ZXItPmdldF9jaGFyZ2VyX3R5cGUodWNoZ2VyKTsNCj4gPj4gKyAgICAgfSBlbHNlIHsNCj4gPj4g
KyAgICAgICAgICAgICB1Y2hnZXItPnR5cGUgPSBVTktOT1dOX1RZUEU7DQo+ID4+ICsgICAgIH0N
Cj4gPj4gKw0KPiA+PiArICAgICByZXR1cm4gdWNoZ2VyLT50eXBlOw0KPiA+PiArfQ0KPiA+PiAr
DQo+IA0KPiANCj4gDQo+IC0tDQo+IEJhb2xpbi53YW5nDQo+IEJlc3QgUmVnYXJkcw0K
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
(Exiting) Baolin Wang April 8, 2016, 11 a.m. UTC | #4
Hi Jun,

>> >> +/*
>> >> + * usb_charger_detect_type() - detect the charger type manually.
>> >> + * @uchger - usb charger device
>> >> + *
>> >> + * Note: You should ensure you need to detect the charger type
>> >> +manually on your
>> >> + * platform.
>> >> + * You should call it at the right gadget state to avoid affecting
>> >> +gadget
>> >> + * enumeration.
>> >> + */
>> >> +int usb_charger_detect_type(struct usb_charger *uchger) {
>> >> +     enum usb_charger_type type;
>> >> +
>> >> +     if (WARN(!uchger->charger_detect,
>> >> +              "charger detection method should not be NULL"))
>> >> +             return -EINVAL;
>> >> +
>> >> +     type = uchger->charger_detect(uchger);
>> >> +
>> >> +     mutex_lock(&uchger->lock);
>> >> +     uchger->type = type;
>> >> +     mutex_unlock(&uchger->lock);
>> >> +
>> >> +     return 0;
>> >> +}
>> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);
>> >
>> > I still recommend have a central place to call
>> > usb_charger_detect_type() to cover real charger detection instead of
>> > leaving this question open to diff users. This can be done after
>> > vbus-on is detected and before do gadget connect. I don't think this
>> will make your framework complicated.
>>
>> This API is used for detecting the charger type manually (software charger
>> detection), so if user's udc driver is needed to do this, then they can
>> issue it at their right place to make it more flexible. But let us see
>> other people's suggestion. Thanks.
>
> Ok, actually this API can be used for what ever charger detection
> type, user can implement any method(manual detection, directly read
> result from some HW...what ever) in uchger->charger_detect(), target is

But reading result from some HW dose not means *detect*, actually is
*get*. We can not mix them together with the different semantics.

> to have the charger type and set uchger->type, then you no need to add the comments/description to limit it usage. Also I do see there is possible
> central place to do this.
>
Jun Li April 8, 2016, 11:27 a.m. UTC | #5
> -----Original Message-----

> From: Baolin Wang [mailto:baolin.wang@linaro.org]

> Sent: Friday, April 08, 2016 7:00 PM

> To: Jun Li <jun.li@nxp.com>

> Cc: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;

> dbaryshkov@gmail.com; dwmw2@infradead.org; peter.chen@freescale.com;

> stern@rowland.harvard.edu; r.baldyga@samsung.com;

> yoshihiro.shimoda.uh@renesas.com; lee.jones@linaro.org; broonie@kernel.org;

> ckeepax@opensource.wolfsonmicro.com; patches@opensource.wolfsonmicro.com;

> linux-pm@vger.kernel.org; linux-usb@vger.kernel.org; device-

> mainlining@lists.linuxfoundation.org; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v10 1/4] gadget: Introduce the usb charger framework

> 

> Hi Jun,

> 

> >> >> +/*

> >> >> + * usb_charger_detect_type() - detect the charger type manually.

> >> >> + * @uchger - usb charger device

> >> >> + *

> >> >> + * Note: You should ensure you need to detect the charger type

> >> >> +manually on your

> >> >> + * platform.

> >> >> + * You should call it at the right gadget state to avoid

> >> >> +affecting gadget

> >> >> + * enumeration.

> >> >> + */

> >> >> +int usb_charger_detect_type(struct usb_charger *uchger) {

> >> >> +     enum usb_charger_type type;

> >> >> +

> >> >> +     if (WARN(!uchger->charger_detect,

> >> >> +              "charger detection method should not be NULL"))

> >> >> +             return -EINVAL;

> >> >> +

> >> >> +     type = uchger->charger_detect(uchger);

> >> >> +

> >> >> +     mutex_lock(&uchger->lock);

> >> >> +     uchger->type = type;

> >> >> +     mutex_unlock(&uchger->lock);

> >> >> +

> >> >> +     return 0;

> >> >> +}

> >> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);

> >> >

> >> > I still recommend have a central place to call

> >> > usb_charger_detect_type() to cover real charger detection instead

> >> > of leaving this question open to diff users. This can be done after

> >> > vbus-on is detected and before do gadget connect. I don't think

> >> > this

> >> will make your framework complicated.

> >>

> >> This API is used for detecting the charger type manually (software

> >> charger detection), so if user's udc driver is needed to do this,

> >> then they can issue it at their right place to make it more flexible.

> >> But let us see other people's suggestion. Thanks.

> >

> > Ok, actually this API can be used for what ever charger detection

> > type, user can implement any method(manual detection, directly read

> > result from some HW...what ever) in uchger->charger_detect(), target

> > is

> 

> But reading result from some HW dose not means *detect*, actually is *get*.

> We can not mix them together with the different semantics.


It doesn’t matter here, you already define the _get_ API for just read
the charger type from the saved value(uchger->type), so we can think
the API to make uchger->type from UNKNOW to ONE KNOWN type is *detect*,
because we don't need 2 separate API one for *get* type from HW and another
one for *detect* from HW, only one API involve HW access is enough.

- Detect: (write to and) read from HW to get the charger type,
  save to uchger->type;
- Get: read the charger type from uchger->type.
 
> 

> > to have the charger type and set uchger->type, then you no need to add

> > the comments/description to limit it usage. Also I do see there is

> possible central place to do this.

> >

> 

> --

> Baolin.wang

> Best Regards
(Exiting) Baolin Wang April 8, 2016, 11:51 a.m. UTC | #6
On 8 April 2016 at 19:27, Jun Li <jun.li@nxp.com> wrote:
>
>
>> -----Original Message-----
>> From: Baolin Wang [mailto:baolin.wang@linaro.org]
>> Sent: Friday, April 08, 2016 7:00 PM
>> To: Jun Li <jun.li@nxp.com>
>> Cc: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;
>> dbaryshkov@gmail.com; dwmw2@infradead.org; peter.chen@freescale.com;
>> stern@rowland.harvard.edu; r.baldyga@samsung.com;
>> yoshihiro.shimoda.uh@renesas.com; lee.jones@linaro.org; broonie@kernel.org;
>> ckeepax@opensource.wolfsonmicro.com; patches@opensource.wolfsonmicro.com;
>> linux-pm@vger.kernel.org; linux-usb@vger.kernel.org; device-
>> mainlining@lists.linuxfoundation.org; linux-kernel@vger.kernel.org
>> Subject: Re: [PATCH v10 1/4] gadget: Introduce the usb charger framework
>>
>> Hi Jun,
>>
>> >> >> +/*
>> >> >> + * usb_charger_detect_type() - detect the charger type manually.
>> >> >> + * @uchger - usb charger device
>> >> >> + *
>> >> >> + * Note: You should ensure you need to detect the charger type
>> >> >> +manually on your
>> >> >> + * platform.
>> >> >> + * You should call it at the right gadget state to avoid
>> >> >> +affecting gadget
>> >> >> + * enumeration.
>> >> >> + */
>> >> >> +int usb_charger_detect_type(struct usb_charger *uchger) {
>> >> >> +     enum usb_charger_type type;
>> >> >> +
>> >> >> +     if (WARN(!uchger->charger_detect,
>> >> >> +              "charger detection method should not be NULL"))
>> >> >> +             return -EINVAL;
>> >> >> +
>> >> >> +     type = uchger->charger_detect(uchger);
>> >> >> +
>> >> >> +     mutex_lock(&uchger->lock);
>> >> >> +     uchger->type = type;
>> >> >> +     mutex_unlock(&uchger->lock);
>> >> >> +
>> >> >> +     return 0;
>> >> >> +}
>> >> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);
>> >> >
>> >> > I still recommend have a central place to call
>> >> > usb_charger_detect_type() to cover real charger detection instead
>> >> > of leaving this question open to diff users. This can be done after
>> >> > vbus-on is detected and before do gadget connect. I don't think
>> >> > this
>> >> will make your framework complicated.
>> >>
>> >> This API is used for detecting the charger type manually (software
>> >> charger detection), so if user's udc driver is needed to do this,
>> >> then they can issue it at their right place to make it more flexible.
>> >> But let us see other people's suggestion. Thanks.
>> >
>> > Ok, actually this API can be used for what ever charger detection
>> > type, user can implement any method(manual detection, directly read
>> > result from some HW...what ever) in uchger->charger_detect(), target
>> > is
>>
>> But reading result from some HW dose not means *detect*, actually is *get*.
>> We can not mix them together with the different semantics.
>
> It doesn’t matter here, you already define the _get_ API for just read
> the charger type from the saved value(uchger->type), so we can think
> the API to make uchger->type from UNKNOW to ONE KNOWN type is *detect*,
> because we don't need 2 separate API one for *get* type from HW and another
> one for *detect* from HW, only one API involve HW access is enough.

But another issue is some users may need to get the charger type from
power supply by "power_supply_get_property()" function, we need to
integrate with the power supply things in the usb charger framework,
not user to implement that.

>
> - Detect: (write to and) read from HW to get the charger type,
>   save to uchger->type;
> - Get: read the charger type from uchger->type.
>
>>
>> > to have the charger type and set uchger->type, then you no need to add
>> > the comments/description to limit it usage. Also I do see there is
>> possible central place to do this.
>> >
>>
>> --
>> Baolin.wang
>> Best Regards
Jun Li April 11, 2016, 1:38 a.m. UTC | #7
Hi

> -----Original Message-----

> From: Baolin Wang [mailto:baolin.wang@linaro.org]

> Sent: Friday, April 08, 2016 7:51 PM

> To: Jun Li <jun.li@nxp.com>

> Cc: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;

> dbaryshkov@gmail.com; dwmw2@infradead.org; peter.chen@freescale.com;

> stern@rowland.harvard.edu; r.baldyga@samsung.com;

> yoshihiro.shimoda.uh@renesas.com; lee.jones@linaro.org; broonie@kernel.org;

> ckeepax@opensource.wolfsonmicro.com; patches@opensource.wolfsonmicro.com;

> linux-pm@vger.kernel.org; linux-usb@vger.kernel.org; device-

> mainlining@lists.linuxfoundation.org; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v10 1/4] gadget: Introduce the usb charger framework

> 

> On 8 April 2016 at 19:27, Jun Li <jun.li@nxp.com> wrote:

> >

> >

> >> -----Original Message-----

> >> From: Baolin Wang [mailto:baolin.wang@linaro.org]

> >> Sent: Friday, April 08, 2016 7:00 PM

> >> To: Jun Li <jun.li@nxp.com>

> >> Cc: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;

> >> dbaryshkov@gmail.com; dwmw2@infradead.org; peter.chen@freescale.com;

> >> stern@rowland.harvard.edu; r.baldyga@samsung.com;

> >> yoshihiro.shimoda.uh@renesas.com; lee.jones@linaro.org;

> >> broonie@kernel.org; ckeepax@opensource.wolfsonmicro.com;

> >> patches@opensource.wolfsonmicro.com;

> >> linux-pm@vger.kernel.org; linux-usb@vger.kernel.org; device-

> >> mainlining@lists.linuxfoundation.org; linux-kernel@vger.kernel.org

> >> Subject: Re: [PATCH v10 1/4] gadget: Introduce the usb charger

> >> framework

> >>

> >> Hi Jun,

> >>

> >> >> >> +/*

> >> >> >> + * usb_charger_detect_type() - detect the charger type manually.

> >> >> >> + * @uchger - usb charger device

> >> >> >> + *

> >> >> >> + * Note: You should ensure you need to detect the charger type

> >> >> >> +manually on your

> >> >> >> + * platform.

> >> >> >> + * You should call it at the right gadget state to avoid

> >> >> >> +affecting gadget

> >> >> >> + * enumeration.

> >> >> >> + */

> >> >> >> +int usb_charger_detect_type(struct usb_charger *uchger) {

> >> >> >> +     enum usb_charger_type type;

> >> >> >> +

> >> >> >> +     if (WARN(!uchger->charger_detect,

> >> >> >> +              "charger detection method should not be NULL"))

> >> >> >> +             return -EINVAL;

> >> >> >> +

> >> >> >> +     type = uchger->charger_detect(uchger);

> >> >> >> +

> >> >> >> +     mutex_lock(&uchger->lock);

> >> >> >> +     uchger->type = type;

> >> >> >> +     mutex_unlock(&uchger->lock);

> >> >> >> +

> >> >> >> +     return 0;

> >> >> >> +}

> >> >> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);

> >> >> >

> >> >> > I still recommend have a central place to call

> >> >> > usb_charger_detect_type() to cover real charger detection

> >> >> > instead of leaving this question open to diff users. This can be

> >> >> > done after vbus-on is detected and before do gadget connect. I

> >> >> > don't think this

> >> >> will make your framework complicated.

> >> >>

> >> >> This API is used for detecting the charger type manually (software

> >> >> charger detection), so if user's udc driver is needed to do this,

> >> >> then they can issue it at their right place to make it more flexible.

> >> >> But let us see other people's suggestion. Thanks.

> >> >

> >> > Ok, actually this API can be used for what ever charger detection

> >> > type, user can implement any method(manual detection, directly read

> >> > result from some HW...what ever) in uchger->charger_detect(),

> >> > target is

> >>

> >> But reading result from some HW dose not means *detect*, actually is

> *get*.

> >> We can not mix them together with the different semantics.

> >

> > It doesn’t matter here, you already define the _get_ API for just read

> > the charger type from the saved value(uchger->type), so we can think

> > the API to make uchger->type from UNKNOW to ONE KNOWN type is

> > *detect*, because we don't need 2 separate API one for *get* type from

> > HW and another one for *detect* from HW, only one API involve HW access

> is enough.

> 

> But another issue is some users may need to get the charger type from

> power supply by "power_supply_get_property()" function, we need to

> integrate with the power supply things in the usb charger framework, not

> user to implement that.


Why this user(your case) can't put the charger type get by
"power_supply_get_property()" in its uchger->charger_detect(),
any special reason prevent you doing it? I am not sure if this
case is very common, even if it is, you also can put it in
usb_charger_detect_type()

usb_charger_detect_type()
{
	If can get from power_supply_get_property()
		...
	else if uchger->charger_detect
		uchger->charger_detect();
	...
}

I don't know if most design of usb charger detection now days
is as easy as your PMIC for software(HW does the whole detection
process and prevent the vbus generation until detection has completed),
anyway if your framework can guarantee the detection process finished
before gadget connect, then each user don't have to worry about the
HW detection process details and seek a proper place to do it.
 
Li Jun
> 

> >

> > - Detect: (write to and) read from HW to get the charger type,

> >   save to uchger->type;

> > - Get: read the charger type from uchger->type.

> >

> >>

> >> > to have the charger type and set uchger->type, then you no need to

> >> > add the comments/description to limit it usage. Also I do see there

> >> > is

> >> possible central place to do this.

> >> >

> >>

> >> --

> >> Baolin.wang

> >> Best Regards

> 

> 

> 

> --

> Baolin.wang

> Best Regards
(Exiting) Baolin Wang April 11, 2016, 11:15 a.m. UTC | #8
Hi Jun,

Sorry for late reply.

>> >> >> >> +/*
>> >> >> >> + * usb_charger_detect_type() - detect the charger type manually.
>> >> >> >> + * @uchger - usb charger device
>> >> >> >> + *
>> >> >> >> + * Note: You should ensure you need to detect the charger type
>> >> >> >> +manually on your
>> >> >> >> + * platform.
>> >> >> >> + * You should call it at the right gadget state to avoid
>> >> >> >> +affecting gadget
>> >> >> >> + * enumeration.
>> >> >> >> + */
>> >> >> >> +int usb_charger_detect_type(struct usb_charger *uchger) {
>> >> >> >> +     enum usb_charger_type type;
>> >> >> >> +
>> >> >> >> +     if (WARN(!uchger->charger_detect,
>> >> >> >> +              "charger detection method should not be NULL"))
>> >> >> >> +             return -EINVAL;
>> >> >> >> +
>> >> >> >> +     type = uchger->charger_detect(uchger);
>> >> >> >> +
>> >> >> >> +     mutex_lock(&uchger->lock);
>> >> >> >> +     uchger->type = type;
>> >> >> >> +     mutex_unlock(&uchger->lock);
>> >> >> >> +
>> >> >> >> +     return 0;
>> >> >> >> +}
>> >> >> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);
>> >> >> >
>> >> >> > I still recommend have a central place to call
>> >> >> > usb_charger_detect_type() to cover real charger detection
>> >> >> > instead of leaving this question open to diff users. This can be
>> >> >> > done after vbus-on is detected and before do gadget connect. I
>> >> >> > don't think this
>> >> >> will make your framework complicated.
>> >> >>
>> >> >> This API is used for detecting the charger type manually (software
>> >> >> charger detection), so if user's udc driver is needed to do this,
>> >> >> then they can issue it at their right place to make it more flexible.
>> >> >> But let us see other people's suggestion. Thanks.
>> >> >
>> >> > Ok, actually this API can be used for what ever charger detection
>> >> > type, user can implement any method(manual detection, directly read
>> >> > result from some HW...what ever) in uchger->charger_detect(),
>> >> > target is
>> >>
>> >> But reading result from some HW dose not means *detect*, actually is
>> *get*.
>> >> We can not mix them together with the different semantics.
>> >
>> > It doesn’t matter here, you already define the _get_ API for just read
>> > the charger type from the saved value(uchger->type), so we can think
>> > the API to make uchger->type from UNKNOW to ONE KNOWN type is
>> > *detect*, because we don't need 2 separate API one for *get* type from
>> > HW and another one for *detect* from HW, only one API involve HW access
>> is enough.
>>
>> But another issue is some users may need to get the charger type from
>> power supply by "power_supply_get_property()" function, we need to
>> integrate with the power supply things in the usb charger framework, not
>> user to implement that.
>
> Why this user(your case) can't put the charger type get by
> "power_supply_get_property()" in its uchger->charger_detect(),
> any special reason prevent you doing it? I am not sure if this
> case is very common, even if it is, you also can put it in
> usb_charger_detect_type()
>
> usb_charger_detect_type()
> {
>         If can get from power_supply_get_property()
>                 ...
>         else if uchger->charger_detect
>                 uchger->charger_detect();
>         ...
> }

If user want to implement above method, they need to get the
'power_supply' structure to do this action, which maybe can not get in
some contexts. So we need to integrate with the power supply things to
avoid this situation. IIRC, Felipe suggested me to flesh out the
charger getting method.

Hi Felipe, what do you think of Jun's suggestion? Thanks.

>
> I don't know if most design of usb charger detection now days
> is as easy as your PMIC for software(HW does the whole detection
> process and prevent the vbus generation until detection has completed),
> anyway if your framework can guarantee the detection process finished
> before gadget connect, then each user don't have to worry about the
> HW detection process details and seek a proper place to do it.
>
> Li Jun
>>
>> >
>> > - Detect: (write to and) read from HW to get the charger type,
>> >   save to uchger->type;
>> > - Get: read the charger type from uchger->type.
>> >
>> >>
>> >> > to have the charger type and set uchger->type, then you no need to
>> >> > add the comments/description to limit it usage. Also I do see there
>> >> > is
>> >> possible central place to do this.
>> >> >
>> >>
>> >> --
>> >> Baolin.wang
>> >> Best Regards
>>
>>
>>
>> --
>> Baolin.wang
>> Best Regards
Jun Li April 18, 2016, 8:27 a.m. UTC | #9
Hi

> -----Original Message-----

> From: Baolin Wang [mailto:baolin.wang@linaro.org]

> Sent: Monday, April 11, 2016 7:15 PM

> To: Jun Li <jun.li@nxp.com>

> Cc: balbi@kernel.org; gregkh@linuxfoundation.org; sre@kernel.org;

> dbaryshkov@gmail.com; dwmw2@infradead.org; peter.chen@freescale.com;

> stern@rowland.harvard.edu; r.baldyga@samsung.com;

> yoshihiro.shimoda.uh@renesas.com; lee.jones@linaro.org; broonie@kernel.org;

> ckeepax@opensource.wolfsonmicro.com; patches@opensource.wolfsonmicro.com;

> linux-pm@vger.kernel.org; linux-usb@vger.kernel.org; device-

> mainlining@lists.linuxfoundation.org; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v10 1/4] gadget: Introduce the usb charger framework

> 

> Hi Jun,

> 

> Sorry for late reply.

> 

> >> >> >> >> +/*

> >> >> >> >> + * usb_charger_detect_type() - detect the charger type

> manually.

> >> >> >> >> + * @uchger - usb charger device

> >> >> >> >> + *

> >> >> >> >> + * Note: You should ensure you need to detect the charger

> >> >> >> >> +type manually on your

> >> >> >> >> + * platform.

> >> >> >> >> + * You should call it at the right gadget state to avoid

> >> >> >> >> +affecting gadget

> >> >> >> >> + * enumeration.

> >> >> >> >> + */

> >> >> >> >> +int usb_charger_detect_type(struct usb_charger *uchger) {

> >> >> >> >> +     enum usb_charger_type type;

> >> >> >> >> +

> >> >> >> >> +     if (WARN(!uchger->charger_detect,

> >> >> >> >> +              "charger detection method should not be NULL"))

> >> >> >> >> +             return -EINVAL;

> >> >> >> >> +

> >> >> >> >> +     type = uchger->charger_detect(uchger);

> >> >> >> >> +

> >> >> >> >> +     mutex_lock(&uchger->lock);

> >> >> >> >> +     uchger->type = type;

> >> >> >> >> +     mutex_unlock(&uchger->lock);

> >> >> >> >> +

> >> >> >> >> +     return 0;

> >> >> >> >> +}

> >> >> >> >> +EXPORT_SYMBOL_GPL(usb_charger_detect_type);

> >> >> >> >

> >> >> >> > I still recommend have a central place to call

> >> >> >> > usb_charger_detect_type() to cover real charger detection

> >> >> >> > instead of leaving this question open to diff users. This can

> >> >> >> > be done after vbus-on is detected and before do gadget

> >> >> >> > connect. I don't think this

> >> >> >> will make your framework complicated.

> >> >> >>

> >> >> >> This API is used for detecting the charger type manually

> >> >> >> (software charger detection), so if user's udc driver is needed

> >> >> >> to do this, then they can issue it at their right place to make

> it more flexible.

> >> >> >> But let us see other people's suggestion. Thanks.

> >> >> >

> >> >> > Ok, actually this API can be used for what ever charger

> >> >> > detection type, user can implement any method(manual detection,

> >> >> > directly read result from some HW...what ever) in

> >> >> > uchger->charger_detect(), target is

> >> >>

> >> >> But reading result from some HW dose not means *detect*, actually

> >> >> is

> >> *get*.

> >> >> We can not mix them together with the different semantics.

> >> >

> >> > It doesn’t matter here, you already define the _get_ API for just

> >> > read the charger type from the saved value(uchger->type), so we can

> >> > think the API to make uchger->type from UNKNOW to ONE KNOWN type is

> >> > *detect*, because we don't need 2 separate API one for *get* type

> >> > from HW and another one for *detect* from HW, only one API involve

> >> > HW access

> >> is enough.

> >>

> >> But another issue is some users may need to get the charger type from

> >> power supply by "power_supply_get_property()" function, we need to

> >> integrate with the power supply things in the usb charger framework,

> >> not user to implement that.

> >

> > Why this user(your case) can't put the charger type get by

> > "power_supply_get_property()" in its uchger->charger_detect(), any

> > special reason prevent you doing it? I am not sure if this case is

> > very common, even if it is, you also can put it in

> > usb_charger_detect_type()

> >

> > usb_charger_detect_type()

> > {

> >         If can get from power_supply_get_property()

> >                 ...

> >         else if uchger->charger_detect

> >                 uchger->charger_detect();

> >         ...

> > }

> 

> If user want to implement above method, they need to get the

> 'power_supply' structure to do this action, which maybe can not get in

> some contexts. So we need to integrate with the power supply things to

> avoid this situation. IIRC, Felipe suggested me to flesh out the charger

> getting method.

> 


Okay, then I agree with you to let user do that with more flexibility,
I tried to enable usb charger detection on one NXP i.mx platform based on
this framework, works fine, thanks!
 
Li Jun
> Hi Felipe, what do you think of Jun's suggestion? Thanks.

> 

> >

> > I don't know if most design of usb charger detection now days is as

> > easy as your PMIC for software(HW does the whole detection process and

> > prevent the vbus generation until detection has completed), anyway if

> > your framework can guarantee the detection process finished before

> > gadget connect, then each user don't have to worry about the HW

> > detection process details and seek a proper place to do it.

> >

> > Li Jun

> >>

> >> >

> >> > - Detect: (write to and) read from HW to get the charger type,

> >> >   save to uchger->type;

> >> > - Get: read the charger type from uchger->type.

> >> >

> >> >>

> >> >> > to have the charger type and set uchger->type, then you no need

> >> >> > to add the comments/description to limit it usage. Also I do see

> >> >> > there is

> >> >> possible central place to do this.

> >> >> >

> >> >>

> >> >> --

> >> >> Baolin.wang

> >> >> Best Regards

> >>

> >>

> >>

> >> --

> >> Baolin.wang

> >> Best Regards

> 

> 

> 

> --

> Baolin.wang

> Best Regards
(Exiting) Baolin Wang April 18, 2016, 8:57 a.m. UTC | #10
Hi Jun,

On 18 April 2016 at 16:27, Jun Li <jun.li@nxp.com> wrote:
>> >>
>> >> But another issue is some users may need to get the charger type from
>> >> power supply by "power_supply_get_property()" function, we need to
>> >> integrate with the power supply things in the usb charger framework,
>> >> not user to implement that.
>> >
>> > Why this user(your case) can't put the charger type get by
>> > "power_supply_get_property()" in its uchger->charger_detect(), any
>> > special reason prevent you doing it? I am not sure if this case is
>> > very common, even if it is, you also can put it in
>> > usb_charger_detect_type()
>> >
>> > usb_charger_detect_type()
>> > {
>> >         If can get from power_supply_get_property()
>> >                 ...
>> >         else if uchger->charger_detect
>> >                 uchger->charger_detect();
>> >         ...
>> > }
>>
>> If user want to implement above method, they need to get the
>> 'power_supply' structure to do this action, which maybe can not get in
>> some contexts. So we need to integrate with the power supply things to
>> avoid this situation. IIRC, Felipe suggested me to flesh out the charger
>> getting method.
>>
>
> Okay, then I agree with you to let user do that with more flexibility,
> I tried to enable usb charger detection on one NXP i.mx platform based on
> this framework, works fine, thanks!

That's great. Thanks.
diff mbox

Patch

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index af5d922..82a5b3c 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -133,6 +133,13 @@  config U_SERIAL_CONSOLE
 	help
 	   It supports the serial gadget can be used as a console.
 
+config USB_CHARGER
+	bool "USB charger support"
+	help
+	  The usb charger driver based on the usb gadget that makes an
+	  enhancement to a power driver which can set the current limitation
+	  when the usb charger is added or removed.
+
 source "drivers/usb/gadget/udc/Kconfig"
 
 #
diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile
index dfee534..0e9564c 100644
--- a/drivers/usb/gadget/udc/Makefile
+++ b/drivers/usb/gadget/udc/Makefile
@@ -2,6 +2,7 @@ 
 # USB peripheral controller drivers
 #
 obj-$(CONFIG_USB_GADGET)	+= udc-core.o
+obj-$(CONFIG_USB_CHARGER)	+= charger.o
 obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o
 obj-$(CONFIG_USB_NET2272)	+= net2272.o
 obj-$(CONFIG_USB_NET2280)	+= net2280.o
diff --git a/drivers/usb/gadget/udc/charger.c b/drivers/usb/gadget/udc/charger.c
new file mode 100644
index 0000000..e24cb0a
--- /dev/null
+++ b/drivers/usb/gadget/udc/charger.c
@@ -0,0 +1,729 @@ 
+/*
+ * charger.c -- USB charger driver
+ *
+ * Copyright (C) 2015 Linaro Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/extcon.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/charger.h>
+#include <linux/power_supply.h>
+
+#define DEFAULT_SDP_CUR_LIMIT		500
+#define DEFAULT_SDP_CUR_LIMIT_SS	900
+#define DEFAULT_DCP_CUR_LIMIT		1500
+#define DEFAULT_CDP_CUR_LIMIT		1500
+#define DEFAULT_ACA_CUR_LIMIT		1500
+
+static DEFINE_IDA(usb_charger_ida);
+struct class *usb_charger_class;
+static unsigned int usb_charger_get_cur_limit(struct usb_charger *uchger);
+
+static struct usb_charger *dev_to_uchger(struct device *dev)
+{
+	return container_of(dev, struct usb_charger, dev);
+}
+
+/*
+ * charger_current_show() - Show the charger current limit.
+ */
+static ssize_t charger_current_show(struct device *dev,
+				struct device_attribute *attr,
+				char *buf)
+{
+	struct usb_charger *uchger = dev_to_uchger(dev);
+
+	return sprintf(buf, "%u\n", usb_charger_get_cur_limit(uchger));
+}
+static DEVICE_ATTR_RO(charger_current);
+
+/*
+ * charger_type_show() - Show the charger type.
+ *
+ * It can be SDP/DCP/CDP/ACA type, else for unknown type.
+ */
+static ssize_t charger_type_show(struct device *dev,
+				 struct device_attribute *attr,
+				 char *buf)
+{
+	struct usb_charger *uchger = dev_to_uchger(dev);
+	int cnt;
+
+	switch (uchger->type) {
+	case SDP_TYPE:
+		cnt = sprintf(buf, "%s\n", "SDP");
+		break;
+	case DCP_TYPE:
+		cnt = sprintf(buf, "%s\n", "DCP");
+		break;
+	case CDP_TYPE:
+		cnt = sprintf(buf, "%s\n", "CDP");
+		break;
+	case ACA_TYPE:
+		cnt = sprintf(buf, "%s\n", "ACA");
+		break;
+	default:
+		cnt = sprintf(buf, "%s\n", "UNKNOWN");
+		break;
+	}
+
+	return cnt;
+}
+static DEVICE_ATTR_RO(charger_type);
+
+/*
+ * charger_state_show() - Show the charger state.
+ *
+ * Charger state can be present or removed.
+ */
+static ssize_t charger_state_show(struct device *dev,
+				  struct device_attribute *attr,
+				  char *buf)
+{
+	struct usb_charger *uchger = dev_to_uchger(dev);
+	int cnt;
+
+	switch (uchger->state) {
+	case USB_CHARGER_PRESENT:
+		cnt = sprintf(buf, "%s\n", "PRESENT");
+		break;
+	case USB_CHARGER_REMOVE:
+		cnt = sprintf(buf, "%s\n", "REMOVE");
+		break;
+	default:
+		cnt = sprintf(buf, "%s\n", "UNKNOWN");
+		break;
+	}
+
+	return cnt;
+}
+static DEVICE_ATTR_RO(charger_state);
+
+static struct attribute *usb_charger_attrs[] = {
+	&dev_attr_charger_current.attr,
+	&dev_attr_charger_type.attr,
+	&dev_attr_charger_state.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(usb_charger);
+
+/*
+ * usb_charger_find_by_name() - Get the usb charger device by name.
+ * @name - usb charger device name.
+ *
+ * return the instance of usb charger device, the device must be
+ * released with usb_charger_put().
+ */
+struct usb_charger *usb_charger_find_by_name(const char *name)
+{
+	struct class_dev_iter iter;
+	struct device *dev;
+
+	if (WARN(!name, "can't work with NULL name"))
+		return ERR_PTR(-EINVAL);
+
+	/* Iterate all usb charger devices in the class */
+	class_dev_iter_init(&iter, usb_charger_class, NULL, NULL);
+	while ((dev = class_dev_iter_next(&iter))) {
+		if (!strcmp(dev_name(dev), name))
+			break;
+	}
+	class_dev_iter_exit(&iter);
+
+	if (WARN(!dev, "can't find usb charger device"))
+		return ERR_PTR(-ENODEV);
+
+	return dev_to_uchger(dev);
+}
+EXPORT_SYMBOL_GPL(usb_charger_find_by_name);
+
+/*
+ * usb_charger_get() - Reference a usb charger.
+ * @uchger - usb charger
+ */
+struct usb_charger *usb_charger_get(struct usb_charger *uchger)
+{
+	return (uchger && get_device(&uchger->dev)) ? uchger : NULL;
+}
+EXPORT_SYMBOL_GPL(usb_charger_get);
+
+/*
+ * usb_charger_put() - Dereference a usb charger.
+ * @uchger - charger to release
+ */
+void usb_charger_put(struct usb_charger *uchger)
+{
+	if (uchger)
+		put_device(&uchger->dev);
+}
+EXPORT_SYMBOL_GPL(usb_charger_put);
+
+/*
+ * usb_charger_get_type() - get the usb charger type with lock protection.
+ * @uchger - usb charger device
+ *
+ * Users can get the charger type by this safe API, rather than using the
+ * usb_charger structure directly.
+ */
+enum usb_charger_type usb_charger_get_type(struct usb_charger *uchger)
+{
+	enum usb_charger_type type;
+
+	mutex_lock(&uchger->lock);
+	type = uchger->type;
+	mutex_unlock(&uchger->lock);
+
+	return type;
+}
+EXPORT_SYMBOL_GPL(usb_charger_get_type);
+
+/*
+ * usb_charger_detect_type() - detect the charger type manually.
+ * @uchger - usb charger device
+ *
+ * Note: You should ensure you need to detect the charger type manually on your
+ * platform.
+ * You should call it at the right gadget state to avoid affecting gadget
+ * enumeration.
+ */
+int usb_charger_detect_type(struct usb_charger *uchger)
+{
+	enum usb_charger_type type;
+
+	if (WARN(!uchger->charger_detect,
+		 "charger detection method should not be NULL"))
+		return -EINVAL;
+
+	type = uchger->charger_detect(uchger);
+
+	mutex_lock(&uchger->lock);
+	uchger->type = type;
+	mutex_unlock(&uchger->lock);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(usb_charger_detect_type);
+
+/*
+ * usb_charger_get_type_by_others() - Get the usb charger type by the callback
+ * which is implemented by users.
+ * @uchger - the usb charger device.
+ *
+ * Note: This function is just used for getting the charger type, not for
+ * detecting charger type which might affect the DP/DM line when gadget is on
+ * enumeration state.
+ */
+static enum usb_charger_type
+usb_charger_get_type_by_others(struct usb_charger *uchger)
+{
+	if (uchger->type != UNKNOWN_TYPE)
+		return uchger->type;
+
+	if (uchger->psy) {
+		union power_supply_propval val;
+
+		power_supply_get_property(uchger->psy,
+					  POWER_SUPPLY_PROP_CHARGE_TYPE,
+					  &val);
+		switch (val.intval) {
+		case POWER_SUPPLY_TYPE_USB:
+			uchger->type = SDP_TYPE;
+			break;
+		case POWER_SUPPLY_TYPE_USB_DCP:
+			uchger->type = DCP_TYPE;
+			break;
+		case POWER_SUPPLY_TYPE_USB_CDP:
+			uchger->type = CDP_TYPE;
+			break;
+		case POWER_SUPPLY_TYPE_USB_ACA:
+			uchger->type = ACA_TYPE;
+			break;
+		default:
+			uchger->type = UNKNOWN_TYPE;
+			break;
+		}
+	} else if (uchger->get_charger_type) {
+		uchger->type = uchger->get_charger_type(uchger);
+	} else {
+		uchger->type = UNKNOWN_TYPE;
+	}
+
+	return uchger->type;
+}
+
+/*
+ * usb_charger_set_cur_limit_by_type() - Set the current limitation
+ * by charger type.
+ * @uchger - the usb charger device.
+ * @type - the usb charger type.
+ * @cur_limit - the current limitation.
+ */
+int usb_charger_set_cur_limit_by_type(struct usb_charger *uchger,
+				      enum usb_charger_type type,
+				      unsigned int cur_limit)
+{
+	if (WARN(!uchger, "charger can not be NULL"))
+		return -EINVAL;
+
+	mutex_lock(&uchger->lock);
+	switch (type) {
+	case SDP_TYPE:
+		uchger->cur_limit.sdp_cur_limit = cur_limit;
+		uchger->sdp_default_cur_change = 1;
+		break;
+	case DCP_TYPE:
+		uchger->cur_limit.dcp_cur_limit = cur_limit;
+		break;
+	case CDP_TYPE:
+		uchger->cur_limit.cdp_cur_limit	= cur_limit;
+		break;
+	case ACA_TYPE:
+		uchger->cur_limit.aca_cur_limit	= cur_limit;
+		break;
+	default:
+		mutex_unlock(&uchger->lock);
+		return -EINVAL;
+	}
+
+	mutex_unlock(&uchger->lock);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(usb_charger_set_cur_limit_by_type);
+
+/*
+ * usb_charger_set_cur_limit() - Set the current limitation.
+ * @uchger - the usb charger device.
+ * @cur_limit_set - the current limitation.
+ */
+int usb_charger_set_cur_limit(struct usb_charger *uchger,
+			      struct usb_charger_cur_limit *cur_limit_set)
+{
+	if (WARN(!uchger || !cur_limit_set, "charger or setting can't be NULL"))
+		return -EINVAL;
+
+	mutex_lock(&uchger->lock);
+	uchger->cur_limit.sdp_cur_limit = cur_limit_set->sdp_cur_limit;
+	uchger->cur_limit.dcp_cur_limit = cur_limit_set->dcp_cur_limit;
+	uchger->cur_limit.cdp_cur_limit = cur_limit_set->cdp_cur_limit;
+	uchger->cur_limit.aca_cur_limit = cur_limit_set->aca_cur_limit;
+	uchger->sdp_default_cur_change = 1;
+	mutex_unlock(&uchger->lock);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(usb_charger_set_cur_limit);
+
+/*
+ * usb_charger_get_cur_limit() - Get the current limitation by
+ * different usb charger type.
+ * @uchger - the usb charger device.
+ *
+ * return the current limitation to set.
+ */
+static unsigned int
+usb_charger_get_cur_limit(struct usb_charger *uchger)
+{
+	enum usb_charger_type uchger_type =
+		usb_charger_get_type_by_others(uchger);
+	unsigned int cur_limit;
+
+	switch (uchger_type) {
+	case SDP_TYPE:
+		/*
+		 * For super speed gadget, the default charger current should
+		 * be 900 mA.
+		 */
+		if (!uchger->sdp_default_cur_change && uchger->gadget &&
+		    uchger->gadget->speed >= USB_SPEED_SUPER) {
+			uchger->cur_limit.sdp_cur_limit =
+				DEFAULT_SDP_CUR_LIMIT_SS;
+
+			uchger->sdp_default_cur_change = 1;
+		}
+
+		cur_limit = uchger->cur_limit.sdp_cur_limit;
+		break;
+	case DCP_TYPE:
+		cur_limit = uchger->cur_limit.dcp_cur_limit;
+		break;
+	case CDP_TYPE:
+		cur_limit = uchger->cur_limit.cdp_cur_limit;
+		break;
+	case ACA_TYPE:
+		cur_limit = uchger->cur_limit.aca_cur_limit;
+		break;
+	default:
+		return 0;
+	}
+
+	return cur_limit;
+}
+
+/*
+ * usb_charger_get_current() - Get the charger current with lock protection.
+ * @uchger - the usb charger device.
+ *
+ * Users should get the charger current by this safe API.
+ */
+unsigned int usb_charger_get_current(struct usb_charger *uchger)
+{
+	unsigned int cur;
+
+	mutex_lock(&uchger->lock);
+	cur = usb_charger_get_cur_limit(uchger);
+	mutex_unlock(&uchger->lock);
+
+	return cur;
+}
+EXPORT_SYMBOL_GPL(usb_charger_get_current);
+
+/*
+ * usb_charger_register_notify() - Register a notifiee to get notified by
+ * any attach status changes from the usb charger detection.
+ * @uchger - the usb charger device which is monitored.
+ * @nb - a notifier block to be registered.
+ */
+int usb_charger_register_notify(struct usb_charger *uchger,
+				struct notifier_block *nb)
+{
+	int ret;
+
+	if (WARN(!uchger || !nb, "charger or nb can not be NULL"))
+		return -EINVAL;
+
+	mutex_lock(&uchger->lock);
+	ret = raw_notifier_chain_register(&uchger->uchger_nh, nb);
+
+	/* Generate an initial notify so users start in the right state */
+	if (!ret) {
+		usb_charger_get_type_by_others(uchger);
+		raw_notifier_call_chain(&uchger->uchger_nh,
+					usb_charger_get_cur_limit(uchger),
+					uchger);
+	}
+	mutex_unlock(&uchger->lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_charger_register_notify);
+
+/*
+ * usb_charger_unregister_notify() - Unregister a notifiee from the usb charger.
+ * @uchger - the usb charger device which is monitored.
+ * @nb - a notifier block to be unregistered.
+ */
+int usb_charger_unregister_notify(struct usb_charger *uchger,
+				  struct notifier_block *nb)
+{
+	int ret;
+
+	if (WARN(!uchger || !nb, "charger or nb can not be NULL"))
+		return -EINVAL;
+
+	mutex_lock(&uchger->lock);
+	ret = raw_notifier_chain_unregister(&uchger->uchger_nh, nb);
+	mutex_unlock(&uchger->lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_charger_unregister_notify);
+
+/*
+ * usb_charger_notifier_others() - It will notify other device registered
+ * on usb charger when the usb charger state is changed.
+ * @uchger - the usb charger device.
+ * @state - the state of the usb charger.
+ */
+static void
+usb_charger_notify_others(struct usb_charger *uchger,
+			  enum usb_charger_state state)
+{
+	char uchger_state[50] = { 0 };
+	char *envp[] = { uchger_state, NULL };
+
+	mutex_lock(&uchger->lock);
+	uchger->state = state;
+
+	switch (state) {
+	case USB_CHARGER_PRESENT:
+		usb_charger_get_type_by_others(uchger);
+		raw_notifier_call_chain(&uchger->uchger_nh,
+			usb_charger_get_cur_limit(uchger),
+			uchger);
+		snprintf(uchger_state, ARRAY_SIZE(uchger_state),
+			 "USB_CHARGER_STATE=%s", "USB_CHARGER_PRESENT");
+		break;
+	case USB_CHARGER_REMOVE:
+		uchger->type = UNKNOWN_TYPE;
+		raw_notifier_call_chain(&uchger->uchger_nh, 0, uchger);
+		snprintf(uchger_state, ARRAY_SIZE(uchger_state),
+			 "USB_CHARGER_STATE=%s", "USB_CHARGER_REMOVE");
+		break;
+	default:
+		dev_warn(&uchger->dev, "Unknown USB charger state: %d\n",
+			 state);
+		mutex_unlock(&uchger->lock);
+		return;
+	}
+
+	kobject_uevent_env(&uchger->dev.kobj, KOBJ_CHANGE, envp);
+	mutex_unlock(&uchger->lock);
+}
+
+/*
+ * usb_charger_plug_by_extcon() - The notifier call function which is registered
+ * on the extcon device.
+ * @nb - the notifier block that notified by extcon device.
+ * @state - the extcon device state.
+ * @data - here specify a extcon device.
+ *
+ * return the notify flag.
+ */
+static int
+usb_charger_plug_by_extcon(struct notifier_block *nb,
+			   unsigned long state, void *data)
+{
+	struct usb_charger_nb *extcon_nb =
+		container_of(nb, struct usb_charger_nb, nb);
+	struct usb_charger *uchger = extcon_nb->uchger;
+	enum usb_charger_state uchger_state;
+
+	if (WARN(!uchger, "charger can not be NULL"))
+		return NOTIFY_BAD;
+
+	/*
+	 * Report event to power to setting the current limitation
+	 * for this usb charger when one usb charger is added or removed
+	 * with detecting by extcon device.
+	 */
+	if (state)
+		uchger_state = USB_CHARGER_PRESENT;
+	else
+		uchger_state = USB_CHARGER_REMOVE;
+
+	usb_charger_notify_others(uchger, uchger_state);
+
+	return NOTIFY_OK;
+}
+
+/*
+ * usb_charger_plug_by_gadget() - Set the usb charger current limitation
+ * according to the usb gadget device state.
+ * @gadget - the usb gadget device.
+ * @state - the usb gadget state.
+ */
+int usb_charger_plug_by_gadget(struct usb_gadget *gadget,
+			       unsigned long state)
+{
+	return 0;
+}
+EXPORT_SYMBOL_GPL(usb_charger_plug_by_gadget);
+
+static int devm_uchger_dev_match(struct device *dev, void *res, void *data)
+{
+	struct usb_charger **r = res;
+
+	if (WARN_ON(!r || !*r))
+		return 0;
+
+	return *r == data;
+}
+
+static void usb_charger_release(struct device *dev)
+{
+	struct usb_charger *uchger = dev_get_drvdata(dev);
+
+	kfree(uchger);
+}
+
+/*
+ * usb_charger_unregister() - Unregister a usb charger device.
+ * @uchger - the usb charger to be unregistered.
+ */
+static int usb_charger_unregister(struct usb_charger *uchger)
+{
+	if (WARN(!uchger, "charger can not be NULL"))
+		return -EINVAL;
+
+	device_unregister(&uchger->dev);
+	return 0;
+}
+
+static void devm_uchger_dev_unreg(struct device *dev, void *res)
+{
+	usb_charger_unregister(*(struct usb_charger **)res);
+}
+
+void devm_usb_charger_unregister(struct device *dev,
+				 struct usb_charger *uchger)
+{
+	devres_release(dev, devm_uchger_dev_unreg,
+		       devm_uchger_dev_match, uchger);
+}
+EXPORT_SYMBOL_GPL(devm_usb_charger_unregister);
+
+/*
+ * usb_charger_register() - Register a new usb charger device
+ * which is created by the usb charger framework.
+ * @parent - the parent device of the new usb charger.
+ * @uchger - the new usb charger device.
+ */
+static int usb_charger_register(struct device *parent,
+				struct usb_charger *uchger)
+{
+	int ret;
+
+	if (WARN(!uchger, "charger can not be NULL"))
+		return -EINVAL;
+
+	uchger->dev.parent = parent;
+	uchger->dev.release = usb_charger_release;
+	uchger->dev.class = usb_charger_class;
+	uchger->dev.groups = usb_charger_groups;
+
+	ret = ida_simple_get(&usb_charger_ida, 0, 0, GFP_KERNEL);
+	if (ret < 0)
+		goto fail_ida;
+
+	uchger->id = ret;
+	dev_set_name(&uchger->dev, "usb-charger.%d", uchger->id);
+	dev_set_drvdata(&uchger->dev, uchger);
+
+	ret = device_register(&uchger->dev);
+	if (ret)
+		goto fail_register;
+
+	return 0;
+
+fail_register:
+	put_device(&uchger->dev);
+	ida_simple_remove(&usb_charger_ida, uchger->id);
+	uchger->id = -1;
+fail_ida:
+	dev_err(parent, "Failed to register usb charger: %d\n", ret);
+	return ret;
+}
+
+int devm_usb_charger_register(struct device *dev,
+			      struct usb_charger *uchger)
+{
+	struct usb_charger **ptr;
+	int ret;
+
+	ptr = devres_alloc(devm_uchger_dev_unreg, sizeof(*ptr), GFP_KERNEL);
+	if (!ptr)
+		return -ENOMEM;
+
+	ret = usb_charger_register(dev, uchger);
+	if (ret) {
+		devres_free(ptr);
+		return ret;
+	}
+
+	*ptr = uchger;
+	devres_add(dev, ptr);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(devm_usb_charger_register);
+
+int usb_charger_init(struct usb_gadget *ugadget)
+{
+	struct usb_charger *uchger;
+	struct extcon_dev *edev;
+	struct power_supply *psy;
+	int ret;
+
+	uchger = kzalloc(sizeof(struct usb_charger), GFP_KERNEL);
+	if (!uchger)
+		return -ENOMEM;
+
+	uchger->type = UNKNOWN_TYPE;
+	uchger->state = USB_CHARGER_DEFAULT;
+	uchger->id = -1;
+	uchger->sdp_default_cur_change = 0;
+
+	uchger->cur_limit.sdp_cur_limit = DEFAULT_SDP_CUR_LIMIT;
+	uchger->cur_limit.dcp_cur_limit = DEFAULT_DCP_CUR_LIMIT;
+	uchger->cur_limit.cdp_cur_limit = DEFAULT_CDP_CUR_LIMIT;
+	uchger->cur_limit.aca_cur_limit = DEFAULT_ACA_CUR_LIMIT;
+
+	mutex_init(&uchger->lock);
+	RAW_INIT_NOTIFIER_HEAD(&uchger->uchger_nh);
+
+	/* register a notifier on a extcon device if it is exsited */
+	edev = extcon_get_edev_by_phandle(ugadget->dev.parent, 0);
+	if (!IS_ERR_OR_NULL(edev)) {
+		uchger->extcon_dev = edev;
+		uchger->extcon_nb.nb.notifier_call = usb_charger_plug_by_extcon;
+		uchger->extcon_nb.uchger = uchger;
+		extcon_register_notifier(edev, EXTCON_USB,
+					 &uchger->extcon_nb.nb);
+	}
+
+	/* to check if the usb charger is link to a power supply */
+	psy = devm_power_supply_get_by_phandle(ugadget->dev.parent,
+					       "power-supplies");
+	if (!IS_ERR_OR_NULL(psy))
+		uchger->psy = psy;
+	else
+		uchger->psy = NULL;
+
+	/* register a notifier on a usb gadget device */
+	uchger->gadget = ugadget;
+	uchger->old_gadget_state = ugadget->state;
+
+	/* register a new usb charger */
+	ret = usb_charger_register(&ugadget->dev, uchger);
+	if (ret)
+		goto fail;
+
+	return 0;
+
+fail:
+	if (uchger->extcon_dev)
+		extcon_unregister_notifier(uchger->extcon_dev,
+					   EXTCON_USB, &uchger->extcon_nb.nb);
+
+	kfree(uchger);
+	return ret;
+}
+
+int usb_charger_exit(struct usb_gadget *ugadget)
+{
+	return 0;
+}
+
+static int __init usb_charger_class_init(void)
+{
+	usb_charger_class = class_create(THIS_MODULE, "usb_charger");
+	if (IS_ERR(usb_charger_class)) {
+		pr_err("couldn't create class\n");
+		return PTR_ERR(usb_charger_class);
+	}
+
+	return 0;
+}
+
+static void __exit usb_charger_class_exit(void)
+{
+	class_destroy(usb_charger_class);
+}
+subsys_initcall(usb_charger_class_init);
+module_exit(usb_charger_class_exit);
+
+MODULE_AUTHOR("Baolin Wang <baolin.wang@linaro.org>");
+MODULE_DESCRIPTION("USB charger driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/usb/charger.h b/include/linux/usb/charger.h
new file mode 100644
index 0000000..bbe4007
--- /dev/null
+++ b/include/linux/usb/charger.h
@@ -0,0 +1,173 @@ 
+#ifndef __LINUX_USB_CHARGER_H__
+#define __LINUX_USB_CHARGER_H__
+
+#include <uapi/linux/usb/ch9.h>
+#include <uapi/linux/usb/charger.h>
+
+/* Current limitation by charger type */
+struct usb_charger_cur_limit {
+	unsigned int sdp_cur_limit;
+	unsigned int dcp_cur_limit;
+	unsigned int cdp_cur_limit;
+	unsigned int aca_cur_limit;
+};
+
+struct usb_charger_nb {
+	struct notifier_block	nb;
+	struct usb_charger	*uchger;
+};
+
+struct usb_charger {
+	struct device		dev;
+	struct raw_notifier_head	uchger_nh;
+	/* protect the notifier head and charger */
+	struct mutex		lock;
+	int			id;
+	enum usb_charger_type	type;
+	enum usb_charger_state	state;
+
+	/* for supporting extcon usb gpio */
+	struct extcon_dev	*extcon_dev;
+	struct usb_charger_nb	extcon_nb;
+
+	/* for supporting usb gadget */
+	struct usb_gadget	*gadget;
+	enum usb_device_state	old_gadget_state;
+
+	/* for supporting power supply */
+	struct power_supply	*psy;
+
+	/* user can get charger type by implementing this callback */
+	enum usb_charger_type	(*get_charger_type)(struct usb_charger *);
+	/*
+	 * charger detection method can be implemented if you need to
+	 * manually detect the charger type.
+	 */
+	enum usb_charger_type	(*charger_detect)(struct usb_charger *);
+
+	/* current limitation */
+	struct usb_charger_cur_limit	cur_limit;
+	/* to check if it is needed to change the SDP charger default current */
+	unsigned int		sdp_default_cur_change;
+};
+
+#ifdef CONFIG_USB_CHARGER
+extern struct usb_charger *usb_charger_find_by_name(const char *name);
+
+extern struct usb_charger *usb_charger_get(struct usb_charger *uchger);
+extern void usb_charger_put(struct usb_charger *uchger);
+
+extern int usb_charger_register_notify(struct usb_charger *uchger,
+				       struct notifier_block *nb);
+extern int usb_charger_unregister_notify(struct usb_charger *uchger,
+					 struct notifier_block *nb);
+
+extern int usb_charger_set_cur_limit(struct usb_charger *uchger,
+				struct usb_charger_cur_limit *cur_limit_set);
+extern int usb_charger_set_cur_limit_by_type(struct usb_charger *uchger,
+					     enum usb_charger_type type,
+					     unsigned int cur_limit);
+extern unsigned int usb_charger_get_current(struct usb_charger *uchger);
+
+extern int usb_charger_plug_by_gadget(struct usb_gadget *gadget,
+				      unsigned long state);
+extern enum usb_charger_type usb_charger_get_type(struct usb_charger *uchger);
+extern int usb_charger_detect_type(struct usb_charger *uchger);
+
+extern void devm_usb_charger_unregister(struct device *dev,
+					struct usb_charger *uchger);
+extern int devm_usb_charger_register(struct device *dev,
+				     struct usb_charger *uchger);
+
+extern int usb_charger_init(struct usb_gadget *ugadget);
+extern int usb_charger_exit(struct usb_gadget *ugadget);
+#else
+static inline struct usb_charger *usb_charger_find_by_name(const char *name)
+{
+	return ERR_PTR(-ENODEV);
+}
+
+static inline struct usb_charger *usb_charger_get(struct usb_charger *uchger)
+{
+	return NULL;
+}
+
+static inline void usb_charger_put(struct usb_charger *uchger)
+{
+}
+
+static inline int
+usb_charger_register_notify(struct usb_charger *uchger,
+			    struct notifier_block *nb)
+{
+	return 0;
+}
+
+static inline int
+usb_charger_unregister_notify(struct usb_charger *uchger,
+			      struct notifier_block *nb)
+{
+	return 0;
+}
+
+static inline int
+usb_charger_set_cur_limit(struct usb_charger *uchger,
+			  struct usb_charger_cur_limit *cur_limit_set)
+{
+	return 0;
+}
+
+static inline int
+usb_charger_set_cur_limit_by_type(struct usb_charger *uchger,
+				  enum usb_charger_type type,
+				  unsigned int cur_limit)
+{
+	return 0;
+}
+
+static inline unsigned int
+usb_charger_get_current(struct usb_charger *uchger)
+{
+	return 0;
+}
+
+static inline enum usb_charger_type
+usb_charger_get_type(struct usb_charger *uchger)
+{
+	return UNKNOWN_TYPE;
+}
+
+static inline int usb_charger_detect_type(struct usb_charger *uchger)
+{
+	return 0;
+}
+
+static inline int
+usb_charger_plug_by_gadget(struct usb_gadget *gadget, unsigned long state)
+{
+	return 0;
+}
+
+static inline void devm_usb_charger_unregister(struct device *dev,
+					       struct usb_charger *uchger)
+{
+}
+
+static inline int devm_usb_charger_register(struct device *dev,
+					    struct usb_charger *uchger)
+{
+	return 0;
+}
+
+static inline int usb_charger_init(struct usb_gadget *ugadget)
+{
+	return 0;
+}
+
+static inline int usb_charger_exit(struct usb_gadget *ugadget)
+{
+	return 0;
+}
+#endif
+
+#endif /* __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..3c56ec4
--- /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_REMOVE,
+};
+
+#endif /* _UAPI__LINUX_USB_CHARGER_H */