diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:30:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:30:49 -0400 |
| commit | c9312209aa9fdef05b03d63bbead63bb720fd133 (patch) | |
| tree | 6704773403e34969a27f177bef22e4125378a3df /arch/arm/mach-s5pv210 | |
| parent | d5663e7a404ae97888bb8e7a7376de3fb0878ddd (diff) | |
| parent | 2213d0c0bae510df3860a48e107a5ba17ac72e99 (diff) | |
Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c
Diffstat (limited to 'arch/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index d35726a6faea..239aaad65884 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c | |||
| @@ -295,13 +295,13 @@ static struct clk_ops clk_fout_apll_ops = { | |||
| 295 | static struct clk init_clocks_off[] = { | 295 | static struct clk init_clocks_off[] = { |
| 296 | { | 296 | { |
| 297 | .name = "dma", | 297 | .name = "dma", |
| 298 | .devname = "s3c-pl330.0", | 298 | .devname = "dma-pl330.0", |
| 299 | .parent = &clk_hclk_psys.clk, | 299 | .parent = &clk_hclk_psys.clk, |
| 300 | .enable = s5pv210_clk_ip0_ctrl, | 300 | .enable = s5pv210_clk_ip0_ctrl, |
| 301 | .ctrlbit = (1 << 3), | 301 | .ctrlbit = (1 << 3), |
| 302 | }, { | 302 | }, { |
| 303 | .name = "dma", | 303 | .name = "dma", |
| 304 | .devname = "s3c-pl330.1", | 304 | .devname = "dma-pl330.1", |
| 305 | .parent = &clk_hclk_psys.clk, | 305 | .parent = &clk_hclk_psys.clk, |
| 306 | .enable = s5pv210_clk_ip0_ctrl, | 306 | .enable = s5pv210_clk_ip0_ctrl, |
| 307 | .ctrlbit = (1 << 4), | 307 | .ctrlbit = (1 << 4), |