Skip to content

Commit 71c814e

Browse files
prajnarkbroonie
authored andcommitted
spi: microchip: rename driver file and internal identifiers
The spi-microchip-core.c driver provides support for the Microchip PolarFire SoC (MPFS) "hard" SPI controller. It was originally named "core" with the expectation that it might also cover Microchip's CoreSPI "soft" IP, but that never materialized. The CoreSPI IP cannot be supported by this driver because its register layout differs substantially from the MPFS SPI controller. In practice most of the code would need to be replaced to handle those differences so keeping the drivers separate is the simpler approach. The file and internal symbols are renamed to reflect MPFS support and to free up "spi-microchip-core.c" for CoreSPI driver. Fixes: 9ac8d17 ("spi: add support for microchip fpga spi controllers") Signed-off-by: Prajna Rajendra Kumar <prajna.rajendrakumar@microchip.com> Acked-by: Conor Dooley <conor.dooley@microchip.com> Link: https://patch.msgid.link/20251114104545.284765-2-prajna.rajendrakumar@microchip.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e9a6fb0 commit 71c814e

3 files changed

Lines changed: 115 additions & 113 deletions

File tree

drivers/spi/Kconfig

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -706,15 +706,6 @@ config SPI_MESON_SPIFC
706706
This enables master mode support for the SPIFC (SPI flash
707707
controller) available in Amlogic Meson SoCs.
708708

709-
config SPI_MICROCHIP_CORE
710-
tristate "Microchip FPGA SPI controllers"
711-
depends on SPI_MASTER
712-
help
713-
This enables the SPI driver for Microchip FPGA SPI controllers.
714-
Say Y or M here if you want to use the "hard" controllers on
715-
PolarFire SoC.
716-
If built as a module, it will be called spi-microchip-core.
717-
718709
config SPI_MICROCHIP_CORE_QSPI
719710
tristate "Microchip FPGA QSPI controllers"
720711
depends on SPI_MASTER
@@ -871,6 +862,16 @@ config SPI_PL022
871862
controller. If you have an embedded system with an AMBA(R)
872863
bus and a PL022 controller, say Y or M here.
873864

865+
config SPI_POLARFIRE_SOC
866+
867+
tristate "Microchip FPGA SPI controllers"
868+
depends on SPI_MASTER && ARCH_MICROCHIP
869+
help
870+
This enables the SPI driver for Microchip FPGA SPI controllers.
871+
Say Y or M here if you want to use the "hard" controllers on
872+
PolarFire SoC.
873+
If built as a module, it will be called spi-mpfs.
874+
874875
config SPI_PPC4xx
875876
tristate "PPC4xx SPI Controller"
876877
depends on PPC32 && 4xx

drivers/spi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ obj-$(CONFIG_SPI_LOONGSON_PLATFORM) += spi-loongson-plat.o
8686
obj-$(CONFIG_SPI_LP8841_RTC) += spi-lp8841-rtc.o
8787
obj-$(CONFIG_SPI_MESON_SPICC) += spi-meson-spicc.o
8888
obj-$(CONFIG_SPI_MESON_SPIFC) += spi-meson-spifc.o
89-
obj-$(CONFIG_SPI_MICROCHIP_CORE) += spi-microchip-core.o
9089
obj-$(CONFIG_SPI_MICROCHIP_CORE_QSPI) += spi-microchip-core-qspi.o
9190
obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o
9291
obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o
@@ -97,6 +96,7 @@ obj-$(CONFIG_SPI_MTK_NOR) += spi-mtk-nor.o
9796
obj-$(CONFIG_SPI_MTK_SNFI) += spi-mtk-snfi.o
9897
obj-$(CONFIG_SPI_MXIC) += spi-mxic.o
9998
obj-$(CONFIG_SPI_MXS) += spi-mxs.o
99+
obj-$(CONFIG_SPI_POLARFIRE_SOC) += spi-mpfs.o
100100
obj-$(CONFIG_SPI_WPCM_FIU) += spi-wpcm-fiu.o
101101
obj-$(CONFIG_SPI_NPCM_FIU) += spi-npcm-fiu.o
102102
obj-$(CONFIG_SPI_NPCM_PSPI) += spi-npcm-pspi.o

0 commit comments

Comments
 (0)