mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Roger Quadros <rogerq@ti.com>
To: <tony@atomide.com>
Cc: <linux@arm.linux.org.uk>, <sameo@linux.intel.com>, <balbi@ti.com>,
	<stern@rowland.harvard.edu>, <gregkh@linuxfoundation.org>,
	<eballetbo@gmail.com>, <javier@dowhile0.org>,
	<sshtylyov@mvista.com>, <linux-usb@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v2 03/30] usb: phy: nop: Manage PHY clock
Date: Mon, 28 Jan 2013 13:30:04 +0200	[thread overview]
Message-ID: <1359372631-8180-4-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1359372631-8180-1-git-send-email-rogerq@ti.com>

If the PHY has a clock associated to it then manage the clock.
We just enable the clock in .init() and disable it in .shutdown().

Add clk_rate parameter in platform data and configure the
clock rate during probe if supplied.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/usb/otg/nop-usb-xceiv.c   |   54 ++++++++++++++++++++++++++++++++++++-
 include/linux/usb/nop-usb-xceiv.h |    1 +
 2 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c
index 7ffb0c8..849eb9d 100644
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
@@ -32,10 +32,12 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/nop-usb-xceiv.h>
 #include <linux/slab.h>
+#include <linux/clk.h>
 
 struct nop_usb_xceiv {
 	struct usb_phy		phy;
 	struct device		*dev;
+	struct clk		*clk;
 };
 
 static struct platform_device *pd;
@@ -64,6 +66,24 @@ static int nop_set_suspend(struct usb_phy *x, int suspend)
 	return 0;
 }
 
+static int nop_init(struct usb_phy *phy)
+{
+	struct nop_usb_xceiv *nop = dev_get_drvdata(phy->dev);
+
+	if (!IS_ERR(nop->clk))
+		clk_enable(nop->clk);
+
+	return 0;
+}
+
+static void nop_shutdown(struct usb_phy *phy)
+{
+	struct nop_usb_xceiv *nop = dev_get_drvdata(phy->dev);
+
+	if (!IS_ERR(nop->clk))
+		clk_disable(nop->clk);
+}
+
 static int nop_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
 {
 	if (!otg)
@@ -111,10 +131,34 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev)
 	if (pdata)
 		type = pdata->type;
 
+	nop->clk = devm_clk_get(&pdev->dev, "main_clk");
+	if (IS_ERR(nop->clk)) {
+		dev_dbg(&pdev->dev, "Can't get phy clock: %ld\n",
+					PTR_ERR(nop->clk));
+	}
+
+	if (!IS_ERR(nop->clk) && pdata && pdata->clk_rate) {
+		err = clk_set_rate(nop->clk, pdata->clk_rate);
+		if (err) {
+			dev_err(&pdev->dev, "Error setting clock rate\n");
+			return err;
+		}
+	}
+
+	if (!IS_ERR(nop->clk)) {
+		err = clk_prepare(nop->clk);
+		if (err) {
+			dev_err(&pdev->dev, "Error preparing clock\n");
+			return err;
+		}
+	}
+
 	nop->dev		= &pdev->dev;
 	nop->phy.dev		= nop->dev;
 	nop->phy.label		= "nop-xceiv";
 	nop->phy.set_suspend	= nop_set_suspend;
+	nop->phy.init		= nop_init;
+	nop->phy.shutdown	= nop_shutdown;
 	nop->phy.state		= OTG_STATE_UNDEFINED;
 
 	nop->phy.otg->phy		= &nop->phy;
@@ -125,7 +169,7 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev)
 	if (err) {
 		dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
 			err);
-		return err;
+		goto err_add;
 	}
 
 	platform_set_drvdata(pdev, nop);
@@ -133,12 +177,20 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev)
 	ATOMIC_INIT_NOTIFIER_HEAD(&nop->phy.notifier);
 
 	return 0;
+
+err_add:
+	if (!IS_ERR(nop->clk))
+		clk_unprepare(nop->clk);
+	return err;
 }
 
 static int nop_usb_xceiv_remove(struct platform_device *pdev)
 {
 	struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);
 
+	if (!IS_ERR(nop->clk))
+		clk_unprepare(nop->clk);
+
 	usb_remove_phy(&nop->phy);
 
 	platform_set_drvdata(pdev, NULL);
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/nop-usb-xceiv.h
index 28884c7..3265b61 100644
--- a/include/linux/usb/nop-usb-xceiv.h
+++ b/include/linux/usb/nop-usb-xceiv.h
@@ -5,6 +5,7 @@
 
 struct nop_usb_xceiv_platform_data {
 	enum usb_phy_type type;
+	unsigned long clk_rate;
 };
 
 #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
-- 
1.7.4.1


  parent reply	other threads:[~2013-01-28 11:31 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-28 11:30 [PATCH v2 00/30] USB: omap-ehci: Move PHY management to PHY driver Roger Quadros
2013-01-28 11:30 ` [PATCH 01/30] USB: EHCI: split ehci-omap out to a separate driver Roger Quadros
2013-02-05  9:11   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 02/30] usb: phy: nop: use devm_kzalloc() Roger Quadros
2013-02-05  9:14   ` Felipe Balbi
2013-01-28 11:30 ` Roger Quadros [this message]
2013-02-05  9:17   ` [PATCH v2 03/30] usb: phy: nop: Manage PHY clock Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 04/30] usb: phy: nop: Handle power supply regulator for the PHY Roger Quadros
2013-02-05  9:20   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 05/30] usb: phy: nop: Handle RESET " Roger Quadros
2013-02-05  9:22   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 06/30] usb: phy: nop: use new PHY API to register PHY Roger Quadros
2013-02-05  9:23   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 07/30] mfd: omap-usb-host: update nports in platform_data Roger Quadros
2013-02-05  9:24   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 08/30] mfd: omap-usb-host: Remove PHY reset handling code Roger Quadros
2013-02-05  9:25   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 09/30] USB: ehci-omap: Use devm_request_and_ioremap() Roger Quadros
2013-01-28 15:17   ` Alan Stern
2013-01-28 15:20     ` Russell King - ARM Linux
2013-01-29 15:34       ` Alan Stern
2013-01-29 16:01         ` Russell King - ARM Linux
2013-01-29 22:08           ` Greg KH
2013-02-05  9:25   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 10/30] USB: ehci-omap: Use PHY APIs to get the PHY device and put it out of suspend Roger Quadros
2013-01-28 15:40   ` Alan Stern
2013-01-28 15:58     ` Roger Quadros
2013-01-29  9:50   ` [PATCH v3 " Roger Quadros
2013-01-29  9:57     ` Felipe Balbi
2013-01-29 10:08       ` Roger Quadros
2013-01-29 10:12         ` Felipe Balbi
2013-01-29 15:30     ` Alan Stern
2013-01-29 15:33       ` Roger Quadros
2013-02-05  9:13       ` Felipe Balbi
2013-02-05  9:26       ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 11/30] usb: ehci-omap: Remove PHY reset handling code Roger Quadros
2013-01-28 17:34   ` Alan Stern
2013-02-05  9:27     ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 12/30] usb: ehci-omap: Remove PHY regulator " Roger Quadros
2013-01-28 17:35   ` Alan Stern
2013-02-05  9:27     ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 13/30] ARM: OMAP2+: omap4panda: Provide USB Host's PHY platform data Roger Quadros
2013-02-05  9:28   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH v2 14/30] ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes Roger Quadros
2013-02-05  9:31   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 15/30] ARM: OMAP3: Beagle: " Roger Quadros
2013-02-05  9:31   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 16/30] ARM: OMAP3: 3430SDP: " Roger Quadros
2013-02-05  9:31   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 17/30] ARM: OMAP3: 3630SDP: " Roger Quadros
2013-02-05  9:31   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 18/30] ARM: OMAP: AM3517crane: " Roger Quadros
2013-02-05  9:32   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 19/30] ARM: OMAP: AM3517evm: " Roger Quadros
2013-02-05  9:32   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 20/30] ARM: OMAP3: cm-t35: " Roger Quadros
2013-02-05  9:32   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 21/30] ARM: OMAP3: cm-t3517: " Roger Quadros
2013-02-05  9:32   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 22/30] ARM: OMAP: devkit8000: " Roger Quadros
2013-02-05  9:33   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 23/30] ARM: OMAP3: igep0020: " Roger Quadros
2013-02-05  9:33   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 24/30] ARM: OMAP3: omap3evm: " Roger Quadros
2013-02-05  9:33   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 25/30] ARM: OMAP3: omap3pandora: " Roger Quadros
2013-02-05  9:33   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 26/30] ARM: OMAP3: omap3stalker: " Roger Quadros
2013-02-05  9:34   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 27/30] ARM: OMAP3: omap3touchbook: " Roger Quadros
2013-02-05  9:34   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 28/30] ARM: OMAP3: overo: " Roger Quadros
2013-02-05  9:40   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 29/30] ARM: OMAP: zoom: " Roger Quadros
2013-02-05  9:40   ` Felipe Balbi
2013-01-28 11:30 ` [PATCH 30/30] ARM: OMAP: USB: Remove unused fields from struct usbhs_omap_platform_data Roger Quadros
2013-02-05  9:40   ` Felipe Balbi
2013-01-30 12:08 ` [PATCH v2 00/30] USB: omap-ehci: Move PHY management to PHY driver Mohammed, Afzal
2013-01-30 12:48   ` Roger Quadros
2013-01-30 13:12     ` Mohammed, Afzal
2013-01-30 13:15       ` Roger Quadros
2013-01-30 13:15     ` Felipe Balbi
2013-01-30 13:19       ` Mohammed, Afzal
2013-02-01 14:21         ` Mohammed, Afzal
2013-02-01 14:25           ` Roger Quadros
2013-02-01 14:27             ` Mohammed, Afzal
2013-02-01 14:31               ` Roger Quadros
2013-02-01 14:35                 ` Mohammed, Afzal
2013-02-01 14:58                   ` Roger Quadros
2013-02-04 14:35 ` [PATCH v2 09/31] USB: ehci-omap: Use devm_ioremap_resource() Roger Quadros
2013-02-04 21:11   ` Alan Stern
2013-02-04 14:46 ` [PATCH 31/31] USB: ehci-omap: Select NOP USB transceiver driver Roger Quadros
2013-02-04 21:03   ` Alan Stern
2013-02-05  9:41     ` Felipe Balbi
2013-02-05 11:28 ` [PATCH v2 00/30] USB: omap-ehci: Move PHY management to PHY driver Roger Quadros
2013-02-05 16:58   ` Greg KH
2013-02-05 17:17     ` Tony Lindgren
2013-02-06  9:49       ` Roger Quadros
2013-02-06 17:11         ` Tony Lindgren
2013-02-06 17:48           ` Greg KH
2013-02-07 15:28           ` Roger Quadros

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359372631-8180-4-git-send-email-rogerq@ti.com \
    --to=rogerq@ti.com \
    --cc=balbi@ti.com \
    --cc=eballetbo@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=javier@dowhile0.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=sameo@linux.intel.com \
    --cc=sshtylyov@mvista.com \
    --cc=stern@rowland.harvard.edu \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®