From eb530a85b5df4fc7bf3046790e4962248b0f2ac3 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 14 Aug 2013 18:15:15 +0000 Subject: ramips: update v3.10 patches Sync the patches with those sent upstream for v3.12. Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37778 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch (limited to 'target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch') diff --git a/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch new file mode 100644 index 0000000000..b48023dd29 --- /dev/null +++ b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -0,0 +1,39 @@ +From d11f6e47eb748f27ba325bd843cc88bae3ad0e8a Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Tue, 29 Jan 2013 21:11:55 +0100 +Subject: [PATCH 01/25] MTD: m25p80: allow loading mtd name from OF + +In accordance with the physmap flash we should honour the linux,mtd-name +property when deciding what name the mtd device has. + +Signed-off-by: Thomas Langer +Signed-off-by: John Crispin +--- + drivers/mtd/devices/m25p80.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device + unsigned i; + struct mtd_part_parser_data ppdata; + struct device_node __maybe_unused *np = spi->dev.of_node; ++ const char __maybe_unused *of_mtd_name = NULL; + + #ifdef CONFIG_MTD_OF_PARTS + if (!of_device_is_available(np)) + return -ENODEV; ++ of_property_read_string(spi->dev.of_node, ++ "linux,mtd-name", &of_mtd_name); + #endif + + /* Platform data helps sort out which chip type we have, as +@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device + + if (data && data->name) + flash->mtd.name = data->name; ++ else if (of_mtd_name) ++ flash->mtd.name = of_mtd_name; + else + flash->mtd.name = dev_name(&spi->dev); + -- cgit v1.2.3