kconfig: Rename PL353 to PL35X

ARM PL353 driver can be used also on PL351. Use the right configuration
options not to be PL353 only.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/configs/xilinx_zynq_defconfig b/arch/arm/configs/xilinx_zynq_defconfig
index 577c0fb9a5519d3e5d475b8f925a604a819a83f7..8072996b9caec4310150ebedaca4a7ad697d21c2 100644 (file)
--- a/arch/arm/configs/xilinx_zynq_defconfig
+++ b/arch/arm/configs/xilinx_zynq_defconfig
@@ -82,7 +82,7 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PL353=y
+CONFIG_MTD_NAND_PL35X=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y

diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index 910d2aff4de50f99a0837798bd1700caadc7c739..83baa2bacdfb43aa0d030595b86a5708a307c194 100644 (file)
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -83,12 +83,13 @@ config FSL_IFC
        bool
        depends on FSL_SOC
 
-config PL353_SMC
-       bool "ARM PL353 Static Memory Controller(SMC) driver"
+config PL35X_SMC
+       bool "ARM PL35X Static Memory Controller(SMC) driver"
        default y
        depends on ARM
        help
-         This driver is for the ARM PL353 Static Memory Controller(SMC) module.
+         This driver is for the ARM PL351/PL353 Static Memory
+         Controller(SMC) module.
 
 source "drivers/memory/tegra/Kconfig"
 

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index 376359288ce040b54842eda5e2cb690f473bce8a..33d02648fc549a18ca98fae7c6d7a671a40e4abd 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -13,6 +13,6 @@ obj-$(CONFIG_FSL_CORENET_CF)  += fsl-corenet-cf.o
 obj-$(CONFIG_FSL_IFC)          += fsl_ifc.o
 obj-$(CONFIG_MVEBU_DEVBUS)     += mvebu-devbus.o
 obj-$(CONFIG_TEGRA20_MC)       += tegra20-mc.o
-obj-$(CONFIG_PL353_SMC)                += pl35x-smc.o
+obj-$(CONFIG_PL35X_SMC)                += pl35x-smc.o
 
 obj-$(CONFIG_TEGRA_MC)         += tegra/

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index cbded685cdbe8d347629db8f6913f78d196d85d4..a662508c662afd9c35317b8ef2a18fddc58d0202 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -497,12 +497,13 @@ config MTD_NAND_NUC900
          This enables the driver for the NAND Flash on evaluation board based
          on w90p910 / NUC9xx.
 
-config MTD_NAND_PL353
-       tristate "ARM Pl353 NAND flash driver"
+config MTD_NAND_PL35X
+       tristate "ARM Pl35X NAND flash driver"
        depends on MTD_NAND && ARM
-       depends on PL353_SMC
+       depends on PL35X_SMC
        help
-         This enables access to the NAND flash device on PL353 SMC controller.
+         This enables access to the NAND flash device on PL351/PL353
+         SMC controller.
 
 config MTD_NAND_JZ4740
        tristate "Support for JZ4740 SoC NAND controller"

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index c49e558be694b0051d67d7964a5b1bfd605ca673..aa8f9e8e9db793c958aa7e11ada13f23a33b6cf0 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_MTD_NAND_GPMI_NAND)      += gpmi-nand/
 obj-$(CONFIG_MTD_NAND_XWAY)            += xway_nand.o
 obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)   += bcm47xxnflash/
 obj-$(CONFIG_MTD_NAND_SUNXI)           += sunxi_nand.o
-obj-$(CONFIG_MTD_NAND_PL353)           += pl35x_nand.o
+obj-$(CONFIG_MTD_NAND_PL35X)           += pl35x_nand.o
 obj-$(CONFIG_MTD_NAND_ARASAN)          += arasan_nfc.o
 obj-$(CONFIG_MTD_NAND_HISI504)         += hisi504_nand.o