Commit 876454ac authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-20151120' of git://

Pull MTD fixes from Brian Norris:

 - MAINTAINERS updates for brcmnand driver

 - Fix reboot hangs seen when multiple NAND flash chips are registered
   with the same controller

 - Fix build issues on jz4740 NAND driver; the error was introduced in
   4.3, so I guess nobody really cared, but we might as well fix it

* tag 'for-linus-20151120' of git://
  MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs
  MAINTAINERS: brcmnand: Add Broadcom internal mailing-list
  mtd: nand: fix shutdown/reboot for multi-chip systems
  mtd: jz4740_nand: fix build on jz4740 after removing gpio.h
parents 81051f91 1ddaa021
......@@ -2449,7 +2449,9 @@ F: drivers/firmware/broadcom/*
M: Brian Norris <>
M: Kamal Dasu <>
S: Maintained
F: drivers/mtd/nand/brcmnand/
......@@ -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
......@@ -3110,7 +3110,7 @@ static void nand_resume(struct mtd_info *mtd)
static void nand_shutdown(struct mtd_info *mtd)
nand_get_device(mtd, FL_SHUTDOWN);
nand_get_device(mtd, FL_PM_SUSPENDED);
/* Set default functions */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment