diff options
author | Boojin Kim <boojin.kim@samsung.com> | 2011-09-01 20:44:39 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-14 01:40:03 -0400 |
commit | 3091e61173211de3fbd9bcb99ddc33333377fcb7 (patch) | |
tree | 66c27156e48119d1520bf5aad7502c9d7a56064e /arch/arm/mach-s5p64x0/clock-s5p6450.c | |
parent | a422bd0f6d50bcb9c529d890bde70295915bb3e9 (diff) |
ARM: S5P64X0: Use generic DMA PL330 driver
This patch makes Samsung S5P64X0 to use DMA PL330 driver
on DMADEVICE. The S5P64X0 uses DMA generic APIs instead of
SAMSUNG specific S3C-PL330 APIs.
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index d9dc16cde109..3d9b60975570 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c | |||
@@ -179,7 +179,7 @@ static struct clk init_clocks_off[] = { | |||
179 | .enable = s5p64x0_hclk0_ctrl, | 179 | .enable = s5p64x0_hclk0_ctrl, |
180 | .ctrlbit = (1 << 3), | 180 | .ctrlbit = (1 << 3), |
181 | }, { | 181 | }, { |
182 | .name = "pdma", | 182 | .name = "dma", |
183 | .parent = &clk_hclk_low.clk, | 183 | .parent = &clk_hclk_low.clk, |
184 | .enable = s5p64x0_hclk0_ctrl, | 184 | .enable = s5p64x0_hclk0_ctrl, |
185 | .ctrlbit = (1 << 12), | 185 | .ctrlbit = (1 << 12), |
@@ -553,6 +553,11 @@ static struct clksrc_clk *sysclks[] = { | |||
553 | &clk_sclk_audio0, | 553 | &clk_sclk_audio0, |
554 | }; | 554 | }; |
555 | 555 | ||
556 | static struct clk dummy_apb_pclk = { | ||
557 | .name = "apb_pclk", | ||
558 | .id = -1, | ||
559 | }; | ||
560 | |||
556 | void __init_or_cpufreq s5p6450_setup_clocks(void) | 561 | void __init_or_cpufreq s5p6450_setup_clocks(void) |
557 | { | 562 | { |
558 | struct clk *xtal_clk; | 563 | struct clk *xtal_clk; |
@@ -632,5 +637,7 @@ void __init s5p6450_register_clocks(void) | |||
632 | s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); | 637 | s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); |
633 | s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); | 638 | s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); |
634 | 639 | ||
640 | s3c24xx_register_clock(&dummy_apb_pclk); | ||
641 | |||
635 | s3c_pwmclk_init(); | 642 | s3c_pwmclk_init(); |
636 | } | 643 | } |