From patchwork Fri May 20 08:38:10 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: 68224 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3647781qge; Fri, 20 May 2016 01:39:20 -0700 (PDT) X-Received: by 10.98.43.202 with SMTP id r193mr2918057pfr.124.1463733560492; Fri, 20 May 2016 01:39:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d15si26461193pfb.137.2016.05.20.01.39.20; Fri, 20 May 2016 01:39:20 -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 S933366AbcETIjJ (ORCPT + 30 others); Fri, 20 May 2016 04:39:09 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35006 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933344AbcETIjE (ORCPT ); Fri, 20 May 2016 04:39:04 -0400 Received: by mail-pa0-f44.google.com with SMTP id tb2so20552080pac.2 for ; Fri, 20 May 2016 01:39:04 -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=Ni+WgIWX24XRiVrX1moGTOib1mz0PRUn1iCwSQhvL1E=; b=SMPUNwXqOaLPFCnu2n0iSmGvH618EQVjSSKCEYV2X2HXf6XJ4a3H3vSgsckC1wFKyy u1zQ2OlwDjr1pxzM8kld8mQcKgCcCm+hT7JZl5cT41frH+Xnsqs3jjiIsZ/5+KAoysVP CWXBJ8Jakyjyhf5CiB3Wx4zZHu+OwjGOxBAVM= 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=Ni+WgIWX24XRiVrX1moGTOib1mz0PRUn1iCwSQhvL1E=; b=Z5cEYsgRtcjGJ5kdVJi+Sy6Sdp9bPb41VBAPK0UnI2H2VnsiWGlfZJOjSBT3q8ASML 68tTMC7fGlfBienIp2rY0fKLvRvt6cMxmb/lKbCSaFWOi2FS5M1lrFZMc9WP55tr9YJK qABpOTfpzZgWiX3WW9bZdh15FOYHyGjEJIq6MYpyEpg1VSnrVYv4FAwxvwL96Ie9xDjh 4ODoEOVrgENwtozK+M495xJZM3nrO0SrSWdFxk8T/VUkcdL+G735AnglVK9msXvBRDPM ZvIF4EKafssdGQlwxa6DA2Rr7YThq6D5+7HFKJ1k6TT7kXemxULs2FK2LMx87Q1YPJwV r9rQ== X-Gm-Message-State: AOPr4FX+iXnh6iRvE+Rv8VfWzd6Up86bULae9wnw9wWqJsr98xYtrli+MV677pxTbrjAlRyA X-Received: by 10.66.65.169 with SMTP id y9mr2925405pas.102.1463733543705; Fri, 20 May 2016 01:39:03 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id a64sm25310939pfa.6.2016.05.20.01.38.57 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 01:39:02 -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: [PATCH v11 2/4] gadget: Support for the usb charger framework Date: Fri, 20 May 2016 16:38:10 +0800 Message-Id: <1f5221fef3c5eb99e48727a9ee0e441c2589bc2a.1463732873.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. 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 e4e70e1..58207d0 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"); } @@ -399,6 +403,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; @@ -419,6 +427,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); @@ -527,6 +537,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 5d4e151..9735309 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);