Commit 2027cba6 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: merge for-4.4 development into -next development 



A few MAINTAINERS updates, and some DT binding/documentation fixups.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parents 5ba8c27a e488ca9f

Documentation/devicetree/bindings/mtd/partition.txt

+6 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such 
as RedBoot.



The partition table should be a subnode of the mtd node and should be named

'partitions'. Partitions are defined in subnodes of the partitions node.

'partitions'. This node should have the following property:

- compatible : (required) must be "fixed-partitions"

Partitions are then defined in subnodes of the partitions node.



For backwards compatibility partitions as direct subnodes of the mtd device are

supported. This use is discouraged.
@@ -38,6 +40,7 @@ Examples: 


flash@0 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;
@@ -55,6 +58,7 @@ flash@0 { 


flash@1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <2>;
@@ -68,6 +72,7 @@ flash@1 { 


flash@2 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <2>;

		#size-cells = <2>;

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/ofpart.c

+10 −2
Original line number Diff line number Diff line
@@ -44,10 +44,18 @@ static int parse_ofpart_partitions(struct mtd_info *master, 


	ofpart_node = of_get_child_by_name(mtd_node, "partitions");

	if (!ofpart_node) {

		pr_warn("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n",

		/*

		 * We might get here even when ofpart isn't used at all (e.g.,

		 * when using another parser), so don't be louder than

		 * KERN_DEBUG

		 */

		pr_debug("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n",

			 master->name, mtd_node->full_name);

		ofpart_node = mtd_node;

		dedicated = false;

	} else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {

		/* The 'partitions' subnode might be used by another parser */

		return 0;

	}



	/* First count the subnodes */