aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-10-07 17:42:11 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-10-07 17:42:11 -0400
commit7f99ef2284b46f69dfdca690c2b00fa735b32ccc (patch)
treeec535260805e52ed025e8880544ff5492b05807b
parentf2dda07db68d2bbe91bc9985280f0586c9d25523 (diff)
ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device
The spi-s3c64xx device is also used on the s3c2416 and s3c2443 SoCs. The driver also already uses only generic dma-engine operations. Therefore add another elif to set the s3c24xx filter. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/plat-samsung/devs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 8ce0ac007eb9..a7b9b9e81c36 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -32,6 +32,7 @@
32#include <linux/ioport.h> 32#include <linux/ioport.h>
33#include <linux/platform_data/s3c-hsudc.h> 33#include <linux/platform_data/s3c-hsudc.h>
34#include <linux/platform_data/s3c-hsotg.h> 34#include <linux/platform_data/s3c-hsotg.h>
35#include <linux/platform_data/dma-s3c24xx.h>
35 36
36#include <media/s5p_hdmi.h> 37#include <media/s5p_hdmi.h>
37 38
@@ -1499,8 +1500,10 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
1499 pd.num_cs = num_cs; 1500 pd.num_cs = num_cs;
1500 pd.src_clk_nr = src_clk_nr; 1501 pd.src_clk_nr = src_clk_nr;
1501 pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio; 1502 pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;
1502#ifdef CONFIG_PL330_DMA 1503#if defined(CONFIG_PL330_DMA)
1503 pd.filter = pl330_filter; 1504 pd.filter = pl330_filter;
1505#elif defined(CONFIG_S3C24XX_DMAC)
1506 pd.filter = s3c24xx_dma_filter;
1504#endif 1507#endif
1505 1508
1506 s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0); 1509 s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);