Commit 511c41d9 authored Oct 18, 2014 by Linus Torvalds

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

Pull MTD update from Brian Norris:
 "Sorry for delaying this a bit later than usual.  There's one mild
  regression from 3.16 that was noticed during the 3.17 cycle, and I
  meant to send a fix for it along with this pull request.  I'll
  probably try to queue it up for a later pull request once I've had a
  better look at it, hopefully by -rc2 at the latest.

  Summary for this pull:

  NAND
   - Cleanup for Denali driver
   - Atmel: add support for new page sizes
   - Atmel: fix up 'raw' mode support
   - Atmel: miscellaneous cleanups
   - New timing mode helpers for non-ONFI NAND
   - OMAP: allow driver to be (properly) built as a module
   - bcm47xx: RESET support and other cleanups

  SPI NOR
   - Miscellaneous cleanups, to prepare framework for wider use (some
     further work still pending)
   - Compile-time configuration to select 4K vs.  64K support for flash
     that support both (necessary for using UBIFS on some SPI NOR)

  A few scattered code quality fixes, detected by Coverity

  See the changesets for more"

* tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd: (59 commits)
  mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message
  mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module
  mtd: move support for struct flash_platform_data into m25p80
  mtd: spi-nor: add Kconfig option to disable 4K sectors
  mtd: nand: Move ELM driver and rename as omap_elm
  nand: omap2: Replace pr_err with dev_err
  nand: omap2: Remove horrible ifdefs to fix module probe
  mtd: nand: add Hynix's H27UCG8T2ATR-BC to nand_ids table
  mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs
  mtd: physmap_of: Add non-obsolete map_rom probe
  mtd: physmap_of: Fix ROM support via OF
  MAINTAINERS: add l2-mtd.git, 'next' tree for MTD
  mtd: denali: fix indents and other trivial things
  mtd: denali: remove unnecessary parentheses
  mtd: denali: remove another set-but-unused variable
  mtd: denali: fix include guard and license block of denali.h
  mtd: nand: don't break long print messages
  mtd: bcm47xxnflash: replace some magic numbers
  mtd: bcm47xxnflash: NAND_CMD_RESET support
  mtd: bcm47xxnflash: add cmd_ctrl handler
  ...

parents 88ed806a 8b3d58e5

Documentation/devicetree/bindings/mtd/atmel-nand.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ Optional properties:
	- reg : should specify the address and size used for NFC command registers,		- reg : should specify the address and size used for NFC command registers,
	NFC registers and NFC Sram. NFC Sram address and size can be absent		NFC registers and NFC Sram. NFC Sram address and size can be absent
	if don't want to use it.		if don't want to use it.
			- clocks: phandle to the peripheral clock
	- Optional properties:		- Optional properties:
	- atmel,write-by-sram: boolean to enable NFC write by sram.		- atmel,write-by-sram: boolean to enable NFC write by sram.

	@@ -98,6 +99,7 @@ nand0: nand@40000000 {
	compatible = "atmel,sama5d3-nfc";		compatible = "atmel,sama5d3-nfc";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
			clocks = <&hsmc_clk>
	reg = <		reg = <
	0x70000000 0x10000000 /* NFC Command Registers */		0x70000000 0x10000000 /* NFC Command Registers */
	0xffffc000 0x00000070 /* NFC HSMC regs */		0xffffc000 0x00000070 /* NFC HSMC regs */

Documentation/devicetree/bindings/mtd/mtd-physmap.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,8 @@ Flash chips (Memory Technology Devices) are often used for solid state
	file systems on embedded devices.		file systems on embedded devices.

	- compatible : should contain the specific model of mtd chip(s)		- compatible : should contain the specific model of mtd chip(s)
	used, if known, followed by either "cfi-flash", "jedec-flash"		used, if known, followed by either "cfi-flash", "jedec-flash",
	or "mtd-ram".		"mtd-ram" or "mtd-rom".
	- reg : Address range(s) of the mtd chip(s)		- reg : Address range(s) of the mtd chip(s)
	It's possible to (optionally) define multiple "reg" tuples so that		It's possible to (optionally) define multiple "reg" tuples so that
	non-identical chips can be described in one node.		non-identical chips can be described in one node.

MAINTAINERS

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5992,6 +5992,7 @@ L: linux-mtd@lists.infradead.org
	W: http://www.linux-mtd.infradead.org/		W: http://www.linux-mtd.infradead.org/
	Q: http://patchwork.ozlabs.org/project/linux-mtd/list/		Q: http://patchwork.ozlabs.org/project/linux-mtd/list/
	T: git git://git.infradead.org/linux-mtd.git		T: git git://git.infradead.org/linux-mtd.git
			T: git git://git.infradead.org/l2-mtd.git
	S: Maintained		S: Maintained
	F: drivers/mtd/		F: drivers/mtd/
	F: include/linux/mtd/		F: include/linux/mtd/

arch/arm/mach-omap2/gpmc.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1440,6 +1440,8 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
	break;		break;
	}		}

			gpmc_nand_data->flash_bbt = of_get_nand_on_flash_bbt(child);

	val = of_get_nand_bus_width(child);		val = of_get_nand_bus_width(child);
	if (val == 16)		if (val == 16)
	gpmc_nand_data->devsize = NAND_BUSWIDTH_16;		gpmc_nand_data->devsize = NAND_BUSWIDTH_16;

drivers/mtd/bcm47xxpart.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -199,6 +199,17 @@ static int bcm47xxpart_parse(struct mtd_info *master,
	continue;		continue;
	}		}

			/*
			* New (ARM?) devices may have NVRAM in some middle block. Last
			* block will be checked later, so skip it.
			*/
			if (offset != master->size - blocksize &&
			buf[0x000 / 4] == NVRAM_HEADER) {
			bcm47xxpart_add_part(&parts[curr_part++], "nvram",
			offset, 0);
			continue;
			}

	/* Read middle of the block */		/* Read middle of the block */
	if (mtd_read(master, offset + 0x8000, 0x4,		if (mtd_read(master, offset + 0x8000, 0x4,
	&bytes_read, (uint8_t *)buf) < 0) {		&bytes_read, (uint8_t *)buf) < 0) {