diff options
author | Mark Brown <broonie@kernel.org> | 2020-06-16 02:38:41 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-06-16 02:38:41 +0300 |
commit | 75bc1138ab2b82ac7351592a81f91b0424654a87 (patch) | |
tree | c642b2b1841552215bd9846cd4cde4a7f096af8b /drivers/spi | |
parent | 731f1e71f2655caf611540d43bfee3bb0b481f4e (diff) | |
parent | ba2137f3dbce5e530eba0c67d37a758b42eb26f8 (diff) | |
download | linux-75bc1138ab2b82ac7351592a81f91b0424654a87.tar.xz |
Merge series "spi: bcm63xx: add BMIPS support" from Álvaro Fernández Rojas <noltari@gmail.com>:
BCM63xx SPI and HSSPI controller are present on several BMIPS SoCs (BCM6318,
BCM6328, BCM6358, BCM6362, BCM6368 and BCM63268).
v2: use devm_reset_control_get_exclusive
Álvaro Fernández Rojas (4):
spi: bcm63xx-spi: add reset support
spi: bcm63xx-spi: allow building for BMIPS
spi: bcm63xx-hsspi: add reset support
spi: bcm63xx-hsspi: allow building for BMIPS
drivers/spi/Kconfig | 4 ++--
drivers/spi/spi-bcm63xx-hsspi.c | 17 +++++++++++++++++
drivers/spi/spi-bcm63xx.c | 17 +++++++++++++++++
3 files changed, 36 insertions(+), 2 deletions(-)
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 6d850f1b1d31..357810d6ec2d 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -149,13 +149,13 @@ config SPI_BCM2835AUX config SPI_BCM63XX tristate "Broadcom BCM63xx SPI controller" - depends on BCM63XX || COMPILE_TEST + depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST help Enable support for the SPI controller on the Broadcom BCM63xx SoCs. config SPI_BCM63XX_HSSPI tristate "Broadcom BCM63XX HS SPI controller driver" - depends on BCM63XX || ARCH_BCM_63XX || COMPILE_TEST + depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST help This enables support for the High Speed SPI controller present on newer Broadcom BCM63XX SoCs. |