From: Ben Dooks <ben-linux@fluff.org>
To: linux-samsung-soc@vger.kernel.org, linux-usb@vger.kernel.org
Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>,
Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 1/6] USB: s3c_hsotg: Add support for external USB clock
Date: Tue, 25 May 2010 05:36:48 +0100 [thread overview]
Message-ID: <1274762213-3404-2-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1274762213-3404-1-git-send-email-ben-linux@fluff.org>
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
The PLL that drives the USB clock supports 3 input clocks: 12, 24 and 48Mhz.
This patch adds support to the USB driver for setting the correct register bit
according to the given clock.
This depends on the following patch:
[PATCH] ARM: S3C64XX: Add USB external clock definition
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
drivers/usb/gadget/s3c-hsotg.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 1f73b48..dce9366 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/slab.h>
+#include <linux/clk.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
@@ -2699,6 +2700,7 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg,
*/
static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
{
+ struct clk *xusbxti;
u32 osc;
writel(0, S3C_PHYPWR);
@@ -2706,6 +2708,23 @@ static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;
+ xusbxti = clk_get(hsotg->dev, "xusbxti");
+ if (xusbxti && !IS_ERR(xusbxti)) {
+ switch (clk_get_rate(xusbxti)) {
+ case 12000000:
+ osc |= S3C_PHYCLK_CLKSEL_12M;
+ break;
+ case 24000000:
+ osc |= S3C_PHYCLK_CLKSEL_24M;
+ break;
+ default:
+ case 48000000:
+ /* default reference clock */
+ break;
+ }
+ clk_put(xusbxti);
+ }
+
writel(osc | 0x10, S3C_PHYCLK);
/* issue a full set of resets to the otg and core */
--
1.6.3.3
next prev parent reply other threads:[~2010-05-25 4:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-25 4:36 s3c-hsotg driver updates / fixes Ben Dooks
2010-05-25 4:36 ` Ben Dooks [this message]
2010-05-25 4:36 ` [PATCH 2/6] USB: s3c_hsotg: define USB_GADGET_DUALSPEED in Kconfig Ben Dooks
[not found] ` <1274762213-3404-3-git-send-email-ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
2010-05-25 4:36 ` [PATCH 3/6] USB: s3c-hsotg: Ensure TX FIFO addresses setup when initialising FIFOs Ben Dooks
2010-05-25 4:36 ` [PATCH 4/6] USB: s3c-hsotg: SoftDisconnect minimum 3ms Ben Dooks
2010-05-25 4:36 ` [PATCH 5/6] USB: s3c-hsotg: Ensure FIFOs are fully flushed after layout Ben Dooks
2010-05-25 4:36 ` [PATCH 6/6] USB: s3c-hsotg: Enable soft disconnect during initialization Ben Dooks
[not found] ` <1274762213-3404-6-git-send-email-ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
2010-05-25 5:32 ` [PATCH 5/6] USB: s3c-hsotg: Ensure FIFOs are fully flushed after layout Maulik Mankad
2010-05-25 5:30 ` [PATCH 3/6] USB: s3c-hsotg: Ensure TX FIFO addresses setup when initialising FIFOs Maulik Mankad
[not found] ` <AANLkTin6EEiXOGyZjmOEd39g_eUxGBJEV2yMdnwtAQbh-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-05-25 8:20 ` Ben Dooks
2010-06-01 20:41 ` [PATCH 1/6] USB: s3c_hsotg: Add support for external USB clock Greg KH
2010-06-01 21:40 ` Maurus Cuelenaere
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=1274762213-3404-2-git-send-email-ben-linux@fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mcuelenaere@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.