From patchwork Thu Aug 6 07:03:49 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: 51993 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 75B4822A15 for ; Thu, 6 Aug 2015 07:08:34 +0000 (UTC) Received: by labkp1 with SMTP id kp1sf23976707lab.0 for ; Thu, 06 Aug 2015 00:08:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=GEgKPWl/FDQDeqMSusyoxqCb/M92zSzFdEaBacKAURE=; b=Zn/MPXMPHbhQgApMgNd8q4yYEpf+3uDA7edgAR6xu85BXgzZWgLyugHjfJuE3NlU4r S8INpifafsdgSQvKPHdJWXNhP/5Zy71srzqOEj82gg70wIM5A/MCFEz2PKdK2gT+f0Ia /GiYD+UDDg5SPnlYJszhOt+kEiZ0PKKtnAZvRUWUxYjQSxMdF8wxG1BiQQTdoC7yEQ6n dxI/zQh5dGme5efzheDbdH9ehEbrU2ry7Dt0UMgspwLINRCT9XwV/tSWG2CgirNEdRmD billdkcfDKw/mcp09CoDX+fIvE7E4CverKF6Eb/sa+1TSRkEXPVczuSCU0zqjQm2EvI+ Ibwg== X-Gm-Message-State: ALoCoQkwqRHcIMhZjNPIqvgdiKtMGoSs4lYvAN8PAhfLb9FOanQrgdgExCDyzFzyC7UF/KkVXkyb X-Received: by 10.152.27.130 with SMTP id t2mr69712lag.2.1438844913431; Thu, 06 Aug 2015 00:08:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.167 with SMTP id g7ls265685lae.75.gmail; Thu, 06 Aug 2015 00:08:33 -0700 (PDT) X-Received: by 10.112.164.4 with SMTP id ym4mr9720lbb.7.1438844913154; Thu, 06 Aug 2015 00:08:33 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id n4si4080575laj.18.2015.08.06.00.08.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Aug 2015 00:08:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbvv8 with SMTP id vv8so34965182lbb.1 for ; Thu, 06 Aug 2015 00:08:33 -0700 (PDT) X-Received: by 10.112.166.2 with SMTP id zc2mr150616lbb.29.1438844912867; Thu, 06 Aug 2015 00:08:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp764244lba; Thu, 6 Aug 2015 00:08:31 -0700 (PDT) X-Received: by 10.66.159.1 with SMTP id wy1mr294774pab.103.1438844909464; Thu, 06 Aug 2015 00:08:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pf6si9789080pbc.182.2015.08.06.00.08.28; Thu, 06 Aug 2015 00:08:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754525AbbHFHIZ (ORCPT + 4 others); Thu, 6 Aug 2015 03:08:25 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:36099 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754715AbbHFHIY (ORCPT ); Thu, 6 Aug 2015 03:08:24 -0400 Received: by pacrr5 with SMTP id rr5so20627072pac.3 for ; Thu, 06 Aug 2015 00:08:24 -0700 (PDT) X-Received: by 10.66.62.202 with SMTP id a10mr436689pas.42.1438844903895; Thu, 06 Aug 2015 00:08:23 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id si3sm5296726pac.5.2015.08.06.00.08.19 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 00:08:23 -0700 (PDT) From: Baolin Wang To: balbi@ti.com Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org, gregkh@linuxfoundation.org, peter.chen@freescale.com, sojka@merica.cz, stern@rowland.harvard.edu, andreas@gaisler.com, linux-usb@vger.kernel.org, device-mainlining@lists.linuxfoundation.org Subject: [PATCH 2/2] gadget: Support for the usb charger framework Date: Thu, 6 Aug 2015 15:03:49 +0800 Message-Id: <8fcb9ff7a8e01bec53813f0702ff606bf4982943.1438844454.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: baolin.wang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The usb charger framework is based on usb gadget, and each usb gadget can be one usb charger to set the current limitation. This patch adds a notifier mechanism for usb charger to report to usb charger when the usb gadget state is changed. Also we introduce a callback 'get_charger_type' which will implemented by user for usb gadget operations to get the usb charger type. Signed-off-by: Baolin Wang --- drivers/usb/gadget/udc/udc-core.c | 41 +++++++++++++++++++++++++++++++++++++ include/linux/usb/gadget.h | 20 ++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index d69c355..d5368088 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 @@ -127,12 +128,45 @@ void usb_gadget_giveback_request(struct usb_ep *ep, } EXPORT_SYMBOL_GPL(usb_gadget_giveback_request); +int usb_gadget_register_notify(struct usb_gadget *gadget, + struct notifier_block *nb) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&gadget->lock, flags); + ret = raw_notifier_chain_register(&gadget->nh, nb); + spin_unlock_irqrestore(&gadget->lock, flags); + + return ret; +} +EXPORT_SYMBOL_GPL(usb_gadget_register_notify); + +int usb_gadget_unregister_notify(struct usb_gadget *gadget, + struct notifier_block *nb) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&gadget->lock, flags); + ret = raw_notifier_chain_unregister(&gadget->nh, nb); + spin_unlock_irqrestore(&gadget->lock, flags); + + return ret; +} +EXPORT_SYMBOL_GPL(usb_gadget_unregister_notify); + /* ------------------------------------------------------------------------- */ static void usb_gadget_state_work(struct work_struct *work) { struct usb_gadget *gadget = work_to_gadget(work); struct usb_udc *udc = gadget->udc; + unsigned long flags; + + spin_lock_irqsave(&gadget->lock, flags); + raw_notifier_call_chain(&gadget->nh, gadget->state, gadget); + spin_unlock_irqrestore(&gadget->lock, flags); if (udc) sysfs_notify(&udc->dev.kobj, NULL, "state"); @@ -272,6 +306,8 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, dev_set_name(&gadget->dev, "gadget"); INIT_WORK(&gadget->work, usb_gadget_state_work); + RAW_INIT_NOTIFIER_HEAD(&gadget->nh); + spin_lock_init(&gadget->lock); gadget->dev.parent = parent; #ifdef CONFIG_HAS_DMA @@ -313,6 +349,10 @@ 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 err4; + return 0; err4: @@ -388,6 +428,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 4f3dfb7..f24d6ac 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -492,6 +492,7 @@ struct usb_gadget_ops { int (*udc_start)(struct usb_gadget *, struct usb_gadget_driver *); int (*udc_stop)(struct usb_gadget *); + enum usb_charger_type (*get_charger_type)(struct usb_gadget *); }; /** @@ -559,6 +560,9 @@ struct usb_gadget { struct device dev; unsigned out_epnum; unsigned in_epnum; + struct raw_notifier_head nh; + struct usb_charger *uchger; + spinlock_t lock; unsigned sg_supported:1; unsigned is_otg:1; @@ -1014,6 +1018,22 @@ extern void usb_gadget_unmap_request(struct usb_gadget *gadget, /*-------------------------------------------------------------------------*/ +/** + * Register a notifiee to get notified by any attach status changes from + * the usb gadget + */ +int usb_gadget_register_notify(struct usb_gadget *gadget, + struct notifier_block *nb); + +/*-------------------------------------------------------------------------*/ + + +/* Unregister a notifiee from the usb gadget */ +int usb_gadget_unregister_notify(struct usb_gadget *gadget, + struct notifier_block *nb); + +/*-------------------------------------------------------------------------*/ + /* utility to set gadget state properly */ extern void usb_gadget_set_state(struct usb_gadget *gadget,