From patchwork Fri Apr 1 07:21:50 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: 64828 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp577453lbc; Fri, 1 Apr 2016 00:23:15 -0700 (PDT) X-Received: by 10.67.1.237 with SMTP id bj13mr28815685pad.130.1459495395829; Fri, 01 Apr 2016 00:23:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yx1si19542982pab.52.2016.04.01.00.23.15; Fri, 01 Apr 2016 00:23:15 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932290AbcDAHXF (ORCPT + 29 others); Fri, 1 Apr 2016 03:23:05 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:34659 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758209AbcDAHXA (ORCPT ); Fri, 1 Apr 2016 03:23:00 -0400 Received: by mail-pf0-f173.google.com with SMTP id x3so88403222pfb.1 for ; Fri, 01 Apr 2016 00:23:00 -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=HhaQjEbYRtgTEUIsdyK+E4pDKGUUSdWpzj5phedKzRw=; b=I497KFrBS9oPMQZ/AmiUSmYDfmKdJUvdMOW8Oui6wG+AhRgBlvj2SnzU+CTBUXlgDW TZwBTGeaL43ECX1/o199lVLcu4bI3nRzBT2veJYBqRsIG5nudW4soJYJcUWgX7uN+Rvi JdJJ/kJoYlpVHwSIJCmmNi71OF7ohHHz2kubc= 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=HhaQjEbYRtgTEUIsdyK+E4pDKGUUSdWpzj5phedKzRw=; b=eNcKXyGNcB4gqHcT3i2fuEl4G5318hNqKbgI2ynQ4b1+3eaOGpKJeZWPlzkVSWKDZy yh/2tZhsRbh7pY7d7135b+tsnhtY9caPTc9c7lXFA/gZMbjZ1iRb94OdFtwZ0WP74GJO 1uQJRkeO0E8r9UYkt6nuQ12KO8hS8noHW73BN0chN9BmYVn8KjoI5cbZAbgz3YVz7WWx lEeX6i1/P5mDGa/CpTqbxvHNWuaRgqPb3CRk/hWZC0L3x6i8mRgq9Ve9ZHxfOfddeZI7 9V5oLui96T6/ejMyqIK8TvRJTvSNeu+VbDZl9ULSYCaPqi3NqqcSD9baa4ONFh2Q96Hz SCJA== X-Gm-Message-State: AD7BkJIBSI/Dq63NYVJFq+E0hx0IDbdOKyUMejWcIG7GrtPbpg2DGRs74Nn9m0y6mGpEEoS/ X-Received: by 10.98.44.73 with SMTP id s70mr28662384pfs.2.1459495379796; Fri, 01 Apr 2016 00:22:59 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id u2sm18129493pfi.26.2016.04.01.00.22.54 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 00:22:58 -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 v9 2/4] gadget: Support for the usb charger framework Date: Fri, 1 Apr 2016 15:21:50 +0800 Message-Id: <13c2f4fb71958bf9a5527acbed8b8b60dc569656.1459494744.git.baolin.wang@linaro.org> 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 | 15 +++++++++++++++ 2 files changed, 26 insertions(+) -- 1.7.9.5 diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index b86a6f0..8d98c6b 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"); } @@ -423,8 +427,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); @@ -503,6 +513,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..054488a 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,8 @@ struct usb_gadget_ops { struct usb_ep *(*match_ep)(struct usb_gadget *, struct usb_endpoint_descriptor *, struct usb_ss_ep_comp_descriptor *); + /* get the charger type */ + enum usb_charger_type (*get_charger_type)(struct usb_gadget *); }; /** @@ -635,6 +638,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 +844,20 @@ 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) { + enum usb_charger_type type; + + if (gadget->charger) { + type = usb_charger_get_type(gadget->charger); + usb_charger_set_cur_limit_by_type(gadget->charger, type, mA); + } + if (!gadget->ops->vbus_draw) return -EOPNOTSUPP; return gadget->ops->vbus_draw(gadget, mA);