From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 19 Sep 2011 01:30:49 +0000 (+0900)
Subject: Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
X-Git-Tag: v3.2-rc1~40^2~13^2~24^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c9312209aa9fdef05b03d63bbead63bb720fd133;p=linux.git

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
---

c9312209aa9fdef05b03d63bbead63bb720fd133
diff --cc arch/arm/mach-exynos4/clock.c
index ff55b31eb51f,c7b622587229..61249d56d238
--- a/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 c1f548f69a0d,fd7b08fd262b..c54c65d511f0
--- a/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 3d9b60975570,1d989b8da039..2d04abfba12e
--- a/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 6527c05c5fa1,1f69f342a0a0..8d47709da713
--- a/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 d35726a6faea,50d458047c09..239aaad65884
--- a/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),