linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mcuelenaere@gmail.com (Maurus Cuelenaere)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] USB: s3c_hsotg: Add support for external USB clock
Date: Fri, 11 Jun 2010 11:46:59 +0200	[thread overview]
Message-ID: <4C120613.6000507@gmail.com> (raw)
In-Reply-To: <006a01cb0949$6c7e7300$457b5900$%szyprowski@samsung.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>
---

v2: - fixes space issues
    - use MHZ define

---
 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..40ee63a 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 12*MHZ:
+			osc |= S3C_PHYCLK_CLKSEL_12M;
+			break;
+		case 24*MHZ:
+			osc |= S3C_PHYCLK_CLKSEL_24M;
+			break;
+		default:
+		case 48*MHZ:
+			/* default reference clock */
+			break;
+		}
+		clk_put(xusbxti);
+	}
+
 	writel(osc | 0x10, S3C_PHYCLK);
 
 	/* issue a full set of resets to the otg and core */
-- 
1.7.1

  reply	other threads:[~2010-06-11  9:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-11  8:20 s3c-hsotg fixes Ben Dooks
2010-06-11  8:20 ` [PATCH 01/11] USB: s3c_hsotg: Add support for external USB clock Ben Dooks
2010-06-11  9:35   ` Marek Szyprowski
2010-06-11  9:46     ` Maurus Cuelenaere [this message]
2010-06-11  8:20 ` [PATCH 02/11] USB: s3c-hsotg: Increase TX fifo limit Ben Dooks
2010-06-11  8:20 ` [PATCH 03/11] USB: s3c-hsotg: The NPTX/PTX FIFO sizes are in words, not bytes Ben Dooks
2010-06-11  8:20 ` [PATCH 04/11] USB: s3c-hsotg: Avoid overwriting contents of perodic in 'fifo' Ben Dooks
2010-06-11  8:20 ` [PATCH 05/11] USB: s3c-hsotg: Re-initialise all FIFOs on USB bus reset Ben Dooks
2010-06-11  8:20 ` [PATCH 06/11] USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode Ben Dooks
2010-06-11  8:54   ` Maurus Cuelenaere
2010-06-11  8:20 ` [PATCH 07/11] USB: s3c-hsotg: Only load packet per fifo write Ben Dooks
2010-06-11  8:20 ` [PATCH 08/11] USB: s3c-hsotg: Check for new request before enqueing new setup Ben Dooks
2010-06-11  8:20 ` [PATCH 09/11] USB: s3c-hsotg: Fix max EP0 IN request length Ben Dooks
2010-06-11  8:20 ` [PATCH 10/11] USB: s3c-hsotg: Fix the OUT EP0 limit Ben Dooks
2010-06-11  9:01   ` Maurus Cuelenaere
2010-06-11  9:07   ` Marek Szyprowski
2010-06-11  8:20 ` [PATCH 11/11] USB: s3c-hsotg: Fix OUT packet request retry Ben Dooks
2010-06-11 10:25 ` s3c-hsotg fixes Marek Szyprowski
2010-06-12  3:34   ` Ben Dooks
2010-06-14  5:40     ` Marek Szyprowski

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=4C120613.6000507@gmail.com \
    --to=mcuelenaere@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).