diff options
author | Vladimir Zapolskiy <vz@mleia.com> | 2011-08-18 06:24:55 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-18 06:24:55 -0400 |
commit | 1ce3ea61c61c1e2127496df2c5d66650fd6456e2 (patch) | |
tree | bf9d7fc19bbcc34e586f1c1ecc1729180d74544f /arch/arm/mach-s5pv210 | |
parent | d20cc4c1b660d59a25f8bebef5d55c1872b9aa76 (diff) |
ARM: S5PV210: use dma-pl330 device name for clock
This change replaces s3c-pl330.x clock device names with dma-pl330.x,
otherwise there won't be a correspondence between clock device name
and amba device name, thus clocks can't be enabled.
Fixes runtime errors on clk_get() from drivers/dma/pl330.c:
dma-pl330 dma-pl330.0: Cannot get operation clock.
dma-pl330: probe of dma-pl330.0 failed with error -22
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
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 52a8e607bcc2..50d458047c09 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c | |||
@@ -290,13 +290,13 @@ static struct clk_ops clk_fout_apll_ops = { | |||
290 | static struct clk init_clocks_off[] = { | 290 | static struct clk init_clocks_off[] = { |
291 | { | 291 | { |
292 | .name = "pdma", | 292 | .name = "pdma", |
293 | .devname = "s3c-pl330.0", | 293 | .devname = "dma-pl330.0", |
294 | .parent = &clk_hclk_psys.clk, | 294 | .parent = &clk_hclk_psys.clk, |
295 | .enable = s5pv210_clk_ip0_ctrl, | 295 | .enable = s5pv210_clk_ip0_ctrl, |
296 | .ctrlbit = (1 << 3), | 296 | .ctrlbit = (1 << 3), |
297 | }, { | 297 | }, { |
298 | .name = "pdma", | 298 | .name = "pdma", |
299 | .devname = "s3c-pl330.1", | 299 | .devname = "dma-pl330.1", |
300 | .parent = &clk_hclk_psys.clk, | 300 | .parent = &clk_hclk_psys.clk, |
301 | .enable = s5pv210_clk_ip0_ctrl, | 301 | .enable = s5pv210_clk_ip0_ctrl, |
302 | .ctrlbit = (1 << 4), | 302 | .ctrlbit = (1 << 4), |