leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MTD fixes for 4.4-rc2:

Browse Source 
* 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWT924AAoJEFySrpd9RFgtUY4P/ievTYne0B05nGHgqtASijFg
 op88cIFuQS5SxGDmp+L2Np3VfrZOagYeLoeU2V02qkNV1Bd9fW+QeQqt4pcgKTBT
 1w2rqvU24xfa9NV91x2LFZukhkdADgEos7TX920dNIiWSnH6el7yLQ9ZWridId4J
 +K+tuH75Hc0GEFF0iXekZ6dqlJIQmLiRqqN41C0ivMWj4cpFVxvU01f0s/dO36Ie
 iLO4OKiY0tJLtsiwRUKzzxZbctv7OlM0Cbl6jgL8RaF7YneL2KzZej+/WLP6HFqJ
 GYRc7KETBllIzBKF1iBke4wl3ZJtMjCln1RpnmKRSuo4bW5XLFZBZsI66S+9WvzY
 lZ/M++4t/aC8d3lPJ/dH87Yc5pRP68Qy0Jjm6onwRbAaIoVLPyLzTNZ8b6mGFk53
 Wx74Uc23r7K7aOMGUp2WV2Tw3Idtazpm6TTUA4vg3daz7sSkqrws8+1rUOla/P2p
 NnG8gV5mAGXCeohrB48KHcVjec5iTkmuifY3xIuTmqdL7f8c1mbVysitzx0I2qtP
 sO3gKrE5qxhz8SZJnf5qp/9zN5VgciqqUav8ofx4zH5by+XYN09UnUSJwNLTGjsT
 XByCdsP1hmpuUnA1NPX0lzz+i6RAmFjY0Ll9QKluGCJVAo8CHFHo/fwvR3ssUwJn
 4q4Qm7Y+0atE7XW3E9MO
 =8XN+
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd

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://git.infradead.org/linux-mtd:
  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
This commit is contained in:
Linus Torvalds 2015-11-21 09:52:07 -08:00
commit 876454ac1a
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -2449,7 +2449,9 @@ F: drivers/firmware/broadcom/*
BROADCOM STB NAND FLASH DRIVER
M: Brian Norris <computersforpeace@gmail.com>
M: Kamal Dasu <kdasu.kdev@gmail.com>
L: linux-mtd@lists.infradead.org
L: bcm-kernel-feedback-list@broadcom.com
S: Maintained
F: drivers/mtd/nand/brcmnand/

1
drivers/mtd/nand/jz4740_nand.c
View File

@ -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
drivers/mtd/nand/nand_base.c
View File

@ -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 */