Commit c9312209 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

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
parents d5663e7a 2213d0c0

arch/arm/mach-exynos4/clock.c

+2 −2
Original line number Diff line number Diff line
@@ -460,12 +460,12 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= (1 << 10),

	}, {

		.name		= "dma",

		.devname	= "s3c-pl330.0",

		.devname	= "dma-pl330.0",

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 0),

	}, {

		.name		= "dma",

		.devname	= "s3c-pl330.1",

		.devname	= "dma-pl330.1",

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 1),

	}, {

arch/arm/mach-s5p64x0/clock-s5p6440.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= (1 << 8),

	}, {

		.name		= "dma",

		.devname	= "dma-pl330",

		.parent		= &clk_hclk_low.clk,

		.enable		= s5p64x0_hclk0_ctrl,

		.ctrlbit	= (1 << 12),

arch/arm/mach-s5p64x0/clock-s5p6450.c

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= (1 << 3),

	}, {

		.name		= "dma",

		.devname	= "dma-pl330",

		.parent		= &clk_hclk_low.clk,

		.enable		= s5p64x0_hclk0_ctrl,

		.ctrlbit	= (1 << 12),

arch/arm/mach-s5pc100/clock.c

+2 −2
Original line number Diff line number Diff line
@@ -460,13 +460,13 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= (1 << 2),

	}, {

		.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		= "dma",

		.devname	= "s3c-pl330.0",

		.devname	= "dma-pl330.0",

		.parent		= &clk_div_d1_bus.clk,

		.enable		= s5pc100_d1_0_ctrl,

		.ctrlbit	= (1 << 0),

arch/arm/mach-s5pv210/clock.c

+2 −2
Original line number Diff line number Diff line
@@ -295,13 +295,13 @@ static struct clk_ops clk_fout_apll_ops = { 
static struct clk init_clocks_off[] = {

	{

		.name		= "dma",

		.devname	= "s3c-pl330.0",

		.devname	= "dma-pl330.0",

		.parent		= &clk_hclk_psys.clk,

		.enable		= s5pv210_clk_ip0_ctrl,

		.ctrlbit	= (1 << 3),

	}, {

		.name		= "dma",

		.devname	= "s3c-pl330.1",

		.devname	= "dma-pl330.1",

		.parent		= &clk_hclk_psys.clk,

		.enable		= s5pv210_clk_ip0_ctrl,

		.ctrlbit	= (1 << 4),