summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/clock.c
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2011-08-18 12:24:55 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-08-18 12:24:55 +0200
commit1ce3ea61c61c1e2127496df2c5d66650fd6456e2 (patch)
treebf9d7fc19bbcc34e586f1c1ecc1729180d74544f /arch/arm/mach-s5pv210/clock.c
parentARM: S5PC100: use dma-pl330 device name for clock (diff)
downloadlinux-1ce3ea61c61c1e2127496df2c5d66650fd6456e2.tar.xz
linux-1ce3ea61c61c1e2127496df2c5d66650fd6456e2.zip
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/clock.c')
-rw-r--r--arch/arm/mach-s5pv210/clock.c4
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 = {
static struct clk init_clocks_off[] = {
{
.name = "pdma",
- .devname = "s3c-pl330.0",
+ .devname = "dma-pl330.0",
.parent = &clk_hclk_psys.clk,
.enable = s5pv210_clk_ip0_ctrl,
.ctrlbit = (1 << 3),
}, {
.name = "pdma",
- .devname = "s3c-pl330.1",
+ .devname = "dma-pl330.1",
.parent = &clk_hclk_psys.clk,
.enable = s5pv210_clk_ip0_ctrl,
.ctrlbit = (1 << 4),