From patchwork Mon Nov 16 06:33:33 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: 56570 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1142803lbb; Sun, 15 Nov 2015 22:34:33 -0800 (PST) X-Received: by 10.68.204.133 with SMTP id ky5mr52467524pbc.134.1447655670970; Sun, 15 Nov 2015 22:34:30 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xn5si48496795pbb.194.2015.11.15.22.34.30; Sun, 15 Nov 2015 22:34:30 -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 S1751871AbbKPGeZ (ORCPT + 28 others); Mon, 16 Nov 2015 01:34:25 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33999 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728AbbKPGeR (ORCPT ); Mon, 16 Nov 2015 01:34:17 -0500 Received: by padhx2 with SMTP id hx2so165060212pad.1 for ; Sun, 15 Nov 2015 22:34:17 -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=V67gDdssGDQjIBJ0SYRG1fFW4BUQnWS0tRumRkfuQDE=; b=sV+w1YgZLoBzyo/rPqYUyFbp+K5J+0aaOjt3fR0HhS2cPRN0TOukgQinbq/zvGNmxy /8WSqVtq5xt4pZe/plp/VsYGD8ddffwZkpNZPB7s/iyFaZ5J4Ch26e4+S0z9TyVD5En0 kroYPu8vNSgMmYu6vd26Iv0opi+8qx3t3bxYuiYF1ObEkel8gBTGmFYJoG3X6czyJj84 dSb3RoZc67TXHQIj9uAHhwAy7VDDXWKckYFZy1+SE6T4Wq/o0G4+KQGwzKxkS+iorsDk 5mUgoD5VIsoNc4e+ROUDJtLB0+bsF9x5Q/DiVMQjwf9+dEreX+DyewM3mVe9xlrWCTTo 3Ngw== 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=V67gDdssGDQjIBJ0SYRG1fFW4BUQnWS0tRumRkfuQDE=; b=iz77ZLsGXz1pvH5YCVCT7fTu2O4b9Ti+EYRpzNJ3U3KRw7WwV7qGIiyFDjC9dBs7M1 CUOttVlZySlrVAIivaYuncOj0HovlQ3KYLwFHol2vA6qhw+yOtmBXV+gw+sEDLt+sirj tuf2tRjSp+1O5A4stXtZL36P0PufR+GdmJfy5itEaJY55O9zHCo4jLiYXlE9UF+bItpx UFMjdKG6QxOM2k8IRAk+UEytl5l5Zo9pnXTsWxm68uRKAd7Y4aT+Esvz0NdMehE+pvvc DFrdBf9Ki3s9Rsk2Izu/TiAIzxxLJrREFKEZjSYR756KEmEb65nc5RguvTRhx6tJ/41q dYKw== X-Gm-Message-State: ALoCoQnJEgQDV5mMjDY58m9YHlUy2aW67yVlW26E6pU/uMDszx3NzT5KjVGu9FHEhp29RLMARlQr X-Received: by 10.66.55.72 with SMTP id q8mr25913222pap.136.1447655657353; Sun, 15 Nov 2015 22:34:17 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id l9sm32535196pbq.43.2015.11.15.22.34.12 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Nov 2015 22:34:16 -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 v6 3/4] gadget: Integrate with the usb gadget supporting for usb charger Date: Mon, 16 Nov 2015 14:33:33 +0800 Message-Id: <4c19c2e5da0608598dd3c0d6d290a0658c055bd4.1447654606.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 921f8e2..5d3cda6 100644 --- a/drivers/usb/gadget/charger.c +++ b/drivers/usb/gadget/charger.c @@ -183,7 +183,11 @@ int usb_charger_unregister_notify(struct usb_charger *uchger, 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, @@ -385,6 +389,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; } @@ -540,6 +567,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 */ @@ -560,7 +588,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)