Commit 6ca15cfa authored by Boris Brezillon's avatar Boris Brezillon
Browse files

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: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 642b1e8d

drivers/mtd/maps/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ config MTD_PHYSMAP_OF 
	  physically into the CPU's memory. The mapping description here is

	  physically into the CPU's memory. The mapping description here is

	  taken from OF device tree.

	  taken from OF device tree.





config MTD_PHYSMAP_OF_VERSATILE

config MTD_PHYSMAP_VERSATILE

	bool "ARM Versatile OF-based physical memory map handling"

	bool "ARM Versatile OF-based physical memory map handling"

	depends on MTD_PHYSMAP_OF

	depends on MTD_PHYSMAP_OF

	depends on MFD_SYSCON

	depends on MFD_SYSCON
@@ -84,7 +84,7 @@ config MTD_PHYSMAP_OF_VERSATILE 
	  platforms, basically to add a VPP (write protection) callback so

	  platforms, basically to add a VPP (write protection) callback so

	  the flash can be taken out of write protection.

	  the flash can be taken out of write protection.





config MTD_PHYSMAP_OF_GEMINI

config MTD_PHYSMAP_GEMINI

	bool "Cortina Gemini OF-based physical memory map handling"

	bool "Cortina Gemini OF-based physical memory map handling"

	depends on MTD_PHYSMAP_OF

	depends on MTD_PHYSMAP_OF

	depends on MFD_SYSCON

	depends on MFD_SYSCON

drivers/mtd/maps/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,8 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o 
obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o

obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o

obj-$(CONFIG_MTD_PXA2XX)	+= pxa2xx-flash.o

obj-$(CONFIG_MTD_PXA2XX)	+= pxa2xx-flash.o

physmap-objs-y			+= physmap-core.o

physmap-objs-y			+= physmap-core.o

physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o

physmap-objs-$(CONFIG_MTD_PHYSMAP_VERSATILE) += physmap-versatile.o

physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o

physmap-objs-$(CONFIG_MTD_PHYSMAP_GEMINI) += physmap-gemini.o

physmap-objs			:= $(physmap-objs-y)

physmap-objs			:= $(physmap-objs-y)

obj-$(CONFIG_MTD_PHYSMAP)	+= physmap.o

obj-$(CONFIG_MTD_PHYSMAP)	+= physmap.o

obj-$(CONFIG_MTD_PISMO)		+= pismo.o

obj-$(CONFIG_MTD_PISMO)		+= pismo.o

drivers/mtd/maps/physmap-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/of_device.h>

#include <linux/of_device.h>





#include "physmap_of_gemini.h"

#include "physmap-gemini.h"

#include "physmap_of_versatile.h"

#include "physmap-versatile.h"





struct physmap_flash_info {

struct physmap_flash_info {

	unsigned int		nmaps;

	unsigned int		nmaps;

drivers/mtd/maps/physmap_of_gemini.c→drivers/mtd/maps/physmap-gemini.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/bitops.h>

#include <linux/bitops.h>

#include "physmap_of_gemini.h"

#include "physmap-gemini.h"





/*

/*

 * The Flash-relevant parts of the global status register

 * The Flash-relevant parts of the global status register

drivers/mtd/maps/physmap_of_gemini.h→drivers/mtd/maps/physmap-gemini.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <linux/of.h>

#include <linux/of.h>

#include <linux/mtd/map.h>

#include <linux/mtd/map.h>





#ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI

#ifdef CONFIG_MTD_PHYSMAP_GEMINI

int of_flash_probe_gemini(struct platform_device *pdev,

int of_flash_probe_gemini(struct platform_device *pdev,

			  struct device_node *np,

			  struct device_node *np,

			  struct map_info *map);

			  struct map_info *map);