diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos4/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c index ff55b31eb51f..61249d56d238 100644 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c | |||
@@ -460,12 +460,12 @@ static struct clk init_clocks_off[] = { | |||
460 | .ctrlbit = (1 << 10), | 460 | .ctrlbit = (1 << 10), |
461 | }, { | 461 | }, { |
462 | .name = "dma", | 462 | .name = "dma", |
463 | .devname = "s3c-pl330.0", | 463 | .devname = "dma-pl330.0", |
464 | .enable = exynos4_clk_ip_fsys_ctrl, | 464 | .enable = exynos4_clk_ip_fsys_ctrl, |
465 | .ctrlbit = (1 << 0), | 465 | .ctrlbit = (1 << 0), |
466 | }, { | 466 | }, { |
467 | .name = "dma", | 467 | .name = "dma", |
468 | .devname = "s3c-pl330.1", | 468 | .devname = "dma-pl330.1", |
469 | .enable = exynos4_clk_ip_fsys_ctrl, | 469 | .enable = exynos4_clk_ip_fsys_ctrl, |
470 | .ctrlbit = (1 << 1), | 470 | .ctrlbit = (1 << 1), |
471 | }, { | 471 | }, { |
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index c1f548f69a0d..c54c65d511f0 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c | |||
@@ -147,6 +147,7 @@ static struct clk init_clocks_off[] = { | |||
147 | .ctrlbit = (1 << 8), | 147 | .ctrlbit = (1 << 8), |
148 | }, { | 148 | }, { |
149 | .name = "dma", | 149 | .name = "dma", |
150 | .devname = "dma-pl330", | ||
150 | .parent = &clk_hclk_low.clk, | 151 | .parent = &clk_hclk_low.clk, |
151 | .enable = s5p64x0_hclk0_ctrl, | 152 | .enable = s5p64x0_hclk0_ctrl, |
152 | .ctrlbit = (1 << 12), | 153 | .ctrlbit = (1 << 12), |
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index 3d9b60975570..2d04abfba12e 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c | |||
@@ -180,6 +180,7 @@ static struct clk init_clocks_off[] = { | |||
180 | .ctrlbit = (1 << 3), | 180 | .ctrlbit = (1 << 3), |
181 | }, { | 181 | }, { |
182 | .name = "dma", | 182 | .name = "dma", |
183 | .devname = "dma-pl330", | ||
183 | .parent = &clk_hclk_low.clk, | 184 | .parent = &clk_hclk_low.clk, |
184 | .enable = s5p64x0_hclk0_ctrl, | 185 | .enable = s5p64x0_hclk0_ctrl, |
185 | .ctrlbit = (1 << 12), | 186 | .ctrlbit = (1 << 12), |
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 6527c05c5fa1..8d47709da713 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c | |||
@@ -460,13 +460,13 @@ static struct clk init_clocks_off[] = { | |||
460 | .ctrlbit = (1 << 2), | 460 | .ctrlbit = (1 << 2), |
461 | }, { | 461 | }, { |
462 | .name = "dma", | 462 | .name = "dma", |
463 | .devname = "s3c-pl330.1", | 463 | .devname = "dma-pl330.1", |
464 | .parent = &clk_div_d1_bus.clk, | 464 | .parent = &clk_div_d1_bus.clk, |
465 | .enable = s5pc100_d1_0_ctrl, | 465 | .enable = s5pc100_d1_0_ctrl, |
466 | .ctrlbit = (1 << 1), | 466 | .ctrlbit = (1 << 1), |
467 | }, { | 467 | }, { |
468 | .name = "dma", | 468 | .name = "dma", |
469 | .devname = "s3c-pl330.0", | 469 | .devname = "dma-pl330.0", |
470 | .parent = &clk_div_d1_bus.clk, | 470 | .parent = &clk_div_d1_bus.clk, |
471 | .enable = s5pc100_d1_0_ctrl, | 471 | .enable = s5pc100_d1_0_ctrl, |
472 | .ctrlbit = (1 << 0), | 472 | .ctrlbit = (1 << 0), |
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), |