From patchwork Tue Feb 19 05:53:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 221620 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4647F2C0090 for ; Tue, 19 Feb 2013 16:54:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757532Ab3BSFyV (ORCPT ); Tue, 19 Feb 2013 00:54:21 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:50915 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757183Ab3BSFyO (ORCPT ); Tue, 19 Feb 2013 00:54:14 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r1J5rseA020927; Mon, 18 Feb 2013 23:53:55 -0600 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r1J5rhBr014056; Tue, 19 Feb 2013 11:23:54 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Tue, 19 Feb 2013 11:23:43 +0530 Received: from a0393678lt.apr.dhcp.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id r1J5rS32003844; Tue, 19 Feb 2013 11:23:42 +0530 From: Kishon Vijay Abraham I To: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 3/5] usb: otg: twl4030: use the new generic PHY framework Date: Tue, 19 Feb 2013 11:23:16 +0530 Message-ID: <1361253198-7401-4-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361253198-7401-1-git-send-email-kishon@ti.com> References: <1361253198-7401-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Used the generic PHY framework API to create the PHY. twl4030_usb_suspend and twl4030_usb_resume is added to phy_ops in order to align with the new framework. However using the old USB PHY library cannot be completely removed because OTG is intertwined with PHY and moving to the new framework completely will break OTG. Once we have a separate OTG state machine, we can get rid of the USB PHY library. Signed-off-by: Kishon Vijay Abraham I --- drivers/usb/otg/twl4030-usb.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c index a994715..b79c319 100644 --- a/drivers/usb/otg/twl4030-usb.c +++ b/drivers/usb/otg/twl4030-usb.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,7 @@ struct twl4030_usb { struct usb_phy phy; + struct phy_descriptor desc; struct device *dev; /* TWL4030 internal USB regulator supplies */ @@ -167,6 +169,7 @@ struct twl4030_usb { /* internal define on top of container_of */ #define phy_to_twl(x) container_of((x), struct twl4030_usb, phy) +#define desc_to_twl(x) container_of((x), struct twl4030_usb, desc) /*-------------------------------------------------------------------------*/ @@ -575,10 +578,38 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host) return 0; } +static int twl4030_usb_suspend(struct phy_descriptor *desc) +{ + struct twl4030_usb *twl = desc_to_twl(desc); + + twl4030_phy_suspend(twl, 1); + + return 0; +} + +static int twl4030_usb_resume(struct phy_descriptor *desc) +{ + struct twl4030_usb *twl = desc_to_twl(desc); + + if (!twl->asleep) + return -EBUSY; + __twl4030_phy_resume(twl); + twl->asleep = 0; + + return 0; +} + +static struct phy_ops ops = { + .suspend = twl4030_usb_suspend, + .resume = twl4030_usb_resume, + .owner = THIS_MODULE, +}; + static int twl4030_usb_probe(struct platform_device *pdev) { struct twl4030_usb_data *pdata = pdev->dev.platform_data; struct twl4030_usb *twl; + struct phy *phy; int status, err; struct usb_otg *otg; struct device_node *np = pdev->dev.of_node; @@ -617,6 +648,16 @@ static int twl4030_usb_probe(struct platform_device *pdev) otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral; + twl->desc.ops = &ops; + twl->desc.label = "twl4030"; + twl->desc.of_node = pdev->dev.of_node; + + phy = devm_phy_create(twl->dev, &twl->desc); + if (IS_ERR(phy)) { + dev_dbg(&pdev->dev, "Failed to create PHY\n"); + return PTR_ERR(phy); + } + /* init spinlock for workqueue */ spin_lock_init(&twl->lock);