diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 7e22c21..759846c 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c @@ -12,10 +12,6 @@ * published by the Free Software Foundation. */ -/* - * NOTE: Code in this file is not used when booting with Device Tree support. - */ - #include <linux/kernel.h> #include <linux/module.h> #include <linux/interrupt.h> @@ -28,7 +24,6 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/amba/pl080.h> -#include <linux/of.h> #include <mach/dma.h> #include <mach/map.h> @@ -682,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, goto err_map; } - clk_prepare_enable(dmac->clk); + clk_enable(dmac->clk); dmac->regs = regs; dmac->chanbase = chbase; @@ -716,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, return 0; err_clk: - clk_disable_unprepare(dmac->clk); + clk_disable(dmac->clk); clk_put(dmac->clk); err_map: iounmap(regs); @@ -731,10 +726,6 @@ static int __init s3c64xx_dma_init(void) { int ret; - /* This driver is not supported when booting with device tree. */ - if (of_have_populated_dt()) - return -ENODEV; - printk(KERN_INFO "%s: Registering DMA channels\n", __func__); dma_pool = dma_pool_create("DMA-LLI", NULL, sizeof(struct pl080s_lli), 16, 0); |