From patchwork Mon Jun 13 08:46:37 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: 69849 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1432433qgf; Mon, 13 Jun 2016 01:48:00 -0700 (PDT) X-Received: by 10.67.3.227 with SMTP id bz3mr20514853pad.67.1465807680565; Mon, 13 Jun 2016 01:48:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 63si23972766pfq.112.2016.06.13.01.48.00; Mon, 13 Jun 2016 01:48:00 -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 S1753556AbcFMIry (ORCPT + 30 others); Mon, 13 Jun 2016 04:47:54 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36731 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965551AbcFMIru (ORCPT ); Mon, 13 Jun 2016 04:47:50 -0400 Received: by mail-pf0-f181.google.com with SMTP id t190so44210139pfb.3 for ; Mon, 13 Jun 2016 01:47:50 -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=tLS/Q+o2jDr+s5sEFr3o6iAGZOI5XDMN45OoRRWmowY=; b=T3S01E5fIeMHY34r3SeJWAbxA/53IDoT7z+qUYFoSSXznDRx9s3ekEfCi+aGmJluwz S1K1eftgnbjcdlkWr5oG52lTxgYE1ZJVGfQ/JmBnwGYCoXbvGiLL9wR6ntpL53pbOuvn IReI/6MsyiT1lQVVwXxaZMwzpbhCfWDDfMpWw= 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=tLS/Q+o2jDr+s5sEFr3o6iAGZOI5XDMN45OoRRWmowY=; b=JHotHjzYpnijpCssu965eAafsuSJZ6foeQqk5X6kv47GhwRfh8JGBvpvSQY0GpyNPc pTu9lPmxUusO7iH7xVlxJN09GEjZNXtNXrHb9V4HohtGSaTAACmGWWB3SlomO2EI5Yr0 E6rbK2kdzfdOCUywpePlECwh7RfY5Lksxu3nOrU231PSFykzujqe4co6e3l3yG2VvXKJ ycsmEePbYI1sGsEkq4rF7HRVfk7cwNivAfq1j1xbJCBJ3zv6wNMqEqxVuezJgdE7ZhyT ChCH9jt5WjyZtcg/oiWo4rzgYiXy7WpS+f+z8tMvHgsK+db2gW7T4Uy+uMeuO+01bfOi UHgw== X-Gm-Message-State: ALyK8tKwsdFR7T5kNb+bUuPiAk9joGHduSFjhrIJ1175gFd3Qbt16eUBe0ZuWCaScp9am8tz X-Received: by 10.98.13.81 with SMTP id v78mr20543984pfi.91.1465807670088; Mon, 13 Jun 2016 01:47:50 -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.44 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 01:47:49 -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 3/4] gadget: Integrate with the usb gadget supporting for usb charger Date: Mon, 13 Jun 2016 16:46:37 +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 When the usb gadget supporting for usb charger is ready, the usb charger can implement the usb_charger_plug_by_gadget() function and usb_charger_exit() function by getting 'struct usb_charger' from 'struct gadget'. Signed-off-by: Baolin Wang --- drivers/usb/gadget/udc/charger.c | 39 +++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) -- 1.7.9.5 diff --git a/drivers/usb/gadget/udc/charger.c b/drivers/usb/gadget/udc/charger.c index 7be4c76..949396f 100644 --- a/drivers/usb/gadget/udc/charger.c +++ b/drivers/usb/gadget/udc/charger.c @@ -568,6 +568,30 @@ usb_charger_plug_by_extcon(struct notifier_block *nb, int usb_charger_plug_by_gadget(struct usb_gadget *gadget, unsigned long state) { + struct usb_charger *uchger = gadget->charger; + enum usb_charger_state uchger_state; + + if (WARN(!uchger, "charger can not be NULL")) + return -EINVAL; + + /* + * Report event to power to setting the current limitation + * for this usb charger when one usb charger state is changed + * with detecting by usb gadget state. + */ + if (uchger->old_gadget_state != state) { + uchger->old_gadget_state = state; + + if (state >= USB_STATE_ATTACHED) + uchger_state = USB_CHARGER_PRESENT; + else if (state == USB_STATE_NOTATTACHED) + uchger_state = USB_CHARGER_REMOVE; + else + uchger_state = USB_CHARGER_DEFAULT; + + usb_charger_notify_others(uchger, uchger_state); + } + return 0; } EXPORT_SYMBOL_GPL(usb_charger_plug_by_gadget); @@ -724,6 +748,7 @@ int usb_charger_init(struct usb_gadget *ugadget) /* register a notifier on a usb gadget device */ uchger->gadget = ugadget; + ugadget->charger = uchger; uchger->old_gadget_state = USB_STATE_NOTATTACHED; /* register a new usb charger */ @@ -744,7 +769,19 @@ fail: int usb_charger_exit(struct usb_gadget *ugadget) { - return 0; + struct usb_charger *uchger = ugadget->charger; + + if (WARN(!uchger, "charger can not be NULL")) + return -EINVAL; + + if (uchger->extcon_dev) + extcon_unregister_notifier(uchger->extcon_dev, + EXTCON_USB, + &uchger->extcon_nb.nb); + + ida_simple_remove(&usb_charger_ida, uchger->id); + + return usb_charger_unregister(uchger); } static int __init usb_charger_class_init(void)