Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755758Ab3C1Fos (ORCPT ); Thu, 28 Mar 2013 01:44:48 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49525 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755692Ab3C1Foq (ORCPT ); Thu, 28 Mar 2013 01:44:46 -0400 From: Kishon Vijay Abraham I To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 2/6] usb: phy: omap-usb2: use the new generic PHY framework Date: Thu, 28 Mar 2013 11:13:24 +0530 Message-ID: <1364449408-9510-3-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364449408-9510-1-git-send-email-kishon@ti.com> References: <1364449408-9510-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2809 Lines: 97 Used the generic PHY framework API to create the PHY. omap_usb2_suspend is split into omap_usb_suspend and omap_usb_resume 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 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/phy/omap-usb2.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/omap-usb2.c index 844ab68..819ba71 100644 --- a/drivers/usb/phy/omap-usb2.c +++ b/drivers/usb/phy/omap-usb2.c @@ -28,6 +28,7 @@ #include #include #include +#include /** * omap_usb2_set_comparator - links the comparator present in the sytem with @@ -119,9 +120,48 @@ static int omap_usb2_suspend(struct usb_phy *x, int suspend) return 0; } +static int omap_usb_suspend(struct phy *x) +{ + struct omap_usb *phy = dev_get_drvdata(&x->dev); + + if (!phy->is_suspended) { + omap_control_usb_phy_power(phy->control_dev, 0); + pm_runtime_put_sync(phy->dev); + phy->is_suspended = 1; + } + + return 0; +} + +static int omap_usb_resume(struct phy *x) +{ + u32 ret; + struct omap_usb *phy = dev_get_drvdata(&x->dev); + + if (phy->is_suspended) { + ret = pm_runtime_get_sync(phy->dev); + if (ret < 0) { + dev_err(phy->dev, "get_sync failed with err %d\n", + ret); + return ret; + } + omap_control_usb_phy_power(phy->control_dev, 1); + phy->is_suspended = 0; + } + + return 0; +} + +static struct phy_ops ops = { + .suspend = omap_usb_suspend, + .resume = omap_usb_resume, + .owner = THIS_MODULE, +}; + static int omap_usb2_probe(struct platform_device *pdev) { struct omap_usb *phy; + struct phy *generic_phy; struct usb_otg *otg; phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL); @@ -144,6 +184,13 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.otg = otg; phy->phy.type = USB_PHY_TYPE_USB2; + generic_phy = devm_phy_create(phy->dev, "omap-usb2", pdev->dev.of_node, + USB_PHY_TYPE_USB2, &ops, phy); + if (IS_ERR(generic_phy)) { + dev_dbg(&pdev->dev, "Failed to create PHY\n"); + return PTR_ERR(generic_phy); + } + phy->control_dev = omap_get_control_dev(); if (IS_ERR(phy->control_dev)) { dev_dbg(&pdev->dev, "Failed to get control device\n"); -- 1.7.10.4 -- 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/