From patchwork Wed Mar 16 11:46:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 63922 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1266686lbc; Wed, 16 Mar 2016 04:47:07 -0700 (PDT) X-Received: by 10.98.10.136 with SMTP id 8mr5193564pfk.67.1458128823623; Wed, 16 Mar 2016 04:47:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qd3si4759513pab.208.2016.03.16.04.47.03; Wed, 16 Mar 2016 04:47:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966495AbcCPLq4 (ORCPT + 31 others); Wed, 16 Mar 2016 07:46:56 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35502 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933804AbcCPLqv (ORCPT ); Wed, 16 Mar 2016 07:46:51 -0400 Received: by mail-pf0-f181.google.com with SMTP id n5so72321265pfn.2 for ; Wed, 16 Mar 2016 04:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=FTFLOBZKwE2x17pPX9JPvwtu4YikEXaRVzTwh5y2J44=; b=ERkirVki89uIrKTNYiBwGR6trIO7w2U+CzZDy7iPaW2BkrzJ2WY+PMjkQCS11sHyGR nPvM6qqmg7irWwkEIUC8tSYKhncQGRQp5AdnpS6tW67Cd41i/E+6RtFzmC4sCS/AreF2 ZQAMB4F9qDjEgKNVjKt9R6WcIgE6jTL7x6UUw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=FTFLOBZKwE2x17pPX9JPvwtu4YikEXaRVzTwh5y2J44=; b=DYNhsQ6XaEV/6n11zydT4cvBOpxOmLha/FdTiu+c0eWP63QGnZApIzPpzE8GvmE7IN OPwX77Q/tAsb7PoUnybxGRfFZiEHxXDccUuayuKnoNMo/UjuUCzX0gVeSLmlVAfaUcuB q/TfNKmpNjRUtGgvqIWQLPXSaZsrygwNGj8MiEYrUd7boiB4+2PfZUc1Y18irFw/OHiQ pGxHekcwf2jF6mxiYRSfef/bWIbhoWEhNkOnFsUQr/WYDzEvgISWdKIsMQm1GioJcbt2 g6/SdBvqSzM0D4jPUvz5oEEwMwkkgC6kReGM8ZFJh6MDS9sWVqbYh2sb3r/CxK9x10jI 4eXQ== X-Gm-Message-State: AD7BkJJx5K4kjOBif3PYTyXp3Px+GBOeNaVjPOEI1QqUPp4n8rWiFrE7zDEUeaQnOhxgUvEi X-Received: by 10.98.8.14 with SMTP id c14mr5124802pfd.42.1458128811073; Wed, 16 Mar 2016 04:46:51 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 16sm5105990pfk.28.2016.03.16.04.46.46 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Mar 2016 04:46:50 -0700 (PDT) From: Baolin Wang 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 v7 2/4] gadget: Support for the usb charger framework Date: Wed, 16 Mar 2016 19:46:06 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For supporting the usb charger, it adds the usb_charger_init() and usb_charger_exit() functions for usb charger initialization and exit. It will report to the usb charger when the gadget state is changed, then the usb charger can do the power things. 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 --- drivers/usb/gadget/udc/udc-core.c | 11 +++++++++++ include/linux/usb/gadget.h | 11 +++++++++++ 2 files changed, 22 insertions(+) -- 1.7.9.5 diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index fd73a3e..1ac2b40 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -28,6 +28,7 @@ #include #include #include +#include /** * struct usb_udc - describes one usb device controller @@ -230,6 +231,9 @@ static void usb_gadget_state_work(struct work_struct *work) struct usb_gadget *gadget = work_to_gadget(work); struct usb_udc *udc = gadget->udc; + /* when the gadget state is changed, then report to USB charger */ + usb_charger_plug_by_gadget(gadget, gadget->state); + if (udc) sysfs_notify(&udc->dev.kobj, NULL, "state"); } @@ -422,8 +426,14 @@ 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 err5; + return 0; +err5: + device_del(&udc->dev); err4: list_del(&udc->list); mutex_unlock(&udc_lock); @@ -502,6 +512,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 d82d006..024b33d 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -24,6 +24,7 @@ #include #include #include +#include struct usb_ep; @@ -563,6 +564,7 @@ struct usb_gadget_ops { struct usb_ep *(*match_ep)(struct usb_gadget *, struct usb_endpoint_descriptor *, struct usb_ss_ep_comp_descriptor *); + enum usb_charger_type (*get_charger_type)(struct usb_gadget *); }; /** @@ -635,6 +637,8 @@ struct usb_gadget { unsigned out_epnum; unsigned in_epnum; struct usb_otg_caps *otg_caps; + /* negotiate the power with the usb charger */ + struct usb_charger *charger; unsigned sg_supported:1; unsigned is_otg:1; @@ -839,10 +843,17 @@ static inline int usb_gadget_vbus_connect(struct usb_gadget *gadget) * reporting how much power the device may consume. For example, this * could affect how quickly batteries are recharged. * + * It will also notify the USB charger how much power the device may + * consume if there is a USB charger linking with the gadget. + * * Returns zero on success, else negative errno. */ static inline int usb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) { + if (gadget->charger) + usb_charger_set_cur_limit_by_type(gadget->charger, + usb_charger_detect_type(gadget->charger), mA); + if (!gadget->ops->vbus_draw) return -EOPNOTSUPP; return gadget->ops->vbus_draw(gadget, mA);