diff options
| author | Kukjin Kim | 2011-09-19 03:30:49 +0200 |
|---|---|---|
| committer | Kukjin Kim | 2011-09-19 03:30:49 +0200 |
| commit | c9312209aa9fdef05b03d63bbead63bb720fd133 (patch) | |
| tree | 6704773403e34969a27f177bef22e4125378a3df /arch/arm/mach-s5p64x0 | |
| parent | ARM: S5PC100: register the second instance of pl330 DMAC (diff) | |
| parent | ARM: S5P64X0: Add the devname for DMA clock (diff) | |
| download | kernel-qcow2-linux-c9312209aa9fdef05b03d63bbead63bb720fd133.tar.gz kernel-qcow2-linux-c9312209aa9fdef05b03d63bbead63bb720fd133.tar.xz kernel-qcow2-linux-c9312209aa9fdef05b03d63bbead63bb720fd133.zip | |
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
Diffstat (limited to 'arch/arm/mach-s5p64x0')
| -rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 1 |
2 files changed, 2 insertions, 0 deletions
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[] = { .ctrlbit = (1 << 8), }, { .name = "dma", + .devname = "dma-pl330", .parent = &clk_hclk_low.clk, .enable = s5p64x0_hclk0_ctrl, .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[] = { .ctrlbit = (1 << 3), }, { .name = "dma", + .devname = "dma-pl330", .parent = &clk_hclk_low.clk, .enable = s5p64x0_hclk0_ctrl, .ctrlbit = (1 << 12), |