tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 876454ac 81051f91

+4 -1
+2
MAINTAINERS
··· 2449 2449 2450 2450 BROADCOM STB NAND FLASH DRIVER 2451 2451 M: Brian Norris <computersforpeace@gmail.com> 2452 + M: Kamal Dasu <kdasu.kdev@gmail.com> 2452 2453 L: linux-mtd@lists.infradead.org 2454 + L: bcm-kernel-feedback-list@broadcom.com 2453 2455 S: Maintained 2454 2456 F: drivers/mtd/nand/brcmnand/ 2455 2457
+1
drivers/mtd/nand/jz4740_nand.c
··· 25 25 26 26 #include <linux/gpio.h> 27 27 28 + #include <asm/mach-jz4740/gpio.h> 28 29 #include <asm/mach-jz4740/jz4740_nand.h> 29 30 30 31 #define JZ_REG_NAND_CTRL 0x50
+1 -1
drivers/mtd/nand/nand_base.c
··· 3110 3110 */ 3111 3111 static void nand_shutdown(struct mtd_info *mtd) 3112 3112 { 3113 - nand_get_device(mtd, FL_SHUTDOWN); 3113 + nand_get_device(mtd, FL_PM_SUSPENDED); 3114 3114 } 3115 3115 3116 3116 /* Set default functions */