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

2016-08-03 Thread Ralf Baechle 
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

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

2016-08-03 Thread Ralf Baechle 
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

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

2016-05-28 Thread Keguang Zhang 
From: Kelvin Cheung 

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

Signed-off-by: Kelvin Cheung 
---
 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 
+
 #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

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

2016-05-28 Thread Keguang Zhang 
From: Kelvin Cheung 

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

Signed-off-by: Kelvin Cheung 
---
 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 
+
 #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