aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/clock.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-12-29 20:44:13 -0500
committerKukjin Kim <kgene.kim@samsung.com>2010-12-29 20:44:13 -0500
commit724c35cf530651f68f5958dc02e0b49ac6661226 (patch)
tree7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/mach-s5pv210/clock.c
parent57ca51514905b7aea532977e4e87e989d33bfcbb (diff)
parent3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff)
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pv210/clock.c')
-rw-r--r--arch/arm/mach-s5pv210/clock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index b774ff1805db..dab6ef3b6ca9 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -525,6 +525,12 @@ static struct clk init_clocks[] = {
525 .parent = &clk_pclk_psys.clk, 525 .parent = &clk_pclk_psys.clk,
526 .enable = s5pv210_clk_ip3_ctrl, 526 .enable = s5pv210_clk_ip3_ctrl,
527 .ctrlbit = (1 << 20), 527 .ctrlbit = (1 << 20),
528 }, {
529 .name = "sromc",
530 .id = -1,
531 .parent = &clk_hclk_psys.clk,
532 .enable = s5pv210_clk_ip1_ctrl,
533 .ctrlbit = (1 << 26),
528 }, 534 },
529}; 535};
530 536