Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1201491

[PATCH 2/2] gadget: Support for the usb charger framework

From Baolin Wang <baolin.wang@linaro.org>
Newsgroups linux.kernel
Subject [PATCH 2/2] gadget: Support for the usb charger framework
Date 2015-08-06 09:10 +0200
Message-ID <pUntp-1Db-39@gated-at.bofh.it> (permalink)
References <pUnto-1Db-15@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

The usb charger framework is based on usb gadget, and each usb gadget
can be one usb charger to set the current limitation.

This patch adds a notifier mechanism for usb charger to report to usb
charger when the usb gadget state is changed.

Also we introduce a callback 'get_charger_type' which will implemented
by user for usb gadget operations to get the usb charger type.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/usb/gadget/udc/udc-core.c |   41 +++++++++++++++++++++++++++++++++++++
 include/linux/usb/gadget.h        |   20 ++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index d69c355..d5368088 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -28,6 +28,7 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb.h>
+#include <linux/usb/usb_charger.h>
 
 /**
  * struct usb_udc - describes one usb device controller
@@ -127,12 +128,45 @@ void usb_gadget_giveback_request(struct usb_ep *ep,
 }
 EXPORT_SYMBOL_GPL(usb_gadget_giveback_request);
 
+int usb_gadget_register_notify(struct usb_gadget *gadget,
+			       struct notifier_block *nb)
+{
+	unsigned long flags;
+	int ret;
+
+	spin_lock_irqsave(&gadget->lock, flags);
+	ret = raw_notifier_chain_register(&gadget->nh, nb);
+	spin_unlock_irqrestore(&gadget->lock, flags);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_register_notify);
+
+int usb_gadget_unregister_notify(struct usb_gadget *gadget,
+				 struct notifier_block *nb)
+{
+	unsigned long flags;
+	int ret;
+
+	spin_lock_irqsave(&gadget->lock, flags);
+	ret = raw_notifier_chain_unregister(&gadget->nh, nb);
+	spin_unlock_irqrestore(&gadget->lock, flags);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_gadget_unregister_notify);
+
 /* ------------------------------------------------------------------------- */
 
 static void usb_gadget_state_work(struct work_struct *work)
 {
 	struct usb_gadget *gadget = work_to_gadget(work);
 	struct usb_udc *udc = gadget->udc;
+	unsigned long flags;
+
+	spin_lock_irqsave(&gadget->lock, flags);
+	raw_notifier_call_chain(&gadget->nh, gadget->state, gadget);
+	spin_unlock_irqrestore(&gadget->lock, flags);
 
 	if (udc)
 		sysfs_notify(&udc->dev.kobj, NULL, "state");
@@ -272,6 +306,8 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
 
 	dev_set_name(&gadget->dev, "gadget");
 	INIT_WORK(&gadget->work, usb_gadget_state_work);
+	RAW_INIT_NOTIFIER_HEAD(&gadget->nh);
+	spin_lock_init(&gadget->lock);
 	gadget->dev.parent = parent;
 
 #ifdef	CONFIG_HAS_DMA
@@ -313,6 +349,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
 
 	mutex_unlock(&udc_lock);
 
+	ret = usb_charger_init(gadget);
+	if (ret)
+		goto err4;
+
 	return 0;
 
 err4:
@@ -388,6 +428,7 @@ void usb_del_gadget_udc(struct usb_gadget *gadget)
 	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
 	flush_work(&gadget->work);
 	device_unregister(&udc->dev);
+	usb_charger_exit(gadget);
 	device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 4f3dfb7..f24d6ac 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -492,6 +492,7 @@ struct usb_gadget_ops {
 	int	(*udc_start)(struct usb_gadget *,
 			struct usb_gadget_driver *);
 	int	(*udc_stop)(struct usb_gadget *);
+	enum usb_charger_type	(*get_charger_type)(struct usb_gadget *);
 };
 
 /**
@@ -559,6 +560,9 @@ struct usb_gadget {
 	struct device			dev;
 	unsigned			out_epnum;
 	unsigned			in_epnum;
+	struct raw_notifier_head	nh;
+	struct usb_charger		*uchger;
+	spinlock_t			lock;
 
 	unsigned			sg_supported:1;
 	unsigned			is_otg:1;
@@ -1014,6 +1018,22 @@ extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
 
 /*-------------------------------------------------------------------------*/
 
+/**
+ * Register a notifiee to get notified by any attach status changes from
+ * the usb gadget
+ */
+int usb_gadget_register_notify(struct usb_gadget *gadget,
+			       struct notifier_block *nb);
+
+/*-------------------------------------------------------------------------*/
+
+
+/* Unregister a notifiee from the usb gadget */
+int usb_gadget_unregister_notify(struct usb_gadget *gadget,
+				 struct notifier_block *nb);
+
+/*-------------------------------------------------------------------------*/
+
 /* utility to set gadget state properly */
 
 extern void usb_gadget_set_state(struct usb_gadget *gadget,
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] Introduce usb charger framework to deal with the usb gadget power negotation Baolin Wang <baolin.wang@linaro.org> - 2015-08-06 09:10 +0200
  [PATCH 2/2] gadget: Support for the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-06 09:10 +0200
    Re: [PATCH 2/2] gadget: Support for the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 10:50 +0200
      RE: [PATCH 2/2] gadget: Support for the usb charger framework Peter Chen <Peter.Chen@freescale.com> - 2015-08-07 11:10 +0200
        Re: [PATCH 2/2] gadget: Support for the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 11:30 +0200
          Re: [PATCH 2/2] gadget: Support for the usb charger framework Greg KH <gregkh@linuxfoundation.org> - 2015-08-07 20:00 +0200
            Re: [PATCH 2/2] gadget: Support for the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-08 08:30 +0200
  [PATCH 1/2] gadget: Introduce the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-06 09:10 +0200
    Re: [PATCH 1/2] gadget: Introduce the usb charger framework Greg KH <gregkh@linuxfoundation.org> - 2015-08-06 18:40 +0200
      Re: [PATCH 1/2] gadget: Introduce the usb charger framework Mark Brown <broonie@kernel.org> - 2015-08-06 20:40 +0200
      Re: [PATCH 1/2] gadget: Introduce the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 07:50 +0200
    Re: [PATCH 1/2] gadget: Introduce the usb charger framework Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 10:40 +0200
  Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Felipe Balbi <balbi@ti.com> - 2015-08-06 18:30 +0200
    Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Greg KH <gregkh@linuxfoundation.org> - 2015-08-06 18:50 +0200
  Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 10:20 +0200
    RE: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Peter Chen <Peter.Chen@freescale.com> - 2015-08-07 10:40 +0200
      Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Baolin Wang <baolin.wang@linaro.org> - 2015-08-07 10:50 +0200
    Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Greg KH <gregkh@linuxfoundation.org> - 2015-08-07 20:00 +0200
      Re: [PATCH 0/2] Introduce usb charger framework to deal with the usb  gadget power negotation Baolin Wang <baolin.wang@linaro.org> - 2015-08-08 08:30 +0200

csiph-web