Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd (876454ac) · Commits · 戴 / test

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

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -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/

drivers/mtd/nand/jz4740_nand.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

drivers/mtd/nand/nand_base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message