diff options
Diffstat (limited to 'target')
3 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index 2107da5435..13f9f82b1a 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -18,7 +18,6 @@ reg = <0x0 0x40000>; #address-cells = <1>; #size-cells = <1>; - linux,mtd-name = "gen_nand"; bbt-use-flash; partition@0 { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi index b35f70b646..688b7da44c 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi @@ -7,7 +7,6 @@ flash@0 { compatible = "spansion,s25fl129p0", "spansion,s25fl129p1"; reg = <0 0>; - linux,mtd-name = "sflash"; spi-max-frequency = <80000000>; m25p,fast-read; diff --git a/target/linux/lantiq/patches-5.4/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-5.4/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch deleted file mode 100644 index fbdd117dea..0000000000 --- a/target/linux/lantiq/patches-5.4/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4400e1f593ea40a51912128adb4f53d59e62cad8 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Wed, 10 Sep 2014 22:40:18 +0200 -Subject: [PATCH 22/36] 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 <thomas.langer@lantiq.com> -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - drivers/mtd/devices/m25p80.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -19,6 +19,7 @@ - #include <linux/errno.h> - #include <linux/module.h> - #include <linux/device.h> -+#include <linux/of.h> - - #include <linux/mtd/mtd.h> - #include <linux/mtd/partitions.h> -@@ -173,6 +174,10 @@ static int m25p_probe(struct spi_mem *sp - }; - char *flash_name; - int ret; -+ const char __maybe_unused *of_mtd_name = NULL; -+ -+ of_property_read_string(spi->dev.of_node, -+ "linux,mtd-name", &of_mtd_name); - - data = dev_get_platdata(&spimem->spi->dev); - -@@ -211,6 +216,8 @@ static int m25p_probe(struct spi_mem *sp - - if (data && data->name) - nor->mtd.name = data->name; -+ else if (of_mtd_name) -+ nor->mtd.name = of_mtd_name; - - if (!nor->mtd.name) - nor->mtd.name = spi_mem_get_name(spimem); |