Commit d23bbfd7 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

Merge tag 'cadence-mtd-spi-move' into spi-nor/next 

mtd/spi: Move the cadence-quadspi driver to spi-mem

cadence-quadspi has been converted to use the SPIMEM framework,
and moved under drivers/spi/. The series was taken through the
SPI tree. Merge it also in spi-nor/next to avoid conflicts during
the release cycle.
parents 48778464 31fb632b

drivers/mtd/spi-nor/controllers/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -9,17 +9,6 @@ config SPI_ASPEED_SMC 
	  and support for the SPI flash memory controller (SPI) for

	  the host firmware. The implementation only supports SPI NOR.



config SPI_CADENCE_QUADSPI

	tristate "Cadence Quad SPI controller"

	depends on OF && (ARM || ARM64 || COMPILE_TEST)

	help

	  Enable support for the Cadence Quad SPI Flash controller.



	  Cadence QSPI is a specialized controller for connecting an SPI

	  Flash over 1/2/4-bit wide bus. Enable this option if you have a

	  device with a Cadence QSPI controller and want to access the

	  Flash as an MTD device.



config SPI_HISI_SFC

	tristate "Hisilicon FMC SPI NOR Flash Controller(SFC)"

	depends on ARCH_HISI || COMPILE_TEST

drivers/mtd/spi-nor/controllers/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

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_SPI_NXP_SPIFI)	+= nxp-spifi.o

obj-$(CONFIG_SPI_INTEL_SPI)	+= intel-spi.o

drivers/spi/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -200,6 +200,17 @@ config SPI_CADENCE 
	  This selects the Cadence SPI controller master driver

	  used by Xilinx Zynq and ZynqMP.



config SPI_CADENCE_QUADSPI

	tristate "Cadence Quad SPI controller"

	depends on OF && (ARM || ARM64 || COMPILE_TEST)

	help

	  Enable support for the Cadence Quad SPI Flash controller.



	  Cadence QSPI is a specialized controller for connecting an SPI

	  Flash over 1/2/4-bit wide bus. Enable this option if you have a

	  device with a Cadence QSPI controller and want to access the

	  Flash as an MTD device.



config SPI_CLPS711X

	tristate "CLPS711X host SPI controller"

	depends on ARCH_CLPS711X || COMPILE_TEST

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_BCM_QSPI) += spi-iproc-qspi.o spi-brcmstb-qspi.o spi-bcm-qspi. 
obj-$(CONFIG_SPI_BITBANG)		+= spi-bitbang.o

obj-$(CONFIG_SPI_BUTTERFLY)		+= spi-butterfly.o

obj-$(CONFIG_SPI_CADENCE)		+= spi-cadence.o

obj-$(CONFIG_SPI_CADENCE_QUADSPI)	+= spi-cadence-quadspi.o

obj-$(CONFIG_SPI_CLPS711X)		+= spi-clps711x.o

obj-$(CONFIG_SPI_COLDFIRE_QSPI)		+= spi-coldfire-qspi.o

obj-$(CONFIG_SPI_DAVINCI)		+= spi-davinci.o

drivers/mtd/spi-nor/controllers/cadence-quadspi.c→drivers/spi/spi-cadence-quadspi.c

+210 −331

File changed and moved.

Preview size limit exceeded, changes collapsed.