@@ -181,6 +181,13 @@ int usb_charger_unregister_notify(struct usb_charger *uchger,
enum usb_charger_type
usb_charger_detect_type(struct usb_charger *uchger)
{
+ if (uchger->gadget && uchger->gadget->ops
+ && uchger->gadget->ops->get_charger_type)
+ uchger->type =
+ uchger->gadget->ops->get_charger_type(uchger->gadget);
+ else
+ uchger->type = UNKNOWN_TYPE;
+
return uchger->type;
}
@@ -313,7 +320,8 @@ static int
usb_charger_plug_by_gadget(struct notifier_block *nb,
unsigned long state, void *data)
{
- struct usb_charger *uchger = NULL;
+ struct usb_gadget *gadget = (struct usb_gadget *)data;
+ struct usb_charger *uchger = gadget->uchger;
enum usb_charger_state uchger_state;
if (!uchger)
@@ -480,6 +488,7 @@ int usb_charger_init(struct usb_gadget *ugadget)
/* register a notifier on a usb gadget device */
uchger->gadget = ugadget;
+ ugadget->uchger = uchger;
uchger->old_gadget_state = ugadget->state;
uchger->gadget_nb.notifier_call = usb_charger_plug_by_gadget;
usb_gadget_register_notify(ugadget, &uchger->gadget_nb);
@@ -503,7 +512,7 @@ fail:
int usb_charger_exit(struct usb_gadget *ugadget)
{
- struct usb_charger *uchger = NULL;
+ struct usb_charger *uchger = ugadget->uchger;
if (!uchger)
return -EINVAL;
When the usb gadget supporting for usb charger is ready, the usb charger should get the type by the 'get_charger_type' callback which is implemented by the usb gadget operations, and get the usb charger pointer from struct 'usb_gadget'. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- drivers/usb/gadget/charger.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)