* [PATCH] MIPS: Loongson1B: Remove ARCH_WANT_OPTIONAL_GPIOLIB
@ 2016-05-28 9:51 Keguang Zhang
2016-05-28 9:51 ` [PATCH] MIPS: Loongson1B: Provide DMA filter callbacks via platform data Keguang Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Keguang Zhang @ 2016-05-28 9:51 UTC (permalink / raw)
To: linux-mips, linux-kernel; +Cc: Ralf Baechle, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
This patch removes ARCH_WANT_OPTIONAL_GPIOLIB due to upstream changes.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
arch/mips/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5663f41..34ed662 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1404,7 +1404,6 @@ config CPU_LOONGSON1B
bool "Loongson 1B"
depends on SYS_HAS_CPU_LOONGSON1B
select CPU_LOONGSON1
- select ARCH_WANT_OPTIONAL_GPIOLIB
select LEDS_GPIO_REGISTER
help
The Loongson 1B is a 32-bit SoC, which implements the MIPS32
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] MIPS: Loongson1B: Provide DMA filter callbacks via platform data
2016-05-28 9:51 [PATCH] MIPS: Loongson1B: Remove ARCH_WANT_OPTIONAL_GPIOLIB Keguang Zhang
@ 2016-05-28 9:51 ` Keguang Zhang
2016-08-03 6:14 ` Ralf Baechle
0 siblings, 1 reply; 3+ messages in thread
From: Keguang Zhang @ 2016-05-28 9:51 UTC (permalink / raw)
To: linux-mips, linux-kernel; +Cc: Ralf Baechle, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
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@gmail.com>
---
arch/mips/include/asm/mach-loongson32/dma.h | 4 ++++
arch/mips/include/asm/mach-loongson32/nand.h | 3 +--
arch/mips/loongson32/ls1b/board.c | 1 +
3 files changed, 6 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..0a57337 100644
--- a/arch/mips/loongson32/ls1b/board.c
+++ b/arch/mips/loongson32/ls1b/board.c
@@ -38,6 +38,7 @@ struct plat_ls1x_nand ls1x_nand_pdata = {
.nr_parts = ARRAY_SIZE(ls1x_nand_parts),
.hold_cycle = 0x2,
.wait_cycle = 0xc,
+ .dma_filter = ls1x_dma_filter,
};
static const struct gpio_led ls1x_gpio_leds[] __initconst = {
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MIPS: Loongson1B: Provide DMA filter callbacks via platform data
2016-05-28 9:51 ` [PATCH] MIPS: Loongson1B: Provide DMA filter callbacks via platform data Keguang Zhang
@ 2016-08-03 6:14 ` Ralf Baechle
0 siblings, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2016-08-03 6:14 UTC (permalink / raw)
To: Keguang Zhang; +Cc: linux-mips, linux-kernel
On Sat, May 28, 2016 at 05:51:52PM +0800, Keguang Zhang wrote:
> 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..0a57337 100644
> --- a/arch/mips/loongson32/ls1b/board.c
> +++ b/arch/mips/loongson32/ls1b/board.c
> @@ -38,6 +38,7 @@ struct plat_ls1x_nand ls1x_nand_pdata = {
> .nr_parts = ARRAY_SIZE(ls1x_nand_parts),
> .hold_cycle = 0x2,
> .wait_cycle = 0xc,
> + .dma_filter = ls1x_dma_filter,
> };
Without the DMA driver which Vinod has requested changes for this
patch will result in build errors. It will also result in a build
error if CONFIG_LOONGSON1_DMA is disabled.
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-03 6:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-28 9:51 [PATCH] MIPS: Loongson1B: Remove ARCH_WANT_OPTIONAL_GPIOLIB Keguang Zhang
2016-05-28 9:51 ` [PATCH] MIPS: Loongson1B: Provide DMA filter callbacks via platform data Keguang Zhang
2016-08-03 6:14 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).