Skip to content

Commit

Permalink
ARM: S5PV210: Use generic DMA PL330 driver
Browse files Browse the repository at this point in the history
This patch makes Samsung S5PV210 to use DMA PL330 driver
on DMADEVICE. The S5PV210 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>
  • Loading branch information
Boojin Kim authored and Vinod Koul committed Sep 14, 2011
1 parent bf856fb commit dafc954
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 116 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-s5pv210/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ARCH_S5PV210

config CPU_S5PV210
bool
select S3C_PL330_DMA
select SAMSUNG_DMADEV
select S5P_EXT_INT
select S5P_HRT
select S5PV210_PM if PM
Expand Down
10 changes: 8 additions & 2 deletions arch/arm/mach-s5pv210/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ static struct clk clk_pcmcdclk2 = {
.name = "pcmcdclk",
};

static struct clk dummy_apb_pclk = {
.name = "apb_pclk",
.id = -1,
};

static struct clk *clkset_vpllsrc_list[] = {
[0] = &clk_fin_vpll,
[1] = &clk_sclk_hdmi27m,
Expand Down Expand Up @@ -289,13 +294,13 @@ static struct clk_ops clk_fout_apll_ops = {

static struct clk init_clocks_off[] = {
{
.name = "pdma",
.name = "dma",
.devname = "s3c-pl330.0",
.parent = &clk_hclk_psys.clk,
.enable = s5pv210_clk_ip0_ctrl,
.ctrlbit = (1 << 3),
}, {
.name = "pdma",
.name = "dma",
.devname = "s3c-pl330.1",
.parent = &clk_hclk_psys.clk,
.enable = s5pv210_clk_ip0_ctrl,
Expand Down Expand Up @@ -1161,5 +1166,6 @@ void __init s5pv210_register_clocks(void)
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c24xx_register_clock(&dummy_apb_pclk);
s3c_pwmclk_init();
}
Loading

0 comments on commit dafc954

Please sign in to comment.