diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:38 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:38 +0200 |
| commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
| tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/mach-s5pv210/clock.c | |
| parent | Merge branch 'next/topic-exynos4-devel' into next-samsung-devel (diff) | |
| parent | Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung (diff) | |
| download | linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.xz linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.zip | |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s5pv210/clock.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index f5f8fa89679c..e93ce3ed5b9e 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c @@ -203,6 +203,11 @@ static struct clk clk_pcmcdclk2 = { .name = "pcmcdclk", }; +static struct clk dummy_apb_pclk = { + .name = "apb_pclk", + .id = -1, +}; + static struct clk *clkset_vpllsrc_list[] = { [0] = &clk_fin_vpll, [1] = &clk_sclk_hdmi27m, @@ -289,14 +294,14 @@ static struct clk_ops clk_fout_apll_ops = { static struct clk init_clocks_off[] = { { - .name = "pdma", - .devname = "s3c-pl330.0", + .name = "dma", + .devname = "dma-pl330.0", .parent = &clk_hclk_psys.clk, .enable = s5pv210_clk_ip0_ctrl, .ctrlbit = (1 << 3), }, { - .name = "pdma", - .devname = "s3c-pl330.1", + .name = "dma", + .devname = "dma-pl330.1", .parent = &clk_hclk_psys.clk, .enable = s5pv210_clk_ip0_ctrl, .ctrlbit = (1 << 4), @@ -1159,5 +1164,6 @@ void __init s5pv210_register_clocks(void) s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); + s3c24xx_register_clock(&dummy_apb_pclk); s3c_pwmclk_init(); } |