Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "spi: Various Kconfig fixes"

Browse source 
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>
This commit is contained in:
Tom Rini 2024-10-09 12:25:39 -06:00
commit 2156bec98e
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/spi/Kconfig
View file

@ -99,6 +99,7 @@ config ATMEL_QSPI
config ATMEL_SPI config ATMEL_SPI
bool "Atmel SPI driver" bool "Atmel SPI driver"
depends on ARCH_AT91
default y if ARCH_AT91 default y if ARCH_AT91
help help
This enables driver for the Atmel SPI Controller, present on This enables driver for the Atmel SPI Controller, present on
@ -132,6 +133,7 @@ config BCM63XX_SPI
config BCMSTB_SPI config BCMSTB_SPI
bool "BCMSTB SPI driver" bool "BCMSTB SPI driver"
depends on ARCH_BCMSTB
help help
Enable the Broadcom set-top box SPI driver. This driver can Enable the Broadcom set-top box SPI driver. This driver can
be used to access the SPI flash on platforms embedding this be used to access the SPI flash on platforms embedding this
@ -170,6 +172,7 @@ config CADENCE_OSPI_VERSAL
config CF_SPI config CF_SPI
bool "ColdFire SPI driver" bool "ColdFire SPI driver"
depends on M68K
help help
Enable the ColdFire SPI driver. This driver can be used on Enable the ColdFire SPI driver. This driver can be used on
some m68k SoCs. some m68k SoCs.
@ -197,6 +200,7 @@ config DESIGNWARE_SPI
config EXYNOS_SPI config EXYNOS_SPI
bool "Samsung Exynos SPI driver" bool "Samsung Exynos SPI driver"
depends on ARCH_EXYNOS
help help
Enable the Samsung Exynos SPI driver. This driver can be used to Enable the Samsung Exynos SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this Samsung access the SPI NOR flash on platforms embedding this Samsung
@ -204,6 +208,7 @@ config EXYNOS_SPI
config FSL_DSPI config FSL_DSPI
bool "Freescale DSPI driver" bool "Freescale DSPI driver"
depends on FSL_LAYERSCAPE || ARCH_VF610 || ARCH_LS1021A || ARCH_LS1028A
help help
Enable the Freescale DSPI driver. This driver can be used to Enable the Freescale DSPI driver. This driver can be used to
access the SPI NOR flash and SPI Data flash on platforms embedding access the SPI NOR flash and SPI Data flash on platforms embedding
@ -234,6 +239,7 @@ config GXP_SPI
config ICH_SPI config ICH_SPI
bool "Intel ICH SPI driver" bool "Intel ICH SPI driver"
depends on X86
help help
Enable the Intel ICH SPI driver. This driver can be used to Enable the Intel ICH SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this Intel access the SPI NOR flash on platforms embedding this Intel
@ -247,6 +253,7 @@ config IPROC_QSPI
config KIRKWOOD_SPI config KIRKWOOD_SPI
bool "Marvell Kirkwood SPI Driver" bool "Marvell Kirkwood SPI Driver"
depends on ARCH_KIRKWOOD || ARCH_MVEBU
help help
Enable support for SPI on various Marvell SoCs, such as Enable support for SPI on various Marvell SoCs, such as
Kirkwood and Armada 375. Kirkwood and Armada 375.
@ -282,6 +289,7 @@ config MPC8XX_SPI
config MPC8XXX_SPI config MPC8XXX_SPI
bool "MPC8XXX SPI Driver" bool "MPC8XXX SPI Driver"
depends on MPC83xx || MPC85xx
help help
Enable support for SPI on the MPC8XXX PowerPC SoCs. Enable support for SPI on the MPC8XXX PowerPC SoCs.
@ -341,6 +349,7 @@ config MVEBU_A3700_SPI
config MXS_SPI config MXS_SPI
bool "MXS SPI Driver" bool "MXS SPI Driver"
depends on MACH_IMX
help help
Enable the MXS SPI controller driver. This driver can be used Enable the MXS SPI controller driver. This driver can be used
on the i.MX23 and i.MX28 SoCs. on the i.MX23 and i.MX28 SoCs.
@ -422,6 +431,7 @@ config RENESAS_RPC_SPI
config ROCKCHIP_SFC config ROCKCHIP_SFC
bool "Rockchip SFC Driver" bool "Rockchip SFC Driver"
select BOUNCE_BUFFER
help help
Enable the Rockchip SFC Driver for SPI NOR flash. This device is Enable the Rockchip SFC Driver for SPI NOR flash. This device is
a limited purpose SPI controller for driving NOR flash on certain a limited purpose SPI controller for driving NOR flash on certain
@ -526,6 +536,7 @@ config STM32_SPI
config TEGRA114_SPI config TEGRA114_SPI
bool "nVidia Tegra114 SPI driver" bool "nVidia Tegra114 SPI driver"
depends on ARCH_TEGRA
help help
Enable the nVidia Tegra114 SPI driver. This driver can be used to Enable the nVidia Tegra114 SPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this nVidia Tegra114 access the SPI NOR flash on platforms embedding this nVidia Tegra114
@ -536,6 +547,7 @@ config TEGRA114_SPI
config TEGRA20_SFLASH config TEGRA20_SFLASH
bool "nVidia Tegra20 Serial Flash controller driver" bool "nVidia Tegra20 Serial Flash controller driver"
depends on ARCH_TEGRA
help help
Enable the nVidia Tegra20 Serial Flash controller driver. This driver Enable the nVidia Tegra20 Serial Flash controller driver. This driver
can be used to access the SPI NOR flash on platforms embedding this can be used to access the SPI NOR flash on platforms embedding this
@ -543,6 +555,7 @@ config TEGRA20_SFLASH
config TEGRA20_SLINK config TEGRA20_SLINK
bool "nVidia Tegra20/Tegra30 SLINK driver" bool "nVidia Tegra20/Tegra30 SLINK driver"
depends on ARCH_TEGRA
help help
Enable the nVidia Tegra20/Tegra30 SLINK driver. This driver can Enable the nVidia Tegra20/Tegra30 SLINK driver. This driver can
be used to access the SPI NOR flash on platforms embedding this be used to access the SPI NOR flash on platforms embedding this
@ -550,6 +563,7 @@ config TEGRA20_SLINK
config TEGRA210_QSPI config TEGRA210_QSPI
bool "nVidia Tegra210 QSPI driver" bool "nVidia Tegra210 QSPI driver"
depends on ARCH_TEGRA
help help
Enable the Tegra Quad-SPI (QSPI) driver for T210. This driver Enable the Tegra Quad-SPI (QSPI) driver for T210. This driver
be used to access SPI chips on platforms embedding this be used to access SPI chips on platforms embedding this
@ -558,6 +572,7 @@ config TEGRA210_QSPI
config TI_QSPI config TI_QSPI
bool "TI QSPI driver" bool "TI QSPI driver"
imply TI_EDMA3 imply TI_EDMA3
depends on ARCH_OMAP2PLUS
help help
Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms. Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
This driver support spi flash single, quad and memory reads. This driver support spi flash single, quad and memory reads.
@ -613,12 +628,14 @@ config FSL_ESPI
config SH_QSPI config SH_QSPI
bool "Renesas Quad SPI driver" bool "Renesas Quad SPI driver"
depends on ARCH_RENESAS
help help
Enable the Renesas Quad SPI controller driver. This driver can be Enable the Renesas Quad SPI controller driver. This driver can be
used on Renesas SoCs. used on Renesas SoCs.
config MXC_SPI config MXC_SPI
bool "MXC SPI Driver" bool "MXC SPI Driver"
depends on MACH_IMX
help help
Enable the MXC SPI controller driver. This driver can be used Enable the MXC SPI controller driver. This driver can be used
on various i.MX SoCs such as i.MX31/35/51/6/7. on various i.MX SoCs such as i.MX31/35/51/6/7.

1
drivers/spi/ca_sflash.c
View file

@ -10,6 +10,7 @@
#include <malloc.h> #include <malloc.h>
#include <clk.h> #include <clk.h>
#include <dm.h> #include <dm.h>
#include <dm/device_compat.h>
#include <errno.h> #include <errno.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <linux/compat.h> #include <linux/compat.h>

1
drivers/spi/mtk_spim.c
View file

@ -18,7 +18,6 @@
#include <dm/devres.h> #include <dm/devres.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/completion.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>