Patch "mtd: jz4740_nand: fix build on jz4740 after removing gpio.h" has been added to the 4.3-stable tree

Patch "mtd: jz4740_nand: fix build on jz4740 after removing gpio.h" has been added to the 4.3-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

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

to the 4.3-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mtd-jz4740_nand-fix-build-on-jz4740-after-removing-gpio.h.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 96dd922c198286681fbbc15100e196e0f629e2fb Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Wed, 11 Nov 2015 15:36:16 -0800
Subject: mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

From: Brian Norris <computersforpeace@gmail.com>

commit 96dd922c198286681fbbc15100e196e0f629e2fb upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/mtd/nand/jz4740_nand.c |    1 +
 1 file changed, 1 insertion(+)

--- 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


Patches currently in stable-queue which might be from computersforpeace@gmail.com are

queue-4.3/mtd-mtdpart-fix-add_mtd_partitions-error-path.patch
queue-4.3/mtd-blkdevs-fix-potential-deadlock-lockdep-warnings.patch
queue-4.3/mtd-nand-fix-shutdown-reboot-for-multi-chip-systems.patch
queue-4.3/mtd-jz4740_nand-fix-build-on-jz4740-after-removing-gpio.h.patch