From patchwork Wed Nov 28 03:06:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Xie X-Patchwork-Id: 1813841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 64851DF26F for ; Wed, 28 Nov 2012 03:18:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TdY6Z-00045h-A1; Wed, 28 Nov 2012 03:14:33 +0000 Received: from na3sys009aog132.obsmtp.com ([74.125.149.250]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TdXzH-00009e-6H for linux-arm-kernel@lists.infradead.org; Wed, 28 Nov 2012 03:07:02 +0000 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob132.postini.com ([74.125.148.12]) with SMTP ID DSNKULV/zvXYZsT2bd0nqz2ikYfDeXbMUOK3@postini.com; Tue, 27 Nov 2012 19:06:59 PST Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 27 Nov 2012 19:06:38 -0800 Received: from localhost (unknown [10.38.36.205]) by maili.marvell.com (Postfix) with ESMTP id 835374E513; Tue, 27 Nov 2012 19:06:38 -0800 (PST) From: Chao Xie To: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, haojian.zhuang@gmail.com, stern@rowland.harvard.edu, balbi@ti.com, gregkh@linuxfoundation.org, xiechao.mail@gmail.com Subject: [V2 PATCH 19/27] usb: phy: mv_usb2_phy: add externel chip support Date: Tue, 27 Nov 2012 22:06:18 -0500 Message-Id: <1354071986-28032-20-git-send-email-chao.xie@marvell.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1354071986-28032-1-git-send-email-chao.xie@marvell.com> References: <1354071986-28032-1-git-send-email-chao.xie@marvell.com> X-OriginalArrivalTime: 28 Nov 2012 03:06:38.0621 (UTC) FILETIME=[620674D0:01CDCD15] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121127_220659_531785_C976570F X-CRM114-Status: GOOD ( 14.85 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.250 listed in list.dnswl.org] 1.5 URIBL_RHS_DOB Contains an URI of a new domain (Day Old Bread) [URIs: marvell.com] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org For the vbus and idpin detection. It may be completed by some external chip, for example the pmic chip 88pm860x in driver/mfd can do it. Although the usb controller can detect the vbus and id pin, but it need clock on and PHY enabled to detect the vbus/idpin. It will increase the power. Using the external chip to detect vbus/idpin can save the power. Signed-off-by: Chao Xie --- drivers/usb/phy/mv_usb2_phy.c | 54 +++++++++++++++++++++++++++++ include/linux/platform_data/mv_usb.h | 15 +++----- include/linux/usb/mv_usb2.h | 62 ++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 10 deletions(-) diff --git a/drivers/usb/phy/mv_usb2_phy.c b/drivers/usb/phy/mv_usb2_phy.c index ed82bf3..0f81dca 100644 --- a/drivers/usb/phy/mv_usb2_phy.c +++ b/drivers/usb/phy/mv_usb2_phy.c @@ -136,6 +136,53 @@ struct mv_usb2_phy *mv_usb2_get_phy(void) } EXPORT_SYMBOL(mv_usb2_get_phy); +int mv_usb2_register_notifier(struct mv_usb2_phy *phy, + struct notifier_block *nb) +{ + int ret; + + if (!phy) + return -ENODEV; + + ret = atomic_notifier_chain_register(phy->extern_chip.head, nb); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(mv_usb2_register_notifier); + +int mv_usb2_unregister_notifier(struct mv_usb2_phy *phy, + struct notifier_block *nb) +{ + int ret; + + if (!phy) + return -ENODEV; + + ret = atomic_notifier_chain_unregister(phy->extern_chip.head, nb); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(mv_usb2_unregister_notifier); + +int mv_usb2_notify(struct mv_usb2_phy *phy, unsigned long val, void *v) +{ + int ret; + + if (!phy) + return -ENODEV; + + ret = atomic_notifier_call_chain(phy->extern_chip.head, val, v); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(mv_usb2_notify); + static unsigned int u2o_get(void __iomem *base, unsigned int offset) { return readl_relaxed(base + offset); @@ -414,6 +461,13 @@ static int __devinit usb_phy_probe(struct platform_device *pdev) mv_phy->init = usb_phy_init; mv_phy->shutdown = usb_phy_shutdown; + mv_phy->extern_chip.head = devm_kzalloc(&pdev->dev, + sizeof(*mv_phy->extern_chip.head), + GFP_KERNEL); + if (mv_phy->extern_chip.head == NULL) + return -ENOMEM; + ATOMIC_INIT_NOTIFIER_HEAD(mv_phy->extern_chip.head); + platform_set_drvdata(pdev, mv_phy); the_phy = mv_phy; diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h index fd3d1b4..dc25d60 100644 --- a/include/linux/platform_data/mv_usb.h +++ b/include/linux/platform_data/mv_usb.h @@ -28,16 +28,13 @@ enum { VBUS_HIGH = 1 << 0, }; -struct mv_usb_addon_irq { - unsigned int irq; - int (*poll)(void); -}; - +#define MV_USB_HAS_VBUS_DETECTION (1 << 0) +#define MV_USB_HAS_IDPIN_DETECTION (1 << 1) struct mv_usb_platform_data { unsigned int clknum; char **clkname; - struct mv_usb_addon_irq *id; /* Only valid for OTG. ID pin change*/ - struct mv_usb_addon_irq *vbus; /* valid for OTG/UDC. VBUS change*/ + + unsigned int extern_attr; /* only valid for HCD. OTG or Host only*/ unsigned int mode; @@ -45,9 +42,7 @@ struct mv_usb_platform_data { /* This flag is used for that needs id pin checked by otg */ unsigned int disable_otg_clock_gating:1; /* Force a_bus_req to be asserted */ - unsigned int otg_force_a_bus_req:1; - - int (*set_vbus)(unsigned int vbus); + unsigned int otg_force_a_bus_req:1; }; struct mv_usb_phy_platform_data { diff --git a/include/linux/usb/mv_usb2.h b/include/linux/usb/mv_usb2.h index 5d3d7bd..3e34b94 100644 --- a/include/linux/usb/mv_usb2.h +++ b/include/linux/usb/mv_usb2.h @@ -17,6 +17,33 @@ #include +enum { + EVENT_VBUS, + EVENT_ID, +}; + +struct pxa_usb_vbus_ops { + int (*get_vbus)(unsigned int *level); + int (*set_vbus)(unsigned int level); + int (*init)(void); +}; + +struct pxa_usb_idpin_ops { + int (*get_idpin)(unsigned int *level); + int (*init)(void); +}; + +struct pxa_usb_extern_ops { + struct pxa_usb_vbus_ops vbus; + struct pxa_usb_idpin_ops idpin; +}; + +struct mv_usb2_extern_chip { + unsigned int id; + struct pxa_usb_extern_ops ops; + struct atomic_notifier_head *head; +}; + struct mv_usb2_phy { struct platform_device *pdev; struct mutex phy_lock; @@ -26,10 +53,45 @@ struct mv_usb2_phy { struct clk **clks; unsigned int clks_num; + struct mv_usb2_extern_chip extern_chip; + int (*init)(struct mv_usb2_phy *mv_phy); void (*shutdown)(struct mv_usb2_phy *mv_phy); }; struct mv_usb2_phy *mv_usb2_get_phy(void); +#define mv_usb2_has_extern_call(phy, o, f, arg...)( \ +{ \ + int ret; \ + ret = (!phy ? 0 : ((phy->extern_chip.ops.o.f) ? \ + 1 : 0)); \ + ret; \ +} \ +) + +#define mv_usb2_extern_call(phy, o, f, args...)( \ +{ \ + int ret; \ + ret = (!phy ? -ENODEV : ((phy->extern_chip.ops.o.f) ? \ + phy->extern_chip.ops.o.f(args) : -ENOIOCTLCMD));\ + ret; \ +} \ +) + +#define mv_usb2_set_extern_call(phy, o, f, p)( \ +{ \ + int ret; \ + ret = !phy ? -ENODEV : ((phy->extern_chip.ops.o.f) ? \ + -EINVAL : ({phy->extern_chip.ops.o.f = p; 0; })); \ + ret; \ +} \ +) + +extern int mv_usb2_register_notifier(struct mv_usb2_phy *phy, + struct notifier_block *nb); +extern int mv_usb2_unregister_notifier(struct mv_usb2_phy *phy, + struct notifier_block *nb); +extern int mv_usb2_notify(struct mv_usb2_phy *phy, unsigned long val, void *v); + #endif