Skip to content

Commit 6beb9fe

Browse files
brooniebroonie
committed
Merge remote-tracking branches 'spi/topic/acpi', 'spi/topic/axi-engine', 'spi/topic/bcm2835' and 'spi/topic/bcm2835aux' into spi-next
5 parents ce7fb74 + a0a9071 + b1353d1 + 763dedf + e9dd4ed commit 6beb9fe

File tree

8 files changed

+737
-63
lines changed

8 files changed

+737
-63
lines changed

‎Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Analog Devices AXI SPI Engine controller Device Tree Bindings
2+
3+
Required properties:
4+
- compatible : Must be "adi,axi-spi-engine-1.00.a""
5+
- reg : Physical base address and size of the register map.
6+
- interrupts : Property with a value describing the interrupt
7+
number.
8+
- clock-names : List of input clock names - "s_axi_aclk", "spi_clk"
9+
- clocks : Clock phandles and specifiers (See clock bindings for
10+
details on clock-names and clocks).
11+
- #address-cells : Must be <1>
12+
- #size-cells : Must be <0>
13+
14+
Optional subnodes:
15+
Subnodes are use to represent the SPI slave devices connected to the SPI
16+
master. They follow the generic SPI bindings as outlined in spi-bus.txt.
17+
18+
Example:
19+
20+
spi@@44a00000 {
21+
compatible = "adi,axi-spi-engine-1.00.a";
22+
reg = <0x44a00000 0x1000>;
23+
interrupts = <0 56 4>;
24+
clocks = <&clkc 15 &clkc 15>;
25+
clock-names = "s_axi_aclk", "spi_clk";
26+
27+
#address-cells = <1>;
28+
#size-cells = <0>;
29+
30+
/* SPI devices */
31+
};

‎drivers/spi/Kconfig

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,26 @@ config SPI_ATMEL
7575
This selects a driver for the Atmel SPI Controller, present on
7676
many AT32 (AVR32) and AT91 (ARM) chips.
7777

78+
config SPI_AU1550
79+
tristate "Au1550/Au1200/Au1300 SPI Controller"
80+
depends on MIPS_ALCHEMY
81+
select SPI_BITBANG
82+
help
83+
If you say yes to this option, support will be included for the
84+
PSC SPI controller found on Au1550, Au1200 and Au1300 series.
85+
86+
config SPI_AXI_SPI_ENGINE
87+
tristate "Analog Devices AXI SPI Engine controller"
88+
depends on HAS_IOMEM
89+
help
90+
This enables support for the Analog Devices AXI SPI Engine SPI controller.
91+
It is part of the SPI Engine framework that is used in some Analog Devices
92+
reference designs for FPGAs.
93+
7894
config SPI_BCM2835
7995
tristate "BCM2835 SPI controller"
8096
depends on GPIOLIB
8197
depends on ARCH_BCM2835 || COMPILE_TEST
82-
depends on GPIOLIB
8398
help
8499
This selects a driver for the Broadcom BCM2835 SPI master.
85100

@@ -90,8 +105,7 @@ config SPI_BCM2835
90105

91106
config SPI_BCM2835AUX
92107
tristate "BCM2835 SPI auxiliary controller"
93-
depends on ARCH_BCM2835 || COMPILE_TEST
94-
depends on GPIOLIB
108+
depends on (ARCH_BCM2835 && GPIOLIB) || COMPILE_TEST
95109
help
96110
This selects a driver for the Broadcom BCM2835 SPI aux master.
97111

@@ -118,14 +132,6 @@ config SPI_BFIN_SPORT
118132
help
119133
Enable support for a SPI bus via the Blackfin SPORT peripheral.
120134

121-
config SPI_AU1550
122-
tristate "Au1550/Au1200/Au1300 SPI Controller"
123-
depends on MIPS_ALCHEMY
124-
select SPI_BITBANG
125-
help
126-
If you say yes to this option, support will be included for the
127-
PSC SPI controller found on Au1550, Au1200 and Au1300 series.
128-
129135
config SPI_BCM53XX
130136
tristate "Broadcom BCM53xx SPI controller"
131137
depends on ARCH_BCM_5301X
@@ -197,6 +203,23 @@ config SPI_DAVINCI
197203
help
198204
SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
199205

206+
config SPI_DESIGNWARE
207+
tristate "DesignWare SPI controller core support"
208+
help
209+
general driver for SPI controller core from DesignWare
210+
211+
config SPI_DW_PCI
212+
tristate "PCI interface driver for DW SPI core"
213+
depends on SPI_DESIGNWARE && PCI
214+
215+
config SPI_DW_MID_DMA
216+
bool "DMA support for DW SPI controller on Intel MID platform"
217+
depends on SPI_DW_PCI && DW_DMAC_PCI
218+
219+
config SPI_DW_MMIO
220+
tristate "Memory-mapped io interface driver for DW SPI core"
221+
depends on SPI_DESIGNWARE
222+
200223
config SPI_DLN2
201224
tristate "Diolan DLN-2 USB SPI adapter"
202225
depends on MFD_DLN2
@@ -346,6 +369,13 @@ config SPI_MT65XX
346369
say Y or M here.If you are not sure, say N.
347370
SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs.
348371

372+
config SPI_NUC900
373+
tristate "Nuvoton NUC900 series SPI"
374+
depends on ARCH_W90X900
375+
select SPI_BITBANG
376+
help
377+
SPI driver for Nuvoton NUC900 series ARM SoCs
378+
349379
config SPI_OC_TINY
350380
tristate "OpenCores tiny SPI"
351381
depends on GPIOLIB || COMPILE_TEST
@@ -647,34 +677,10 @@ config SPI_ZYNQMP_GQSPI
647677
help
648678
Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC.
649679

650-
config SPI_NUC900
651-
tristate "Nuvoton NUC900 series SPI"
652-
depends on ARCH_W90X900
653-
select SPI_BITBANG
654-
help
655-
SPI driver for Nuvoton NUC900 series ARM SoCs
656-
657680
#
658681
# Add new SPI master controllers in alphabetical order above this line
659682
#
660683

661-
config SPI_DESIGNWARE
662-
tristate "DesignWare SPI controller core support"
663-
help
664-
general driver for SPI controller core from DesignWare
665-
666-
config SPI_DW_PCI
667-
tristate "PCI interface driver for DW SPI core"
668-
depends on SPI_DESIGNWARE && PCI
669-
670-
config SPI_DW_MID_DMA
671-
bool "DMA support for DW SPI controller on Intel MID platform"
672-
depends on SPI_DW_PCI && DW_DMAC_PCI
673-
674-
config SPI_DW_MMIO
675-
tristate "Memory-mapped io interface driver for DW SPI core"
676-
depends on SPI_DESIGNWARE
677-
678684
#
679685
# There are lots of SPI device types, with sensors and memory
680686
# being probably the most widely used ones.

‎drivers/spi/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ obj-$(CONFIG_SPI_ALTERA) += spi-altera.o
1515
obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o
1616
obj-$(CONFIG_SPI_ATH79) += spi-ath79.o
1717
obj-$(CONFIG_SPI_AU1550) += spi-au1550.o
18+
obj-$(CONFIG_SPI_AXI_SPI_ENGINE) += spi-axi-spi-engine.o
1819
obj-$(CONFIG_SPI_BCM2835) += spi-bcm2835.o
1920
obj-$(CONFIG_SPI_BCM2835AUX) += spi-bcm2835aux.o
2021
obj-$(CONFIG_SPI_BCM53XX) += spi-bcm53xx.o

0 commit comments

Comments
 (0)