mtd: spi-nor: mtk-quadspi: rename config to a common one

The quadspi is a generic communication interface which could be shared
with other MediaTek SoCs. Hence rename it to a common one.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Boris Brezillon <bbrezillon@kernel.org>

diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig
index 44fe8018733c283e91ae30994bdf2dd21183c558..414e88749b1fa5e5fb9f7b1dd49b3d8f7435190c 100644 (file)
--- a/drivers/mtd/spi-nor/Kconfig
+++ b/drivers/mtd/spi-nor/Kconfig
@@ -7,14 +7,6 @@ menuconfig MTD_SPI_NOR
 
 if MTD_SPI_NOR
 
-config MTD_MT81xx_NOR
-       tristate "Mediatek MT81xx SPI NOR flash controller"
-       depends on HAS_IOMEM
-       help
-         This enables access to SPI NOR flash, using MT81xx SPI NOR flash
-         controller. This controller does not support generic SPI BUS, it only
-         supports SPI NOR Flash.
-
 config MTD_SPI_NOR_USE_4K_SECTORS
        bool "Use small 4096 B erase sectors"
        default y
@@ -66,6 +58,14 @@ config SPI_HISI_SFC
        help
          This enables support for hisilicon SPI-NOR flash controller.
 
+config SPI_MTK_QUADSPI
+       tristate "MediaTek Quad SPI controller"
+       depends on HAS_IOMEM
+       help
+         This enables support for the Quad SPI controller in master mode.
+         This controller does not support generic SPI. It only supports
+         SPI NOR.
+
 config SPI_NXP_SPIFI
        tristate "NXP SPI Flash Interface (SPIFI)"
        depends on OF && (ARCH_LPC18XX || COMPILE_TEST)

diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index a552efd22958238125cc1bc8d2136e790ccb1cf5..4e4d4005d7a62d33cb80f5e64a8e909958bb1f24 100644 (file)
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_SPI_ASPEED_SMC)    += aspeed-smc.o
 obj-$(CONFIG_SPI_CADENCE_QUADSPI)      += cadence-quadspi.o
 obj-$(CONFIG_SPI_FSL_QUADSPI)  += fsl-quadspi.o
 obj-$(CONFIG_SPI_HISI_SFC)     += hisi-sfc.o
-obj-$(CONFIG_MTD_MT81xx_NOR)    += mtk-quadspi.o
+obj-$(CONFIG_SPI_MTK_QUADSPI)    += mtk-quadspi.o
 obj-$(CONFIG_SPI_NXP_SPIFI)    += nxp-spifi.o
 obj-$(CONFIG_SPI_INTEL_SPI)    += intel-spi.o
 obj-$(CONFIG_SPI_INTEL_SPI_PCI)        += intel-spi-pci.o