From: Heiko Stuebner Date: Mon, 7 Oct 2013 21:42:11 +0000 (+0900) Subject: ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device X-Git-Tag: firefly_0821_release~176^2~5044^2^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f99ef2284b46f69dfdca690c2b00fa735b32ccc;p=firefly-linux-kernel-4.4.55.git 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 Acked-by: Linus Walleij Signed-off-by: Kukjin Kim --- 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 @@ #include #include #include +#include #include @@ -1499,8 +1500,10 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, pd.num_cs = num_cs; pd.src_clk_nr = src_clk_nr; pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio; -#ifdef CONFIG_PL330_DMA +#if defined(CONFIG_PL330_DMA) pd.filter = pl330_filter; +#elif defined(CONFIG_S3C24XX_DMAC) + pd.filter = s3c24xx_dma_filter; #endif s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);