From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jun 2026 02:26:47 +0000 (+0530)
Subject: Merge tag 'spi-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41cfae42c75a40783a6fc402f66c3c7852961e2;p=thirdparty%2Flinux.git

Merge tag 'spi-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "This has been quite a busy release, mainly due to the subsystem wide
  work Johan Hovold has done to modernise resource allocation for the
  subsystem on probe, the subsystem did some very clever allocation
  management pre devm which didn't quite mesh comfortably with managed
  allocations and made it far too easy to introduce error handling and
  removal bugs.

   - Cleanup and simplification of controller struct allocation, moving
     everything over to devm and making the devm APIs more robust, from
     Johan Hovold

   - Support for spi-mem devices that don't assert chip select and
     support for a secondary read command for memory mapped flashes,
     some commits for this are shared with mtd.

   - Support for SpacemiT K1"

* tag 'spi-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (118 commits)
  spi: Fix mismatched DT property access types
  spi: xilinx: use FIFO occupancy register to determine buffer size
  spi: spi-mem: Fix spi_controller_mem_ops kdoc
  spi: xilinx: let transfers timeout in case of no IRQ
  spi: dt-bindings: nuvoton,npcm750-fiu: Convert to DT schema
  spi: meson-spifc: fix runtime PM leak on remove
  spi: Use named initializers for platform_device_id arrays
  spi: rzv2h-rspi: Add suspend/resume support
  spi: dw-pci: remove redundant pci_free_irq_vectors() calls
  spi: ep93xx: fix double-free of zeropage on DMA setup failure
  spi: cadence-xspi: Revert COMPILE_TEST support
  spi: cadence-xspi: Support 32bit and 64bit slave dma interface
  spi: tegra210-quad: Allocate DMA memory for DMA engine
  spi: imx: replace dmaengine_terminate_all() with dmaengine_terminate_sync()
  spi: fsl-lpspi: terminate the RX channel on TX prepare failure path
  spi: fsl-lpspi: replace dmaengine_terminate_all() with dmaengine_terminate_sync()
  spi: atmel: fix DMA channel and bounce buffer leaks
  spi: omap2-mcspi: Use of_device_get_match_data()
  spi: Use named initializers for arrays of i2c_device_data
  spi: aspeed: Replace VLA parameter with flat pointer in calibration helper
  ...
---

c41cfae42c75a40783a6fc402f66c3c7852961e2
diff --cc drivers/acpi/acpi_apd.c
index 86678ee22a041,4d5a51d30adcd..008bd0552cb78
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@@ -182,11 -182,11 +182,16 @@@ static const struct apd_device_desc hip
  	.fixed_clk_rate = 250000000,
  };
  
+ static const struct apd_device_desc leca_spi_desc = {
+ 	.setup = acpi_apd_setup,
+ 	.fixed_clk_rate = 400000000,
+ };
+ 
 +static const struct apd_device_desc leca_i2c_desc = {
 +	.setup = acpi_apd_setup,
 +	.fixed_clk_rate = 250000000,
 +};
 +
  #endif /* CONFIG_ARM64 */
  
  #endif
@@@ -257,7 -257,7 +262,8 @@@ static const struct acpi_device_id acpi
  	{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },
  	{ "HISI02A3", APD_ADDR(hip08_lite_i2c_desc) },
  	{ "HISI0173", APD_ADDR(hip08_spi_desc) },
+ 	{ "LECA0002", APD_ADDR(leca_spi_desc) },
 +	{ "LECA0003", APD_ADDR(leca_i2c_desc) },
  	{ "NXP0001", APD_ADDR(nxp_i2c_desc) },
  #endif
  	{ }