[PATCH 1/3] MIPS: Loongson1B: Add dma_slave_map to DMA platform data
From: Keguang Zhang
Date: Thu May 20 2021 - 20:05:00 EST
From: Kelvin Cheung <keguang.zhang@xxxxxxxxx>
This patch add dma_slave_map to DMA platform data,
and remove unnecessary DMA filter declaration.
Signed-off-by: Kelvin Cheung <keguang.zhang@xxxxxxxxx>
---
arch/mips/include/asm/mach-loongson32/dma.h | 7 ++++---
arch/mips/include/asm/mach-loongson32/nand.h | 4 ----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson32/dma.h b/arch/mips/include/asm/mach-loongson32/dma.h
index e917b3ccb2c2..1bcf1eb8fe3d 100644
--- a/arch/mips/include/asm/mach-loongson32/dma.h
+++ b/arch/mips/include/asm/mach-loongson32/dma.h
@@ -8,14 +8,15 @@
#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
struct plat_ls1x_dma {
- int nr_channels;
+ const struct dma_slave_map *slave_map;
+ int slavecnt;
};
-extern struct plat_ls1x_dma ls1b_dma_pdata;
-
#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 aaf5ed19d78d..d6eff2fadca2 100644
--- a/arch/mips/include/asm/mach-loongson32/nand.h
+++ b/arch/mips/include/asm/mach-loongson32/nand.h
@@ -19,8 +19,4 @@ struct plat_ls1x_nand {
int wait_cycle;
};
-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 */
--
2.30.2