From: Maurus Cuelenaere <mcuelenaere@gmail.com>
To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: ben-linux@fluff.org
Subject: [PATCH] ARM: S3C64XX: Add USB clock source frequency as driver data to s3c-hsotg
Date: Tue, 04 May 2010 13:12:36 +0200 [thread overview]
Message-ID: <4BE00124.7030702@gmail.com> (raw)
The upcoming SmartQ machines use a different base clock frequency
for the USB block, this patch allows passing it as platform data
to the driver.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
arch/arm/plat-samsung/include/plat/udc-hs.h | 8 ++++++++
drivers/usb/gadget/s3c-hsotg.c | 1 +
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/include/plat/udc-hs.h b/arch/arm/plat-samsung/include/plat/udc-hs.h
index a22a4f2..2905344 100644
--- a/arch/arm/plat-samsung/include/plat/udc-hs.h
+++ b/arch/arm/plat-samsung/include/plat/udc-hs.h
@@ -18,12 +18,20 @@ enum s3c_hsotg_dmamode {
S3C_HSOTG_DMA_DRV, /* DMA is chosen by driver */
};
+enum s3c_hsotg_clkfreq {
+ S3C_HSOTG_CLKFREQ_48MHZ = 0,
+ S3C_HSOTG_CLKFREQ_12MHZ = 2,
+ S3C_HSOTG_CLKFREQ_24MHZ = 3,
+};
+
/**
* struct s3c_hsotg_plat - platform data for high-speed otg/udc
* @dma: Whether to use DMA or not.
* @is_osc: The clock source is an oscillator, not a crystal
+ * @clk_sel: Frequency of the clock source
*/
struct s3c_hsotg_plat {
enum s3c_hsotg_dmamode dma;
unsigned int is_osc : 1;
+ enum s3c_hsotg_clkfreq clk_sel;
};
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 1f73b48..600b56d 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2705,6 +2705,7 @@ static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
mdelay(1);
osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;
+ osc |= hsotg->plat->clk_sel;
writel(osc | 0x10, S3C_PHYCLK);
--
1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: mcuelenaere@gmail.com (Maurus Cuelenaere)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: S3C64XX: Add USB clock source frequency as driver data to s3c-hsotg
Date: Tue, 04 May 2010 13:12:36 +0200 [thread overview]
Message-ID: <4BE00124.7030702@gmail.com> (raw)
The upcoming SmartQ machines use a different base clock frequency
for the USB block, this patch allows passing it as platform data
to the driver.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
arch/arm/plat-samsung/include/plat/udc-hs.h | 8 ++++++++
drivers/usb/gadget/s3c-hsotg.c | 1 +
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/include/plat/udc-hs.h b/arch/arm/plat-samsung/include/plat/udc-hs.h
index a22a4f2..2905344 100644
--- a/arch/arm/plat-samsung/include/plat/udc-hs.h
+++ b/arch/arm/plat-samsung/include/plat/udc-hs.h
@@ -18,12 +18,20 @@ enum s3c_hsotg_dmamode {
S3C_HSOTG_DMA_DRV, /* DMA is chosen by driver */
};
+enum s3c_hsotg_clkfreq {
+ S3C_HSOTG_CLKFREQ_48MHZ = 0,
+ S3C_HSOTG_CLKFREQ_12MHZ = 2,
+ S3C_HSOTG_CLKFREQ_24MHZ = 3,
+};
+
/**
* struct s3c_hsotg_plat - platform data for high-speed otg/udc
* @dma: Whether to use DMA or not.
* @is_osc: The clock source is an oscillator, not a crystal
+ * @clk_sel: Frequency of the clock source
*/
struct s3c_hsotg_plat {
enum s3c_hsotg_dmamode dma;
unsigned int is_osc : 1;
+ enum s3c_hsotg_clkfreq clk_sel;
};
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 1f73b48..600b56d 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2705,6 +2705,7 @@ static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
mdelay(1);
osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;
+ osc |= hsotg->plat->clk_sel;
writel(osc | 0x10, S3C_PHYCLK);
--
1.7.1
next reply other threads:[~2010-05-04 11:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 11:12 Maurus Cuelenaere [this message]
2010-05-04 11:12 ` [PATCH] ARM: S3C64XX: Add USB clock source frequency as driver data to s3c-hsotg Maurus Cuelenaere
2010-05-06 1:26 ` Ben Dooks
2010-05-06 1:26 ` Ben Dooks
2010-05-06 10:05 ` Maurus Cuelenaere
2010-05-06 10:05 ` 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=4BE00124.7030702@gmail.com \
--to=mcuelenaere@gmail.com \
--cc=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.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 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.