From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757962AbaEPQXY (ORCPT ); Fri, 16 May 2014 12:23:24 -0400 Received: from top.free-electrons.com ([176.31.233.9]:41816 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757907AbaEPQXT (ORCPT ); Fri, 16 May 2014 12:23:19 -0400 From: Gregory CLEMENT To: "Kishon Vijay Abraham I" , Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT Cc: Thomas Petazzoni , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org, Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Grant Likely , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH 4/5] usb: host: xhci-plat: add optional PHY support Date: Fri, 16 May 2014 18:22:55 +0200 Message-Id: <1400257376-13251-4-git-send-email-gregory.clement@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1400257376-13251-1-git-send-email-gregory.clement@free-electrons.com> References: <1400257376-13251-1-git-send-email-gregory.clement@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit extends the xhci-plat so that it can optionally be passed a reference to a PHY through the Device Tree. It will be useful for the Armada 375 SoCs. If no PHY is provided then the behavior of the driver is unchanged. As for the clock, to achieve this, it adds a 'struct phy *' member in xhci_hcd. While only used for now in xhci-plat, here again, it might be used by other drivers in the future. Signed-off-by: Gregory CLEMENT --- drivers/usb/host/xhci-plat.c | 29 ++++++++++++++++++++++++++++- drivers/usb/host/xhci.h | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 0f5f4c8f5bf6..34239b582621 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,7 @@ static int xhci_plat_probe(struct platform_device *pdev) struct resource *res; struct usb_hcd *hcd; struct clk *clk; + struct phy *phy; int ret; int irq; @@ -160,9 +162,23 @@ static int xhci_plat_probe(struct platform_device *pdev) goto unmap_registers; } + phy = devm_phy_optional_get(&pdev->dev, "usb"); + if (IS_ERR(phy)) { + ret = PTR_ERR(phy); + goto disable_clk; + } else { + ret = phy_init(phy); + if (ret) + goto disable_phy; + + ret = phy_power_on(phy); + if (ret) + goto disable_phy; + } + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) - goto disable_clk; + goto power_off_phy; device_wakeup_enable(hcd->self.controller); @@ -198,6 +214,12 @@ put_usb3_hcd: dealloc_usb2_hcd: usb_remove_hcd(hcd); +power_off_phy: + if (!IS_ERR(phy)) + phy_power_off(phy); +disable_phy: + if (!IS_ERR(phy)) + phy_exit(phy); disable_clk: if (!IS_ERR(clk)) clk_disable_unprepare(clk); @@ -219,6 +241,7 @@ static int xhci_plat_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; + struct phy *phy = xhci->phy; usb_remove_hcd(xhci->shared_hcd); usb_put_hcd(xhci->shared_hcd); @@ -226,6 +249,10 @@ static int xhci_plat_remove(struct platform_device *dev) usb_remove_hcd(hcd); if (!IS_ERR(clk)) clk_disable_unprepare(clk); + if (!IS_ERR(phy)) { + phy_power_off(phy); + phy_exit(phy); + } iounmap(hcd->regs); release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 003dc094ca37..4d2e084f6d2d 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1480,6 +1480,8 @@ struct xhci_hcd { struct msix_entry *msix_entries; /* optional clock */ struct clk *clk; + /* optional phy */ + struct phy *phy; /* data structures */ struct xhci_device_context_array *dcbaa; struct xhci_ring *cmd_ring; -- 1.8.1.2