summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2011-08-18 19:24:54 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-08-18 19:24:54 +0900
commit2c929420e8b532c14688dcd500253b90a24e7233 (patch)
tree323d538eee970867f77ccd1b8c9e57c376a21cc6 /arch
parent93ee7a9340d64f20295aacc3fb6a22b759323280 (diff)
downloadlinux-2c929420e8b532c14688dcd500253b90a24e7233.tar.gz
linux-2c929420e8b532c14688dcd500253b90a24e7233.tar.bz2
linux-2c929420e8b532c14688dcd500253b90a24e7233.zip
ARM: EXYNOS4: 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')
-rw-r--r--arch/arm/mach-exynos4/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c
index 851dea018578..c7b622587229 100644
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@ -455,12 +455,12 @@ static struct clk init_clocks_off[] = {
.ctrlbit = (1 << 10),
}, {
.name = "pdma",
- .devname = "s3c-pl330.0",
+ .devname = "dma-pl330.0",
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 0),
}, {
.name = "pdma",
- .devname = "s3c-pl330.1",
+ .devname = "dma-pl330.1",
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 1),
}, {