Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 84d04318 authored by Frieder Schrempf's avatar Frieder Schrempf Committed by Mark Brown
Browse files

spi: Add a driver for the Freescale/NXP QuadSPI controller 



This driver is derived from the SPI NOR driver at
mtd/spi-nor/fsl-quadspi.c. It uses the new SPI memory interface
of the SPI framework to issue flash memory operations to up to
four connected flash chips (2 buses with 2 CS each).

The controller does not support generic SPI messages.

This patch also disables the build of the "old" driver and reuses
its Kconfig option CONFIG_SPI_FSL_QUADSPI to replace it.

Signed-off-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Acked-by: default avatarHan Xu <han.xu@nxp.com>
Reviewed-by: default avatarYogesh Gaur <yogeshnarayan.gaur@nxp.com>
Tested-by: default avatarYogesh Gaur <yogeshnarayan.gaur@nxp.com>
Tested-by: default avatarHan Xu <han.xu@nxp.com>
Reviewed-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bfeffd15

drivers/mtd/spi-nor/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ config SPI_CADENCE_QUADSPI 
	  device with a Cadence QSPI controller and want to access the

	  Flash as an MTD device.



config SPI_FSL_QUADSPI

	tristate "Freescale Quad SPI controller"

	depends on ARCH_MXC || SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST

	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_HISI_SFC

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

	depends on ARCH_HISI || COMPILE_TEST

drivers/mtd/spi-nor/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
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_FSL_QUADSPI)	+= fsl-quadspi.o

obj-$(CONFIG_SPI_HISI_SFC)	+= hisi-sfc.o

obj-$(CONFIG_MTD_MT81xx_NOR)    += mtk-quadspi.o

obj-$(CONFIG_SPI_NXP_SPIFI)	+= nxp-spifi.o

drivers/spi/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -268,6 +268,17 @@ config SPI_FSL_LPSPI 
	help

	  This enables Freescale i.MX LPSPI controllers in master mode.



config SPI_FSL_QUADSPI

	tristate "Freescale QSPI controller"

	depends on ARCH_MXC || SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST

	depends on HAS_IOMEM

	help

	  This enables support for the Quad SPI controller in master mode.

	  Up to four flash chips can be connected on two buses with two

	  chipselects each.

	  This controller does not support generic SPI messages. It only

	  supports the high-level SPI memory interface.



config SPI_GPIO

	tristate "GPIO-based bitbanging SPI Master"

	depends on GPIOLIB || COMPILE_TEST

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ obj-$(CONFIG_SPI_FSL_DSPI) += spi-fsl-dspi.o 
obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-lib.o

obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o

obj-$(CONFIG_SPI_FSL_LPSPI)		+= spi-fsl-lpspi.o

obj-$(CONFIG_SPI_FSL_QUADSPI)		+= spi-fsl-qspi.o

obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o

obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o

obj-$(CONFIG_SPI_IMG_SPFI)		+= spi-img-spfi.o

drivers/spi/spi-fsl-qspi.c

0 → 100644
+966 −0

File added.

Preview size limit exceeded, changes collapsed.