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

Commit bf011f2e authored by Daniel Schwierzeck's avatar Daniel Schwierzeck Committed by David Woodhouse
Browse files

mtd: mips: lantiq: reintroduce support for cmdline partitions 



Since commit ca97dec2 the
command line parsing of MTD partitions does not work anymore.

Signed-off-by: default avatarDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: stable@kernel.org [3.2+]
Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d42b5de3

drivers/mtd/maps/lantiq-flash.c

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct ltq_mtd { 
};



static char ltq_map_name[] = "ltq_nor";

static const char *ltq_probe_types[] __devinitconst = { "cmdlinepart", NULL };



static map_word

ltq_read16(struct map_info *map, unsigned long adr)
@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pdev) 
	cfi->addr_unlock1 ^= 1;

	cfi->addr_unlock2 ^= 1;



	err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0,

	err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types, 0,

			ltq_mtd_data->parts, ltq_mtd_data->nr_parts);

	if (err) {

		dev_err(&pdev->dev, "failed to add partitions\n");