Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 940fe282 authored by Stefan Roese's avatar Stefan Roese Committed by David Woodhouse
Browse files

mtd: physmap_of: Loop through all "reg" tuples for mapping 



This patch changes the loop over the "reg" tuples to not exit
directly upon of_address_to_resource() failure but to continue
with the next "reg" tuple instead. This failure could be due to
size = 0, which might be passed via the device-tree.

This is needed for boards, where a "reg" tuple might have size 0
(of_address_to_resource() returns with EINVAL when size = 0).

Example:

Fully equipped board:

	reg = <0 0x00000000 0x00400000
	       0 0x00400000 0x00400000>;

Partially equipped board:

	reg = <0 0x00000000 0x00400000
	       0 0x00400000 0x00000000>;

This could be the case on boards with runtime detection of
multiple NOR flash configurations where the detected flash size
is inserted into the dtb in U-Boot.

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 41bdc602

drivers/mtd/maps/physmap_of.c

+5 −3
Original line number Diff line number Diff line
@@ -267,9 +267,11 @@ static int __devinit of_flash_probe(struct platform_device *dev, 
	for (i = 0; i < count; i++) {

		err = -ENXIO;

		if (of_address_to_resource(dp, i, &res)) {

			dev_err(&dev->dev, "Can't get IO address from device"

				" tree\n");

			goto err_out;

			/*

			 * Continue with next register tuple if this

			 * one is not mappable

			 */

			continue;

		}



		dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",