diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-20 19:01:28 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-20 19:01:28 +0300 |
| commit | b3fc4e0e966eaaf2f8afa1de3280770acd838b87 (patch) | |
| tree | efa455a809e81a404010db0fa7b2886f1a324af9 /drivers/spi/Kconfig | |
| parent | 2d54911644e4d5ea1ba01500d3a46dabc3b1e75a (diff) | |
| parent | 916d9802e4b0723c1e4650e58e04c0259c14b85c (diff) | |
| download | linux-b3fc4e0e966eaaf2f8afa1de3280770acd838b87.tar.xz | |
Merge branch 'spi-4.21' into spi-next
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 7d3a5c94727e..a5b0761c890f 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -397,6 +397,13 @@ config SPI_MT65XX say Y or M here.If you are not sure, say N. SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs. +config SPI_NPCM_PSPI + tristate "Nuvoton NPCM PSPI Controller" + depends on ARCH_NPCM || COMPILE_TEST + help + This driver provides support for Nuvoton NPCM BMC + Peripheral SPI controller in master mode. + config SPI_NUC900 tristate "Nuvoton NUC900 series SPI" depends on ARCH_W90X900 @@ -435,7 +442,7 @@ config SPI_OMAP_UWIRE config SPI_OMAP24XX tristate "McSPI driver for OMAP" - depends on ARCH_OMAP2PLUS || COMPILE_TEST + depends on ARCH_OMAP2PLUS || ARCH_K3 || COMPILE_TEST select SG_SPLIT help SPI master controller for OMAP24XX and later Multichannel SPI @@ -684,6 +691,12 @@ config SPI_SUN6I help This enables using the SPI controller on the Allwinner A31 SoCs. +config SPI_MXIC + tristate "Macronix MX25F0A SPI controller" + depends on SPI_MASTER + help + This selects the Macronix MX25F0A SPI controller driver. + config SPI_MXS tristate "Freescale MXS SPI controller" depends on ARCH_MXS |