summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2011-08-18 19:24:55 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-08-18 19:24:55 +0900
commitd20cc4c1b660d59a25f8bebef5d55c1872b9aa76 (patch)
treea7ec2d568cf5bd3a9f381ef2c6b8168081c12fe1 /arch/arm/mach-s5pc100
parent2c929420e8b532c14688dcd500253b90a24e7233 (diff)
downloadblackbird-op-linux-d20cc4c1b660d59a25f8bebef5d55c1872b9aa76.tar.gz
blackbird-op-linux-d20cc4c1b660d59a25f8bebef5d55c1872b9aa76.zip
ARM: S5PC100: 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-s5pc100')
-rw-r--r--arch/arm/mach-s5pc100/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
index ff5cbb30de5b..1f69f342a0a0 100644
--- a/arch/arm/mach-s5pc100/clock.c
+++ b/arch/arm/mach-s5pc100/clock.c
@@ -455,13 +455,13 @@ static struct clk init_clocks_off[] = {
.ctrlbit = (1 << 2),
}, {
.name = "pdma",
- .devname = "s3c-pl330.1",
+ .devname = "dma-pl330.1",
.parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 1),
}, {
.name = "pdma",
- .devname = "s3c-pl330.0",
+ .devname = "dma-pl330.0",
.parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 0),
OpenPOWER on IntegriCloud