From patchwork Thu Apr 7 11:48:44 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: 65293 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp26209lbl; Thu, 7 Apr 2016 04:50:23 -0700 (PDT) X-Received: by 10.67.2.41 with SMTP id bl9mr4151697pad.39.1460029817952; Thu, 07 Apr 2016 04:50:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q28si432703pfi.1.2016.04.07.04.50.17; Thu, 07 Apr 2016 04:50:17 -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 S1756095AbcDGLuP (ORCPT + 29 others); Thu, 7 Apr 2016 07:50:15 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33652 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756018AbcDGLuJ (ORCPT ); Thu, 7 Apr 2016 07:50:09 -0400 Received: by mail-pa0-f53.google.com with SMTP id zm5so53755864pac.0 for ; Thu, 07 Apr 2016 04:50:09 -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=wS97tFS1XvlG74WtQiEL8IJadbvwAeqJMq1700KAt/o=; b=chR31KYMoQJ0eF11G6g2K6eza5NrPc11jHKctwDg54UwkPyovVcq8h+ol5umvDKeAf 3rKjvQsKJS0nr4KlGo4VXzovEDs6FDK1M860o4HQFtkt5pvaMLrYZTQOExNSmYUMFzT4 35G9cKAeqZ9XQgrGaM/9B8qZpk7r+iHYz0/ZU= 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=wS97tFS1XvlG74WtQiEL8IJadbvwAeqJMq1700KAt/o=; b=NpLeyg65aDztU6aVoGxKUNcm5SoDxAlTiFAiGmmCnIWVpH1JLbOe3UPoPDooAH322t wKcbgFrLo/jwnSra/aj8ihWDnOntuieGr43FnkE4nSjcU9LWrYRJgPXyyC8Q3HfLx4Ro 8c9+uaHc4p0MbqAtN+Dma7xVDdZarGgUGLTYEpv5Yq0gMj5VcjqscZw+NuQJcKXuCeuC VsPiWMiUFsmhpjB5bk/oxf9BObyYWEliAkThKUzwdVtPJ/EtLt5bgIVSSDrXDpb4eejZ io50vBc24t3PASMriYcNhFWuBjYoJb9gTX9ffcFykMSqvR/r0qedag0E/C7qtXJd4cch 67ZA== X-Gm-Message-State: AD7BkJKE3y3fXdfB1MKcihn4Qe3/USwE5rLxxctObiWcl95lknhhD20ZzchefIWjYtEop2/r X-Received: by 10.66.66.198 with SMTP id h6mr4181034pat.112.1460029804047; Thu, 07 Apr 2016 04:50:04 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id c4sm11776435pat.19.2016.04.07.04.49.59 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 04:50:03 -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 v10 2/4] gadget: Support for the usb charger framework Date: Thu, 7 Apr 2016 19:48:44 +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. Signed-off-by: Baolin Wang --- drivers/usb/gadget/udc/udc-core.c | 11 +++++++++++ include/linux/usb/gadget.h | 13 +++++++++++++ 2 files changed, 24 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..8b36a4e 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -24,6 +24,7 @@ #include #include #include +#include struct usb_ep; @@ -635,6 +636,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 +842,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);