[PATCH V1] MIPS: Loongson1B: Provide DMA filter callbacks via platform data

From: Keguang Zhang
Date: Tue Aug 09 2016 - 04:22:51 EST


From: Kelvin Cheung <keguang.zhang@xxxxxxxxx>

This patch provides DMA filter callbacks via platform data
to make NAND driver independent of single DMA engine driver.

Signed-off-by: Kelvin Cheung <keguang.zhang@xxxxxxxxx>

---
v1:
Fix the build error
---
arch/mips/include/asm/mach-loongson32/dma.h | 4 ++++
arch/mips/include/asm/mach-loongson32/nand.h | 3 +--
arch/mips/loongson32/ls1b/board.c | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/mach-loongson32/dma.h b/arch/mips/include/asm/mach-loongson32/dma.h
index ad1dec7..d3ae391 100644
--- a/arch/mips/include/asm/mach-loongson32/dma.h
+++ b/arch/mips/include/asm/mach-loongson32/dma.h
@@ -12,6 +12,8 @@
#ifndef __ASM_MACH_LOONGSON32_DMA_H
#define __ASM_MACH_LOONGSON32_DMA_H

+#include <linux/dmaengine.h>
+
#define LS1X_DMA_CHANNEL0 0
#define LS1X_DMA_CHANNEL1 1
#define LS1X_DMA_CHANNEL2 2
@@ -22,4 +24,6 @@ struct plat_ls1x_dma {

extern struct plat_ls1x_dma ls1b_dma_pdata;

+bool ls1x_dma_filter(struct dma_chan *chan, void *param);
+
#endif /* __ASM_MACH_LOONGSON32_DMA_H */
diff --git a/arch/mips/include/asm/mach-loongson32/nand.h b/arch/mips/include/asm/mach-loongson32/nand.h
index e274912..a1f8704 100644
--- a/arch/mips/include/asm/mach-loongson32/nand.h
+++ b/arch/mips/include/asm/mach-loongson32/nand.h
@@ -21,10 +21,9 @@ struct plat_ls1x_nand {

int hold_cycle;
int wait_cycle;
+ bool (*dma_filter)(struct dma_chan *chan, void *param);
};

extern struct plat_ls1x_nand ls1b_nand_pdata;

-bool ls1x_dma_filter_fn(struct dma_chan *chan, void *param);
-
#endif /* __ASM_MACH_LOONGSON32_NAND_H */
diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c
index 38a1d40..dac1cbb 100644
--- a/arch/mips/loongson32/ls1b/board.c
+++ b/arch/mips/loongson32/ls1b/board.c
@@ -38,6 +38,9 @@ struct plat_ls1x_nand ls1x_nand_pdata = {
.nr_parts = ARRAY_SIZE(ls1x_nand_parts),
.hold_cycle = 0x2,
.wait_cycle = 0xc,
+#ifdef CONFIG_LOONGSON1_DMA
+ .dma_filter = ls1x_dma_filter,
+#endif
};

static const struct gpio_led ls1x_gpio_leds[] __initconst = {
--
1.9.1