Hi, Ryder, On 01/14/2019 07:12 AM, Ryder Lee wrote: > 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@xxxxxxxxxxxx> > --- > Changes since v1: rebase to v5.0-rc1. The patch doesn't apply on v5.0-rc1 or rc2. > --- > drivers/mtd/spi-nor/Kconfig | 16 ++++++++-------- > drivers/mtd/spi-nor/Makefile | 2 +- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig > index b433e5f..99d9d53 100644 > --- 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 > @@ -68,6 +60,14 @@ config SPI_NXP_SPIFI > Flash. Enable this option if you have a device with a SPIFI > controller and want to access the Flash as a mtd device. > > +config SPI_MTK_QUADSPI Since you are moving the config into the file, would you mind to put your config in an alphabetical order? Thanks, ta > + 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_INTEL_SPI > tristate > > diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile > index 2adedbe..189a15c 100644 > --- a/drivers/mtd/spi-nor/Makefile > +++ b/drivers/mtd/spi-nor/Makefile > @@ -3,7 +3,7 @@ obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o > obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o > obj-$(CONFIG_SPI_CADENCE_QUADSPI) += cadence-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 >
