diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:53 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:53 -0500 |
commit | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff (patch) | |
tree | 98bb33961415f8b2d011094a6bc398943f238681 /arch/arm/mach-s5p64x0/clock-s5p6450.c | |
parent | 724c35cf530651f68f5958dc02e0b49ac6661226 (diff) | |
parent | 9af7d94f2966895b37b8ef1e0d88bd4d9e317e74 (diff) |
Merge branch 'next-s5p64x0' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index d8b20ee8cc8c..3f5ac93c455e 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c | |||
@@ -231,6 +231,12 @@ static struct clk init_clocks_disable[] = { | |||
231 | .enable = s5p64x0_pclk_ctrl, | 231 | .enable = s5p64x0_pclk_ctrl, |
232 | .ctrlbit = (1 << 5), | 232 | .ctrlbit = (1 << 5), |
233 | }, { | 233 | }, { |
234 | .name = "rtc", | ||
235 | .id = -1, | ||
236 | .parent = &clk_pclk_low.clk, | ||
237 | .enable = s5p64x0_pclk_ctrl, | ||
238 | .ctrlbit = (1 << 6), | ||
239 | }, { | ||
234 | .name = "adc", | 240 | .name = "adc", |
235 | .id = -1, | 241 | .id = -1, |
236 | .parent = &clk_pclk_low.clk, | 242 | .parent = &clk_pclk_low.clk, |