Commit a637b0d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MTD update from David Woodhouse:

 - Lots of cleanups from Artem, including deletion of some obsolete
   drivers

 - Support partitions larger than 4GiB in device tree

 - Support for new SPI chips

* tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd: (83 commits)
  mtd: omap2: Use module_platform_driver()
  mtd: bf5xx_nand: Use module_platform_driver()
  mtd: denali_dt: Remove redundant use of of_match_ptr
  mtd: denali_dt: Change return value to fix smatch warning
  mtd: denali_dt: Use module_platform_driver()
  mtd: denali_dt: Fix incorrect error check
  mtd: nand: subpage write support for hardware based ECC schemes
  mtd: omap2: use msecs_to_jiffies()
  mtd: nand_ids: use size macros
  mtd: nand_ids: improve LEGACY_ID_NAND macro a bit
  mtd: add 4 Toshiba nand chips for the full-id case
  mtd: add the support to parse out the full-id nand type
  mtd: add new fields to nand_flash_dev{}
  mtd: sh_flctl: Use of_match_ptr() macro
  mtd: gpio: Use of_match_ptr() macro
  mtd: gpio: Use devm_kzalloc()
  mtd: davinci_nand: Use of_match_ptr()
  mtd: dataflash: Use of_match_ptr() macro
  mtd: remove h720x flash support
  mtd: onenand: remove OneNAND simulator
  ...
parents f78089e8 cdb6404c

Documentation/ABI/testing/sysfs-class-mtd

+2 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ Description: 
		The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond

		to each /dev/mtdX character device.  These may represent

		physical/simulated flash devices, partitions on a flash

		device, or concatenated flash devices.  They exist regardless

		of whether CONFIG_MTD_CHAR is actually enabled.

		device, or concatenated flash devices.



What:		/sys/class/mtd/mtdXro/

Date:		April 2009
@@ -23,8 +22,7 @@ KernelVersion: 2.6.29 
Contact:	linux-mtd@lists.infradead.org

Description:

		These directories provide the corresponding read-only device

		nodes for /sys/class/mtd/mtdX/ .  They are only created

		(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.

		nodes for /sys/class/mtd/mtdX/ .



What:		/sys/class/mtd/mtdX/dev

Date:		April 2009

Documentation/devicetree/bindings/mtd/partition.txt

+34 −2
Original line number Diff line number Diff line
@@ -5,8 +5,12 @@ on platforms which have strong conventions about which portions of a flash are 
used for what purposes, but which don't use an on-flash partition table such

as RedBoot.



#address-cells & #size-cells must both be present in the mtd device and be

equal to 1.

#address-cells & #size-cells must both be present in the mtd device. There are

two valid values for both:

<1>: for partitions that require a single 32-bit cell to represent their

     size/address (aka the value is below 4 GiB)

<2>: for partitions that require two 32-bit cells to represent their

     size/address (aka the value is 4 GiB or greater).



Required properties:

- reg : The partition's offset and size within the mtd bank.
@@ -36,3 +40,31 @@ flash@0 { 
		reg = <0x0100000 0x200000>;

	};

};



flash@1 {

	#address-cells = <1>;

	#size-cells = <2>;



	/* a 4 GiB partition */

	partition@0 {

		label = "filesystem";

		reg = <0x00000000 0x1 0x00000000>;

	};

};



flash@2 {

	#address-cells = <2>;

	#size-cells = <2>;



	/* an 8 GiB partition */

	partition@0 {

		label = "filesystem #1";

		reg = <0x0 0x00000000 0x2 0x00000000>;

	};



	/* a 4 GiB partition */

	partition@200000000 {

		label = "filesystem #2";

		reg = <0x2 0x00000000 0x1 0x00000000>;

	};

};

arch/arm/mach-pxa/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ config MACH_XCEP 
	select MTD

	select MTD_CFI

	select MTD_CFI_INTELEXT

	select MTD_CHAR

	select MTD_PHYSMAP

	select PXA25x

	select SMC91X

arch/cris/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CFI

	select MTD_CFI_AMDSTD

	select MTD_JEDECPROBE if ETRAX_ARCH_V32

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_COMPLEX_MAPPINGS

	help

arch/cris/arch-v32/drivers/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CFI

	select MTD_CFI_AMDSTD

	select MTD_JEDECPROBE

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_COMPLEX_MAPPINGS

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE