From patchwork Thu Mar 24 12:35:56 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: 64343 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp612054lbc; Thu, 24 Mar 2016 05:37:28 -0700 (PDT) X-Received: by 10.98.18.28 with SMTP id a28mr12348728pfj.145.1458823040197; Thu, 24 Mar 2016 05:37:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xw2si11983293pac.192.2016.03.24.05.37.19; Thu, 24 Mar 2016 05:37: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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757456AbcCXMhC (ORCPT + 29 others); Thu, 24 Mar 2016 08:37:02 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33250 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755877AbcCXMg6 (ORCPT ); Thu, 24 Mar 2016 08:36:58 -0400 Received: by mail-pa0-f50.google.com with SMTP id fl4so20544855pad.0 for ; Thu, 24 Mar 2016 05:36:58 -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=hb7r19CEvJ7n4zdyxp/M6LXA9JV643pDiEsb6lwpDuI=; b=hucXRCf5bcN0W1Zu6UVP8XKhvTJJ5AnxAzTheGGFNF9soay2V4JsgbKIsZ1d90MeM0 NQjbHXlBLqkKFza9sueUAH60uWkQeAFgN6y7yJJRm1LcY+bT+yEWDGus8wCBWwiHlB2N wcrNt6Mwhbtm2li5qdTuEE9DacIGro0FCVmiY= 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=hb7r19CEvJ7n4zdyxp/M6LXA9JV643pDiEsb6lwpDuI=; b=SyT+9iS0m+5ugvgq3/NzuuC59BHVG8rVTDVm0yKSn+uy2gzyBa+1Cudpum0PNdCPd+ UQyCuX0NyX+Ka8hZzR1b1qHANlmQ7xWpOJ84g4FN8lE/kYzv/3e3MBb5P8qKTp1erlJF zl8spfHS4Lu6hbx8cfZLwlOdGd5TXCrQAVAQO3L+GWFjAgWz9rkcdEerttOOrVWmy98u 0iGXmjT+u9E26qpjTbgzKWM/RVnLPj3ZBle9Vi9cI0LhBFcf9K5or+8mC3DKqh1OXsX9 lw805XdNIVWyUioW+2ojQ6MG5Yrt8+O5lrHXXPa+480RiQU3Cj37ij1AO1XqhNn6wXr0 iI0g== X-Gm-Message-State: AD7BkJLO3PKPi4ZNDRt0+WtN2lnB3bXm8oqUnOJ3aHiuKo6AbdgZNme2K/h2rQCaMMgs9SX+ X-Received: by 10.66.192.195 with SMTP id hi3mr12254197pac.149.1458823018110; Thu, 24 Mar 2016 05:36:58 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 9sm10202285pfm.10.2016.03.24.05.36.53 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 05:36:57 -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 v8 3/4] gadget: Integrate with the usb gadget supporting for usb charger Date: Thu, 24 Mar 2016 20:35:56 +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 should get the type by the 'get_charger_type' callback which is implemented by the usb gadget operations, and get the usb charger pointer from struct 'usb_gadget'. Signed-off-by: Baolin Wang --- drivers/usb/gadget/charger.c | 43 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) -- 1.7.9.5 diff --git a/drivers/usb/gadget/charger.c b/drivers/usb/gadget/charger.c index 861c144..b02c842 100644 --- a/drivers/usb/gadget/charger.c +++ b/drivers/usb/gadget/charger.c @@ -278,7 +278,11 @@ EXPORT_SYMBOL_GPL(usb_charger_unregister_notify); enum usb_charger_type usb_charger_detect_type(struct usb_charger *uchger) { - if (uchger->psy) { + if (uchger->gadget && uchger->gadget->ops + && uchger->gadget->ops->get_charger_type) { + uchger->type = + uchger->gadget->ops->get_charger_type(uchger->gadget); + } else if (uchger->psy) { union power_supply_propval val; power_supply_get_property(uchger->psy, @@ -485,6 +489,29 @@ 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 (!uchger) + 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); @@ -641,6 +668,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 = ugadget->state; /* register a new usb charger */ @@ -661,7 +689,18 @@ fail: int usb_charger_exit(struct usb_gadget *ugadget) { - return 0; + struct usb_charger *uchger = ugadget->charger; + + if (!uchger) + 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_sysfs_init(void)