Merge patch series "spi: Various Kconfig fixes"
John Watts <contact@jookia.org> says:
I'm doing some SPI work so I tried to compile all the drivers on my
sunxi board to try and avoid some regressions. This failed, so here are
some fixes for this.
Link: https://lore.kernel.org/r/20240427-spikconfig-v1-0-8a54772522f4@jookia.org
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 18dfd17..fa817ec 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -99,6 +99,7 @@
config ATMEL_SPI
bool "Atmel SPI driver"
+ depends on ARCH_AT91
default y if ARCH_AT91
help
This enables driver for the Atmel SPI Controller, present on
@@ -132,6 +133,7 @@
config BCMSTB_SPI
bool "BCMSTB SPI driver"
+ depends on ARCH_BCMSTB
help
Enable the Broadcom set-top box SPI driver. This driver can
be used to access the SPI flash on platforms embedding this
@@ -170,6 +172,7 @@
config CF_SPI
bool "ColdFire SPI driver"
+ depends on M68K
help
Enable the ColdFire SPI driver. This driver can be used on
some m68k SoCs.
@@ -197,6 +200,7 @@
config EXYNOS_SPI
bool "Samsung Exynos SPI driver"
+ depends on ARCH_EXYNOS
help
Enable the Samsung Exynos SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this Samsung
@@ -204,6 +208,7 @@
config FSL_DSPI
bool "Freescale DSPI driver"
+ depends on FSL_LAYERSCAPE || ARCH_VF610 || ARCH_LS1021A || ARCH_LS1028A
help
Enable the Freescale DSPI driver. This driver can be used to
access the SPI NOR flash and SPI Data flash on platforms embedding
@@ -234,6 +239,7 @@
config ICH_SPI
bool "Intel ICH SPI driver"
+ depends on X86
help
Enable the Intel ICH SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this Intel
@@ -247,6 +253,7 @@
config KIRKWOOD_SPI
bool "Marvell Kirkwood SPI Driver"
+ depends on ARCH_KIRKWOOD || ARCH_MVEBU
help
Enable support for SPI on various Marvell SoCs, such as
Kirkwood and Armada 375.
@@ -282,6 +289,7 @@
config MPC8XXX_SPI
bool "MPC8XXX SPI Driver"
+ depends on MPC83xx || MPC85xx
help
Enable support for SPI on the MPC8XXX PowerPC SoCs.
@@ -341,6 +349,7 @@
config MXS_SPI
bool "MXS SPI Driver"
+ depends on MACH_IMX
help
Enable the MXS SPI controller driver. This driver can be used
on the i.MX23 and i.MX28 SoCs.
@@ -422,6 +431,7 @@
config ROCKCHIP_SFC
bool "Rockchip SFC Driver"
+ select BOUNCE_BUFFER
help
Enable the Rockchip SFC Driver for SPI NOR flash. This device is
a limited purpose SPI controller for driving NOR flash on certain
@@ -526,6 +536,7 @@
config TEGRA114_SPI
bool "nVidia Tegra114 SPI driver"
+ depends on ARCH_TEGRA
help
Enable the nVidia Tegra114 SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this nVidia Tegra114
@@ -536,6 +547,7 @@
config TEGRA20_SFLASH
bool "nVidia Tegra20 Serial Flash controller driver"
+ depends on ARCH_TEGRA
help
Enable the nVidia Tegra20 Serial Flash controller driver. This driver
can be used to access the SPI NOR flash on platforms embedding this
@@ -543,6 +555,7 @@
config TEGRA20_SLINK
bool "nVidia Tegra20/Tegra30 SLINK driver"
+ depends on ARCH_TEGRA
help
Enable the nVidia Tegra20/Tegra30 SLINK driver. This driver can
be used to access the SPI NOR flash on platforms embedding this
@@ -550,6 +563,7 @@
config TEGRA210_QSPI
bool "nVidia Tegra210 QSPI driver"
+ depends on ARCH_TEGRA
help
Enable the Tegra Quad-SPI (QSPI) driver for T210. This driver
be used to access SPI chips on platforms embedding this
@@ -558,6 +572,7 @@
config TI_QSPI
bool "TI QSPI driver"
imply TI_EDMA3
+ depends on ARCH_OMAP2PLUS
help
Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
This driver support spi flash single, quad and memory reads.
@@ -613,12 +628,14 @@
config SH_QSPI
bool "Renesas Quad SPI driver"
+ depends on ARCH_RENESAS
help
Enable the Renesas Quad SPI controller driver. This driver can be
used on Renesas SoCs.
config MXC_SPI
bool "MXC SPI Driver"
+ depends on MACH_IMX
help
Enable the MXC SPI controller driver. This driver can be used
on various i.MX SoCs such as i.MX31/35/51/6/7.
diff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c
index a99a8a4..db32e39 100644
--- a/drivers/spi/ca_sflash.c
+++ b/drivers/spi/ca_sflash.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <clk.h>
#include <dm.h>
+#include <dm/device_compat.h>
#include <errno.h>
#include <fdtdec.h>
#include <linux/compat.h>
diff --git a/drivers/spi/mtk_spim.c b/drivers/spi/mtk_spim.c
index b360eca..b66bcfc 100644
--- a/drivers/spi/mtk_spim.c
+++ b/drivers/spi/mtk_spim.c
@@ -18,7 +18,6 @@
#include <dm/devres.h>
#include <dm/pinctrl.h>
#include <linux/bitops.h>
-#include <linux/completion.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/iopoll.h>