From patchwork Tue Dec 8 08:36:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 57835 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp1655361lbb; Tue, 8 Dec 2015 00:37:03 -0800 (PST) X-Received: by 10.66.237.7 with SMTP id uy7mr3247846pac.130.1449563823086; Tue, 08 Dec 2015 00:37:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gw4si3723154pac.129.2015.12.08.00.37.02; Tue, 08 Dec 2015 00:37:03 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964901AbbLHIgt (ORCPT + 28 others); Tue, 8 Dec 2015 03:36:49 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35068 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964848AbbLHIgq (ORCPT ); Tue, 8 Dec 2015 03:36:46 -0500 Received: by pacej9 with SMTP id ej9so8758275pac.2 for ; Tue, 08 Dec 2015 00:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=tZ6kYQOyqlcLY41KMvC+2wJ1fHYUkJy3WRF2sGhos0k=; b=1ZUnXCqm9Ygp5n0d9TCQq2XjHXLog/PKsMKEZUglaW58xdBAxzX/LavWo9t+lD2rY9 WGMSdw5x05lmD/wfv9GJdH7w3I8skwMJV1oSG9k+wmyxV35bKOlHHaDfy6uzYOn7N2I0 JtnH+c7KWKMESzBt+uu3RNlNl0AejiopyMWVMwZrvwSAXw1LHBr9r6+0McDxEk0eIMxP /imXFdKB95J8p6p0rM3pcz/gqfP6Hg+KXpJFczkP5+glST1nCKBFjjfXNCs8EoLOmtS3 A4ftAHCbd0pIumfhI3VvelIZj2SA20rKOLsber6u5HaDwbusuegl+mxlO19HlsF2zD4d 5cRg== 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=tZ6kYQOyqlcLY41KMvC+2wJ1fHYUkJy3WRF2sGhos0k=; b=eD8IH7YASulvLOPeCGv/s2/pACSrW9FJxpo48i4VyLiv01CyeOYCCsZqwNpmKfrjuP 5qi3yftmaNqjLp/3suz/WN3U8mJgBMH3eij6U9RsRNENxUNPHpoN5EItsWJ5iGrvOmWD pACQQtM77kDNFb4Qi4wHR1/klw2aQI/ATXOjsLBR9i1TPW0Iu85oc1iTTHfTJQWpk+zp pOWrTdynZlByyWnHArlEB3njuFvlfYWNWOoIA4d2+6hE+vhenYCWwXopBLjBIzZJSMW3 9v9bDfhvxhdCHK0coPlrhWDHCB1OD1WY3B5UYy9VkwjoGOaEKTNaCn6ck9f9WrNtUlHc rlyA== X-Gm-Message-State: ALoCoQku3eTZcxtAkBjjBh3ewB+90fpWrBP5Dk/aiCgrcnyc6wvSbyn/cozKDTHIY030r7uxPw3QdQp9XQhF6rho4CnWbSXI3w== X-Received: by 10.66.124.135 with SMTP id mi7mr3237228pab.102.1449563805652; Tue, 08 Dec 2015 00:36:45 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id fm1sm3049954pab.6.2015.12.08.00.36.41 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Dec 2015 00:36:45 -0800 (PST) From: Baolin Wang To: balbi@ti.com, 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 v7 3/4] gadget: Integrate with the usb gadget supporting for usb charger Date: Tue, 8 Dec 2015 16:36:03 +0800 Message-Id: <52ff0259aac20c001087d57ab17a3babd2853414.1449562597.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 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/usb/gadget/charger.c b/drivers/usb/gadget/charger.c index 82a9973..76e1a6f 100644 --- a/drivers/usb/gadget/charger.c +++ b/drivers/usb/gadget/charger.c @@ -272,7 +272,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, @@ -479,6 +483,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); @@ -635,6 +662,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 */ @@ -655,7 +683,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)