Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s5p64x0/clock-s5p6440.c
	arch/arm/mach-s5p64x0/clock-s5p6450.c
	arch/arm/mach-s5pc100/clock.c
	arch/arm/mach-s5pv210/clock.c

diff --cc arch/arm/mach-exynos4/clock.c
index ff55b31,c7b6225..61249d5
--- 1/arch/arm/mach-exynos4/clock.c
--- 2/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -459,13 -454,13 +459,13 @@@ static struct clk init_clocks_off[] = 
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 10),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.0",
+               .devname        = "dma-pl330.0",
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 0),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.1",
+               .devname        = "dma-pl330.1",
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 1),
        }, {

diff --cc arch/arm/mach-s5p64x0/clock-s5p6440.c
index c1f548f,fd7b08f..c54c65d
--- 1/arch/arm/mach-s5p64x0/clock-s5p6440.c
--- 2/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@@ -146,7 -146,8 +146,8 @@@ static struct clk init_clocks_off[] = 
                .enable         = s5p64x0_hclk0_ctrl,
                .ctrlbit        = (1 << 8),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
+               .devname        = "dma-pl330",
                .parent         = &clk_hclk_low.clk,
                .enable         = s5p64x0_hclk0_ctrl,
                .ctrlbit        = (1 << 12),

diff --cc arch/arm/mach-s5p64x0/clock-s5p6450.c
index 3d9b609,1d989b8..2d04abf
--- 1/arch/arm/mach-s5p64x0/clock-s5p6450.c
--- 2/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@@ -179,7 -179,8 +179,8 @@@ static struct clk init_clocks_off[] = 
                .enable         = s5p64x0_hclk0_ctrl,
                .ctrlbit        = (1 << 3),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
+               .devname        = "dma-pl330",
                .parent         = &clk_hclk_low.clk,
                .enable         = s5p64x0_hclk0_ctrl,
                .ctrlbit        = (1 << 12),

diff --cc arch/arm/mach-s5pc100/clock.c
index 6527c05,1f69f34..8d47709
--- 1/arch/arm/mach-s5pc100/clock.c
--- 2/arch/arm/mach-s5pc100/clock.c
+++ b/arch/arm/mach-s5pc100/clock.c
@@@ -459,14 -454,14 +459,14 @@@ static struct clk init_clocks_off[] = 
                .enable         = s5pc100_d1_0_ctrl,
                .ctrlbit        = (1 << 2),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.1",
+               .devname        = "dma-pl330.1",
                .parent         = &clk_div_d1_bus.clk,
                .enable         = s5pc100_d1_0_ctrl,
                .ctrlbit        = (1 << 1),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.0",
+               .devname        = "dma-pl330.0",
                .parent         = &clk_div_d1_bus.clk,
                .enable         = s5pc100_d1_0_ctrl,
                .ctrlbit        = (1 << 0),

diff --cc arch/arm/mach-s5pv210/clock.c
index d35726a,50d4580..239aaad
--- 1/arch/arm/mach-s5pv210/clock.c
--- 2/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@@ -294,14 -289,14 +294,14 @@@ static struct clk_ops clk_fout_apll_op
  
  static struct clk init_clocks_off[] = {
        {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.0",
+               .devname        = "dma-pl330.0",
                .parent         = &clk_hclk_psys.clk,
                .enable         = s5pv210_clk_ip0_ctrl,
                .ctrlbit        = (1 << 3),
        }, {
 -              .name           = "pdma",
 +              .name           = "dma",
-               .devname        = "s3c-pl330.1",
+               .devname        = "dma-pl330.1",
                .parent         = &clk_hclk_psys.clk,
                .enable         = s5pv210_clk_ip0_ctrl,
                .ctrlbit        = (1 << 4),