aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-01-27 21:12:54 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 12:50:25 -0500
commit9299fd85a00a52b7c575fa02b3031ad407a15344 (patch)
tree2b7fd1fd0539eb470a5c87c36541fa690fce47ad /arch
parentfecb494beef09e4caaa80313834af26f57091195 (diff)
[ARM] OMAP24xx clock: add missing SSI L4 interface clock
This patch adds a missing OMAP24xx clock, the SSI L4 interface clock, as "ssi_l4_ick". linux-omap source commit is ace129d39b3107d330d4cf6934385d13521f2fec. Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c1
-rw-r--r--arch/arm/mach-omap2/clock24xx.h14
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 91ad2070264d..421728a7f903 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -112,6 +112,7 @@ static struct omap_clk omap24xx_clks[] = {
112 CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_243X | CK_242X), 112 CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_243X | CK_242X),
113 /* L4 domain clocks */ 113 /* L4 domain clocks */
114 CLK(NULL, "l4_ck", &l4_ck, CK_243X | CK_242X), 114 CLK(NULL, "l4_ck", &l4_ck, CK_243X | CK_242X),
115 CLK(NULL, "ssi_l4_ick", &ssi_l4_ick, CK_243X | CK_242X),
115 /* virtual meta-group clock */ 116 /* virtual meta-group clock */
116 CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_243X | CK_242X), 117 CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_243X | CK_242X),
117 /* general l4 interface ck, multi-parent functional clk */ 118 /* general l4 interface ck, multi-parent functional clk */
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index b2442475fb47..32dd8573e56b 100644
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -1276,6 +1276,20 @@ static struct clk ssi_ssr_sst_fck = {
1276 .set_rate = &omap2_clksel_set_rate 1276 .set_rate = &omap2_clksel_set_rate
1277}; 1277};
1278 1278
1279/*
1280 * Presumably this is the same as SSI_ICLK.
1281 * TRM contradicts itself on what clockdomain SSI_ICLK is in
1282 */
1283static struct clk ssi_l4_ick = {
1284 .name = "ssi_l4_ick",
1285 .ops = &clkops_omap2_dflt_wait,
1286 .parent = &l4_ck,
1287 .clkdm_name = "core_l4_clkdm",
1288 .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
1289 .enable_bit = OMAP24XX_EN_SSI_SHIFT,
1290 .recalc = &followparent_recalc,
1291};
1292
1279 1293
1280/* 1294/*
1281 * GFX clock domain 1295 * GFX clock domain