]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: aspeed: Improve handling of shared SPI
authorMark Brown <broonie@kernel.org>
Wed, 28 Jan 2026 11:22:06 +0000 (11:22 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 28 Jan 2026 11:22:06 +0000 (11:22 +0000)
Merge series from Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>:

This patch series improves handling of SPI controllers that are
shared by spi-mem devices and other SPI peripherals.

The primary goal of this series is to support non-spi-mem devices in
the ASPEED FMC/SPI controller driver. It also addresses an issue in
the spi-mem framework observed when different types of SPI devices
operate concurrently on the same controller, ensuring that spi-mem
operations are properly serialized.

1  2 
MAINTAINERS
drivers/spi/spi-aspeed-smc.c
drivers/spi/spi-cadence.c
drivers/spi/spi-hisi-kunpeng.c
drivers/spi/spi-mem.c
drivers/spi/spi-sprd-adi.c

diff --cc MAINTAINERS
Simple merge
index fc565065c8fd78b0c9962a67eb923631fc19e80f,3949f94b6667b982207fd006a798caf6e3bd75e5..9c286e534bf0e362cefb23072cee919e9f1285c8
@@@ -898,6 -1009,10 +1009,9 @@@ static int aspeed_spi_probe(struct plat
        ctlr->setup = aspeed_spi_setup;
        ctlr->cleanup = aspeed_spi_cleanup;
        ctlr->num_chipselect = of_get_available_child_count(dev->of_node);
 -      ctlr->dev.of_node = dev->of_node;
+       ctlr->prepare_message = aspeed_spi_user_prepare_msg;
+       ctlr->unprepare_message = aspeed_spi_user_unprepare_msg;
+       ctlr->transfer_one = aspeed_spi_user_transfer;
  
        aspi->num_cs = ctlr->num_chipselect;
  
Simple merge
Simple merge
Simple merge
Simple merge