From: Kukjin Kim <kgene.kim@samsung.com>
To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org
Cc: ben-linux@fluff.org, Seungwhan Youn <sw.youn@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH 1/5] ARM: S5P6442: Add DMA operation clock
Date: Thu, 21 Oct 2010 09:58:29 +0900 [thread overview]
Message-ID: <1287622713-1657-2-git-send-email-kgene.kim@samsung.com> (raw)
In-Reply-To: <1287622713-1657-1-git-send-email-kgene.kim@samsung.com>
From: Seungwhan Youn <sw.youn@samsung.com>
This patch adds DMA operation clock which is disabled as default.
Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
arch/arm/mach-s5p6442/clock.c | 28 +++++++++++++++++++++++
arch/arm/mach-s5p6442/include/mach/regs-clock.h | 1 +
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5p6442/clock.c b/arch/arm/mach-s5p6442/clock.c
index dcd20f1..16d6e7e 100644
--- a/arch/arm/mach-s5p6442/clock.c
+++ b/arch/arm/mach-s5p6442/clock.c
@@ -192,6 +192,11 @@ static struct clk clk_pclkd1 = {
.parent = &clk_hclkd1,
};
+int s5p6442_clk_ip0_ctrl(struct clk *clk, int enable)
+{
+ return s5p_gatectrl(S5P_CLKGATE_IP0, clk, enable);
+}
+
int s5p6442_clk_ip3_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable);
@@ -335,6 +340,16 @@ void __init_or_cpufreq s5p6442_setup_clocks(void)
clk_pclkd1.rate = pclkd1;
}
+static struct clk init_clocks_disable[] = {
+ {
+ .name = "pdma",
+ .id = -1,
+ .parent = &clk_pclkd1,
+ .enable = s5p6442_clk_ip0_ctrl,
+ .ctrlbit = (1 << 3),
+ },
+};
+
static struct clk init_clocks[] = {
{
.name = "systimer",
@@ -393,10 +408,23 @@ static struct clk *clks[] __initdata = {
void __init s5p6442_register_clocks(void)
{
+ struct clk *clkptr;
+ int i, ret;
+
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
+ clkptr = init_clocks_disable;
+ for (i = 0; i < ARRAY_SIZE(init_clocks_disable); i++, clkptr++) {
+ ret = s3c24xx_register_clock(clkptr);
+ if (ret < 0) {
+ printk(KERN_ERR "Fail to register clock %s (%d)\n",
+ clkptr->name, ret);
+ } else
+ (clkptr->enable)(clkptr, 0);
+ }
+
s3c_pwmclk_init();
}
diff --git a/arch/arm/mach-s5p6442/include/mach/regs-clock.h b/arch/arm/mach-s5p6442/include/mach/regs-clock.h
index d8360b5..00828a3 100644
--- a/arch/arm/mach-s5p6442/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5p6442/include/mach/regs-clock.h
@@ -46,6 +46,7 @@
#define S5P_CLK_DIV5 S5P_CLKREG(0x314)
#define S5P_CLK_DIV6 S5P_CLKREG(0x318)
+#define S5P_CLKGATE_IP0 S5P_CLKREG(0x460)
#define S5P_CLKGATE_IP3 S5P_CLKREG(0x46C)
/* CLK_OUT */
--
1.6.2.5
next prev parent reply other threads:[~2010-10-21 1:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 0:58 [PATCH 0/5] ARM: S5P: Update DMA operation clock Kukjin Kim
2010-10-21 0:58 ` Kukjin Kim [this message]
2010-10-21 22:22 ` [PATCH 1/5] ARM: S5P6442: Add " Ben Dooks
2010-10-22 5:20 ` Kukjin Kim
2010-10-21 0:58 ` [PATCH 2/5] ARM: S5PV210: " Kukjin Kim
2010-10-21 0:58 ` [PATCH 3/5] ARM: S5P64X0: Set DMA clock disable as default Kukjin Kim
2010-10-21 0:58 ` [PATCH 4/5] ARM: S5P: Reorder DMA platform device id Kukjin Kim
2010-10-21 0:58 ` [PATCH 5/5] ARM: SAMSUNG: Add to enable/disable clock on S3C PL330 Kukjin Kim
2010-10-21 1:32 ` Kyungmin Park
2010-10-21 1:45 ` Jassi Brar
2010-10-21 1:49 ` Kyungmin Park
2010-10-21 1:54 ` Jassi Brar
2010-10-21 2:12 ` Kyungmin Park
2010-10-21 2:19 ` Jassi Brar
2010-10-21 2:41 ` Kukjin Kim
2010-10-21 2:36 ` Kukjin Kim
2010-10-21 3:54 ` Kyungmin Park
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=1287622713-1657-2-git-send-email-kgene.kim@samsung.com \
--to=kgene.kim@samsung.com \
--cc=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=sw.youn@samsung.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