Unverified Commit e3228ed9 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Mark Brown
Browse files

spi: spi-mem: Convert Aspeed SMC driver to spi-mem 



This SPI driver adds support for the Aspeed static memory controllers
of the AST2600, AST2500 and AST2400 SoCs using the spi-mem interface.

 * AST2600 Firmware SPI Memory Controller (FMC)
   . BMC firmware
   . 3 chip select pins (CE0 ~ CE2)
   . Only supports SPI type flash memory
   . different segment register interface
   . single, dual and quad mode.

 * AST2600 SPI Flash Controller (SPI1 and SPI2)
   . host firmware
   . 2 chip select pins (CE0 ~ CE1)
   . different segment register interface
   . single, dual and quad mode.

 * AST2500 Firmware SPI Memory Controller (FMC)
   . BMC firmware
   . 3 chip select pins (CE0 ~ CE2)
   . supports SPI type flash memory (CE0-CE1)
   . CE2 can be of NOR type flash but this is not supported by the driver
   . single, dual mode.

 * AST2500 SPI Flash Controller (SPI1 and SPI2)
   . host firmware
   . 2 chip select pins (CE0 ~ CE1)
   . single, dual mode.

 * AST2400 New Static Memory Controller (also referred as FMC)
   . BMC firmware
   . New register set
   . 5 chip select pins (CE0 ∼ CE4)
   . supports NOR flash, NAND flash and SPI flash memory.
   . single, dual and quad mode.

Each controller has a memory range on which flash devices contents are
mapped. Each device is assigned a window that can be changed at bootime
with the Segment Address Registers.

Each SPI flash device can then be accessed in two modes: Command and
User. When in User mode, SPI transfers are initiated with accesses to
the memory segment of a device. When in Command mode, memory
operations on the memory segment of a device generate SPI commands
automatically using a Control Register for the settings.

This initial patch adds support for User mode. Command mode needs a little
more work to check that the memory window on the AHB bus fits the device
size. It will come later when support for direct mapping is added.

Single and dual mode RX transfers are supported. Other types than SPI
are not supported.

Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Tested-by: default avatarJoel Stanley <joel@jms.id.au>
Tested-by: default avatarTao Ren <rentao.bupt@gmail.com>
Tested-by: default avatarJae Hyun Yoo <quic_jaehyoo@quicinc.com>
Signed-off-by: default avatarChin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Link: https://lore.kernel.org/r/20220509175616.1089346-4-clg@kaod.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce9858ea

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3107,6 +3107,7 @@ L: openbmc@lists.ozlabs.org (moderated for non-subscribers) 
L:	linux-spi@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml

F:	drivers/spi/spi-aspeed-smc.c









ASPEED VIDEO ENGINE DRIVER









M:	Eddie James <eajames@linux.ibm.com>
































drivers/mtd/spi-nor/controllers/Kconfig



+0
−10






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config SPI_ASPEED_SMC









	tristate "Aspeed flash controllers in SPI mode"









	depends on ARCH_ASPEED || COMPILE_TEST









	depends on HAS_IOMEM && OF









	help









	  This enables support for the Firmware Memory controller (FMC)









	  in the Aspeed AST2500/AST2400 SoCs when attached to SPI NOR chips,









	  and support for the SPI flash memory controller (SPI) for









	  the host firmware. The implementation only supports SPI NOR.



















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_HISI_SFC)	+= hisi-sfc.o









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
























drivers/mtd/spi-nor/controllers/aspeed-smc.c
deleted100644 → 0



+0
−921




























File deleted.
Preview size limit exceeded, changes collapsed.
























drivers/spi/Kconfig



+11
−0






























Original line number
Diff line number
Diff line







@@ -101,6 +101,17 @@ config SPI_ARMADA_3700







	  This enables support for the SPI controller present on the









	  Marvell Armada 3700 SoCs.



















config SPI_ASPEED_SMC









	tristate "Aspeed flash controllers in SPI mode"









	depends on ARCH_ASPEED || COMPILE_TEST









	depends on OF









	help









	  This enables support for the Firmware Memory controller (FMC)









	  in the Aspeed AST2600, AST2500 and AST2400 SoCs when attached









	  to SPI NOR chips, and support for the SPI flash memory









	  controller (SPI) for the host firmware. The implementation









	  only supports SPI NOR.



















config SPI_ATMEL









	tristate "Atmel SPI Controller"









	depends on ARCH_AT91 || COMPILE_TEST