tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini}

Now that the physmap_of driver is gone, the gemini and versative
extensions are part of the physmap driver. Rename the source files and
the config option to reflect this.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Boris Brezillon 6ca15cfa 642b1e8d

+10 -10
+2 -2
drivers/mtd/maps/Kconfig
··· 74 74 physically into the CPU's memory. The mapping description here is 75 75 taken from OF device tree. 76 76 77 - config MTD_PHYSMAP_OF_VERSATILE 77 + config MTD_PHYSMAP_VERSATILE 78 78 bool "ARM Versatile OF-based physical memory map handling" 79 79 depends on MTD_PHYSMAP_OF 80 80 depends on MFD_SYSCON ··· 84 84 platforms, basically to add a VPP (write protection) callback so 85 85 the flash can be taken out of write protection. 86 86 87 - config MTD_PHYSMAP_OF_GEMINI 87 + config MTD_PHYSMAP_GEMINI 88 88 bool "Cortina Gemini OF-based physical memory map handling" 89 89 depends on MTD_PHYSMAP_OF 90 90 depends on MFD_SYSCON
+2 -2
drivers/mtd/maps/Makefile
··· 18 18 obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o 19 19 obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o 20 20 physmap-objs-y += physmap-core.o 21 - physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o 22 - physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o 21 + physmap-objs-$(CONFIG_MTD_PHYSMAP_VERSATILE) += physmap-versatile.o 22 + physmap-objs-$(CONFIG_MTD_PHYSMAP_GEMINI) += physmap-gemini.o 23 23 physmap-objs := $(physmap-objs-y) 24 24 obj-$(CONFIG_MTD_PHYSMAP) += physmap.o 25 25 obj-$(CONFIG_MTD_PISMO) += pismo.o
+2 -2
drivers/mtd/maps/physmap-core.c
··· 31 31 #include <linux/io.h> 32 32 #include <linux/of_device.h> 33 33 34 - #include "physmap_of_gemini.h" 35 - #include "physmap_of_versatile.h" 34 + #include "physmap-gemini.h" 35 + #include "physmap-versatile.h" 36 36 37 37 struct physmap_flash_info { 38 38 unsigned int nmaps;
+1 -1
drivers/mtd/maps/physmap_of_gemini.c drivers/mtd/maps/physmap-gemini.c
··· 13 13 #include <linux/mfd/syscon.h> 14 14 #include <linux/regmap.h> 15 15 #include <linux/bitops.h> 16 - #include "physmap_of_gemini.h" 16 + #include "physmap-gemini.h" 17 17 18 18 /* 19 19 * The Flash-relevant parts of the global status register
+1 -1
drivers/mtd/maps/physmap_of_gemini.h drivers/mtd/maps/physmap-gemini.h
··· 2 2 #include <linux/of.h> 3 3 #include <linux/mtd/map.h> 4 4 5 - #ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI 5 + #ifdef CONFIG_MTD_PHYSMAP_GEMINI 6 6 int of_flash_probe_gemini(struct platform_device *pdev, 7 7 struct device_node *np, 8 8 struct map_info *map);
+1 -1
drivers/mtd/maps/physmap_of_versatile.c drivers/mtd/maps/physmap-versatile.c
··· 28 28 #include <linux/mfd/syscon.h> 29 29 #include <linux/regmap.h> 30 30 #include <linux/bitops.h> 31 - #include "physmap_of_versatile.h" 31 + #include "physmap-versatile.h" 32 32 33 33 static struct regmap *syscon_regmap; 34 34
+1 -1
drivers/mtd/maps/physmap_of_versatile.h drivers/mtd/maps/physmap-versatile.h
··· 2 2 #include <linux/of.h> 3 3 #include <linux/mtd/map.h> 4 4 5 - #ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE 5 + #ifdef CONFIG_MTD_PHYSMAP_VERSATILE 6 6 int of_flash_probe_versatile(struct platform_device *pdev, 7 7 struct device_node *np, 8 8 struct map_info *map);