[PATCH] mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[PATCH] mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[Brian Norris]

Fallout from commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")

We see errors like this:

drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_detect_bank':
drivers/mtd/nand/jz4740_nand.c:340:9: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
drivers/mtd/nand/jz4740_nand.c:340:9: note: each undeclared identifier is reported only once for each function it appears in
drivers/mtd/nand/jz4740_nand.c:359:2: error: implicit declaration of function 'jz_gpio_set_function' [-Werror=implicit-function-declaration]
drivers/mtd/nand/jz4740_nand.c:359:29: error: 'JZ_GPIO_FUNC_MEM_CS0' undeclared (first use in this function)
drivers/mtd/nand/jz4740_nand.c:399:29: error: 'JZ_GPIO_FUNC_NONE' undeclared (first use in this function)
drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_probe':
drivers/mtd/nand/jz4740_nand.c:528:13: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_remove':
drivers/mtd/nand/jz4740_nand.c:555:14: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)

Patched similarly to:

https://patchwork.linux-mips.org/patch/11089/

Fixes: 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 drivers/mtd/nand/jz4740_nand.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index dc4e8446f1ff..5a99a93ed025 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -25,6 +25,7 @@
 
 #include <linux/gpio.h>
 
+#include <asm/mach-jz4740/gpio.h>
 #include <asm/mach-jz4740/jz4740_nand.h>
 
 #define JZ_REG_NAND_CTRL	0x50
-- 
2.6.0.rc2.230.g3dd15c0

Re: [PATCH] mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[Ralf Baechle]

On Wed, Nov 11, 2015 at 03:36:16PM -0800, Brian Norris wrote:

> Fallout from commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
> 
> We see errors like this:
> 
> drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_detect_bank':
> drivers/mtd/nand/jz4740_nand.c:340:9: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> drivers/mtd/nand/jz4740_nand.c:340:9: note: each undeclared identifier is reported only once for each function it appears in
> drivers/mtd/nand/jz4740_nand.c:359:2: error: implicit declaration of function 'jz_gpio_set_function' [-Werror=implicit-function-declaration]
> drivers/mtd/nand/jz4740_nand.c:359:29: error: 'JZ_GPIO_FUNC_MEM_CS0' undeclared (first use in this function)
> drivers/mtd/nand/jz4740_nand.c:399:29: error: 'JZ_GPIO_FUNC_NONE' undeclared (first use in this function)
> drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_probe':
> drivers/mtd/nand/jz4740_nand.c:528:13: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_remove':
> drivers/mtd/nand/jz4740_nand.c:555:14: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> 
> Patched similarly to:
> 
> https://patchwork.linux-mips.org/patch/11089/
> 
> Fixes: 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Looks, good, shall I funnel this upstream?

  Ralf

Re: [PATCH] mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[Brian Norris]

On Mon, Nov 16, 2015 at 02:23:28PM +0100, Ralf Baechle wrote:
> On Wed, Nov 11, 2015 at 03:36:16PM -0800, Brian Norris wrote:
> 
> > Fallout from commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
> > 
> > We see errors like this:
> > 
> > drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_detect_bank':
> > drivers/mtd/nand/jz4740_nand.c:340:9: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> > drivers/mtd/nand/jz4740_nand.c:340:9: note: each undeclared identifier is reported only once for each function it appears in
> > drivers/mtd/nand/jz4740_nand.c:359:2: error: implicit declaration of function 'jz_gpio_set_function' [-Werror=implicit-function-declaration]
> > drivers/mtd/nand/jz4740_nand.c:359:29: error: 'JZ_GPIO_FUNC_MEM_CS0' undeclared (first use in this function)
> > drivers/mtd/nand/jz4740_nand.c:399:29: error: 'JZ_GPIO_FUNC_NONE' undeclared (first use in this function)
> > drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_probe':
> > drivers/mtd/nand/jz4740_nand.c:528:13: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> > drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_remove':
> > drivers/mtd/nand/jz4740_nand.c:555:14: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
> > 
> > Patched similarly to:
> > 
> > https://patchwork.linux-mips.org/patch/11089/
> > 
> > Fixes: 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> 
> Looks, good, shall I funnel this upstream?

Actually, if you don't mind, I'll take it through MTD. I think I'll have
a few things to push upstream this week anyway, and I'd like to get some
of my MIPS-based build test configs working again in my development
trees.

So...pushed to linux-mtd.git

Regards,
Brian

Re: [PATCH] mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[Ralf Baechle]

On Mon, Nov 16, 2015 at 10:49:17AM -0800, Brian Norris wrote:

> Actually, if you don't mind, I'll take it through MTD. I think I'll have
> a few things to push upstream this week anyway, and I'd like to get some
> of my MIPS-based build test configs working again in my development
> trees.
> 
> So...pushed to linux-mtd.git

Cool, thanks!

  Ralf