From patchwork Mon Jun 13 08:46:36 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: 69848 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1432386qgf; Mon, 13 Jun 2016 01:47:52 -0700 (PDT) X-Received: by 10.98.81.3 with SMTP id f3mr20411656pfb.132.1465807669434; Mon, 13 Jun 2016 01:47:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id or6si16739473pac.233.2016.06.13.01.47.49; Mon, 13 Jun 2016 01:47:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965536AbcFMIrs (ORCPT + 14 others); Mon, 13 Jun 2016 04:47:48 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35637 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965525AbcFMIrp (ORCPT ); Mon, 13 Jun 2016 04:47:45 -0400 Received: by mail-pf0-f178.google.com with SMTP id c2so44247480pfa.2 for ; Mon, 13 Jun 2016 01:47:45 -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=ugfZCsM6I+9R33c1+BXegjJXQ1qP8vv2Aaduj+zXvDQ=; b=K8kiJjFmcx85P98K92685JgCncvP1txIlTCdufmlu3VTVFffRJKGF1pAcmc61FLXJ0 MolxmCq7qHawCjqxsqIYLrYW0e6cq1aj8rAzY2OlFwDt0R92dkVblUhOgeyraFpp4mJm WfaLsno29wPw/ViXDh4waT2hYK3n7gGFWemY0= 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=ugfZCsM6I+9R33c1+BXegjJXQ1qP8vv2Aaduj+zXvDQ=; b=k1qKjgP1ylXJhUsjUdu/A1OCBGjGTbqG7S3WAvANm9mi8A9vyvKecWChyChYJXSmNo fXFif0KKZM7VJ+UK/wu5VAHs8X6Y8a3o4EbpPuwY5K2hjNTqFycdGGJlSDZpxQivhc/W vJalJZmH7BSopqKZOqFM2GQ3O+Mtyzi8YtsKuthgUbyuOGriEou0F/RazZU1e/cE7Asa ugGGHRLW0mKvpvwFzsja/uygkgUwlbOymUqwrqaT7FUosKkOms/mvr3AtvhJfegwCFu8 e1NNgo8+ntI9zlhY7U+MT/8hv5pkwu/kd7rIshbX7l/4hSIzQu/LbMCenpkoNHbZ/pMK +EUg== X-Gm-Message-State: ALyK8tIR/VRJUquMwUmNKD8jJTCtasPrEw3fSpnBvOkN949w3E1WXaUzfAsYT1kjRPytZ+aF X-Received: by 10.98.134.196 with SMTP id x187mr20611651pfd.21.1465807663855; Mon, 13 Jun 2016 01:47:43 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id w194sm27136061pfd.58.2016.06.13.01.47.38 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 01:47:43 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org Cc: robh@kernel.org, m.szyprowski@samsung.com, ruslan.bilovol@gmail.com, 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: [RESEND PATCH v11 2/4] gadget: Support for the usb charger framework Date: Mon, 13 Jun 2016 16:46:36 +0800 Message-Id: <0f69a3bb3451dd850a7c2de30d17266b98ff337d.1465807514.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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. 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 -- 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 diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 6e8300d..84c098c 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 @@ -242,6 +243,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"); } @@ -411,6 +415,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, if (ret) goto err4; + ret = usb_charger_init(gadget); + if (ret) + goto err5; + usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED); udc->vbus = true; @@ -431,6 +439,8 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, return 0; +err5: + device_del(&udc->dev); err4: list_del(&udc->list); mutex_unlock(&udc_lock); @@ -539,6 +549,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 457651b..40390ec 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -24,6 +24,7 @@ #include #include #include +#include struct usb_ep; @@ -639,6 +640,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; @@ -855,10 +858,18 @@ 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, + gadget->charger->type, + mA); + if (!gadget->ops->vbus_draw) return -EOPNOTSUPP; return gadget->ops->vbus_draw(gadget, mA);