From: Keguang Zhang <keguang.zhang@gmail.com>
To: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Kelvin Cheung <keguang.zhang@gmail.com>
Subject: [PATCH V1 1/4] MIPS: Loongson1B: Add dma_slave_map to DMA platform data
Date: Wed, 26 May 2021 21:30:57 +0800 [thread overview]
Message-ID: <20210526133100.436048-2-keguang.zhang@gmail.com> (raw)
In-Reply-To: <20210526133100.436048-1-keguang.zhang@gmail.com>
From: Kelvin Cheung <keguang.zhang@gmail.com>
This patch add dma_slave_map to DMA platform data,
and remove unnecessary DMA filter declaration.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
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
next prev parent reply other threads:[~2021-05-26 13:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 13:30 [PATCH V1 0/4] MIPS: Loongson1B: Add dmaengine and NAND device Keguang Zhang
2021-05-26 13:30 ` Keguang Zhang [this message]
2021-05-26 13:30 ` [PATCH V1 2/4] MIPS: Loongson1B: Add Loongson1 dmaengine device Keguang Zhang
2021-05-26 13:30 ` [PATCH V1 3/4] MIPS: Loongson1B: Add Loongson1 NAND device Keguang Zhang
2021-05-26 13:31 ` [PATCH V1 4/4] MIPS: Loongson1B: Enable NAND by default Keguang Zhang
2021-05-28 13:37 ` [PATCH V1 0/4] MIPS: Loongson1B: Add dmaengine and NAND device Thomas Bogendoerfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210526133100.436048-2-keguang.zhang@gmail.com \
--to=keguang.zhang@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.