Skip to content

Commit ca632f5

Browse files
committed
spi: reorganize drivers
Sort the SPI makefile and enforce the naming convention spi_*.c for spi drivers. This change also rolls the contents of atmel_spi.h into the .c file since there is only one user of that particular include file. v2: - Use 'spi-' prefix instead of 'spi_' to match what seems to be be the predominant pattern for subsystem prefixes. - Clean up filenames in Kconfig and header comment blocks Signed-off-by: Grant Likely <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Linus Walleij <[email protected]>
1 parent 8c99268 commit ca632f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+239
-289
lines changed

drivers/spi/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ config SPI_BFIN_SPORT
8686
help
8787
Enable support for a SPI bus via the Blackfin SPORT peripheral.
8888

89-
This driver can also be built as a module. If so, the module
90-
will be called spi_bfin_sport.
91-
9289
config SPI_AU1550
9390
tristate "Au1550/Au12x0 SPI Controller"
9491
depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
@@ -97,9 +94,6 @@ config SPI_AU1550
9794
If you say yes to this option, support will be included for the
9895
Au1550 SPI controller (may also work with Au1200,Au1210,Au1250).
9996

100-
This driver can also be built as a module. If so, the module
101-
will be called au1550_spi.
102-
10397
config SPI_BITBANG
10498
tristate "Utilities for Bitbanging SPI masters"
10599
help
@@ -130,29 +124,20 @@ config SPI_COLDFIRE_QSPI
130124
This enables support for the Coldfire QSPI controller in master
131125
mode.
132126

133-
This driver can also be built as a module. If so, the module
134-
will be called coldfire_qspi.
135-
136127
config SPI_DAVINCI
137128
tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
138129
depends on SPI_MASTER && ARCH_DAVINCI
139130
select SPI_BITBANG
140131
help
141132
SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
142133

143-
This driver can also be built as a module. The module will be called
144-
davinci_spi.
145-
146134
config SPI_EP93XX
147135
tristate "Cirrus Logic EP93xx SPI controller"
148136
depends on ARCH_EP93XX
149137
help
150138
This enables using the Cirrus EP93xx SPI controller in master
151139
mode.
152140

153-
To compile this driver as a module, choose M here. The module will be
154-
called ep93xx_spi.
155-
156141
config SPI_GPIO
157142
tristate "GPIO-based bitbanging SPI Master"
158143
depends on GENERIC_GPIO
@@ -385,9 +370,6 @@ config SPI_TI_SSP
385370
This selects an SPI master implementation using a TI sequencer
386371
serial port.
387372

388-
To compile this driver as a module, choose M here: the
389-
module will be called ti-ssp-spi.
390-
391373
config SPI_TOPCLIFF_PCH
392374
tristate "Topcliff PCH SPI Controller"
393375
depends on PCI

drivers/spi/Makefile

Lines changed: 50 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -7,68 +7,56 @@ ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG
77
# small core, mostly translating board-specific
88
# config declarations into driver model code
99
obj-$(CONFIG_SPI_MASTER) += spi.o
10+
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
1011

1112
# SPI master controller drivers (bus)
12-
obj-$(CONFIG_SPI_ALTERA) += spi_altera.o
13-
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
14-
obj-$(CONFIG_SPI_ATH79) += ath79_spi.o
15-
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
16-
obj-$(CONFIG_SPI_BFIN_SPORT) += spi_bfin_sport.o
17-
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
18-
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
19-
obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o
20-
obj-$(CONFIG_SPI_COLDFIRE_QSPI) += coldfire_qspi.o
21-
obj-$(CONFIG_SPI_DAVINCI) += davinci_spi.o
22-
obj-$(CONFIG_SPI_DESIGNWARE) += dw_spi.o
23-
obj-$(CONFIG_SPI_DW_PCI) += dw_spi_midpci.o
24-
dw_spi_midpci-objs := dw_spi_pci.o dw_spi_mid.o
25-
obj-$(CONFIG_SPI_DW_MMIO) += dw_spi_mmio.o
26-
obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi.o
27-
obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
28-
obj-$(CONFIG_SPI_IMX) += spi_imx.o
29-
obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o
30-
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
31-
obj-$(CONFIG_SPI_PXA2XX_PCI) += pxa2xx_spi_pci.o
32-
obj-$(CONFIG_SPI_OC_TINY) += spi_oc_tiny.o
33-
obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o
34-
obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o
35-
obj-$(CONFIG_SPI_OMAP_100K) += omap_spi_100k.o
36-
obj-$(CONFIG_SPI_ORION) += orion_spi.o
37-
obj-$(CONFIG_SPI_PL022) += amba-pl022.o
38-
obj-$(CONFIG_SPI_MPC512x_PSC) += mpc512x_psc_spi.o
39-
obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o
40-
obj-$(CONFIG_SPI_MPC52xx) += mpc52xx_spi.o
41-
obj-$(CONFIG_SPI_FSL_LIB) += spi_fsl_lib.o
42-
obj-$(CONFIG_SPI_FSL_ESPI) += spi_fsl_espi.o
43-
obj-$(CONFIG_SPI_FSL_SPI) += spi_fsl_spi.o
44-
obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx.o
45-
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
46-
obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
47-
obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
48-
obj-$(CONFIG_SPI_TEGRA) += spi_tegra.o
49-
obj-$(CONFIG_SPI_TI_SSP) += ti-ssp-spi.o
50-
obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
51-
obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
52-
obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
53-
obj-$(CONFIG_SPI_SH) += spi_sh.o
54-
obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.o
55-
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
56-
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
57-
obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o
13+
obj-$(CONFIG_SPI_ALTERA) += spi-altera.o
14+
obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o
15+
obj-$(CONFIG_SPI_ATH79) += spi-ath79.o
16+
obj-$(CONFIG_SPI_AU1550) += spi-au1550.o
17+
obj-$(CONFIG_SPI_BFIN) += spi-bfin5xx.o
18+
obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o
19+
obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o
20+
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
21+
obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o
22+
obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o
23+
obj-$(CONFIG_SPI_DESIGNWARE) += spi-dw.o
24+
obj-$(CONFIG_SPI_DW_MMIO) += spi-dw-mmio.o
25+
obj-$(CONFIG_SPI_DW_PCI) += spi-dw-midpci.o
26+
spi-dw-midpci-objs := spi-dw-pci.o spi-dw-mid.o
27+
obj-$(CONFIG_SPI_EP93XX) += spi-ep93xx.o
28+
obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-lib.o
29+
obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o
30+
obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o
31+
obj-$(CONFIG_SPI_GPIO) += spi-gpio.o
32+
obj-$(CONFIG_SPI_IMX) += spi-imx.o
33+
obj-$(CONFIG_SPI_LM70_LLP) += spi-lm70llp.o
34+
obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o
35+
obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o
36+
obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o
37+
obj-$(CONFIG_SPI_NUC900) += spi-nuc900.o
38+
obj-$(CONFIG_SPI_OC_TINY) += spi-oc-tiny.o
39+
obj-$(CONFIG_SPI_OMAP_UWIRE) += spi-omap-uwire.o
40+
obj-$(CONFIG_SPI_OMAP_100K) += spi-omap-100k.o
41+
obj-$(CONFIG_SPI_OMAP24XX) += spi-omap2-mcspi.o
42+
obj-$(CONFIG_SPI_ORION) += spi-orion.o
43+
obj-$(CONFIG_SPI_PL022) += spi-pl022.o
44+
obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o
45+
obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx.o
46+
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
47+
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi-s3c24xx-gpio.o
48+
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
49+
spi-s3c24xx-hw-y := spi-s3c24xx.o
50+
spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
51+
obj-$(CONFIG_SPI_S3C64XX) += spi-s3c64xx.o
52+
obj-$(CONFIG_SPI_SH) += spi-sh.o
53+
obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o
54+
obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o
55+
obj-$(CONFIG_SPI_STMP3XXX) += spi-stmp.o
56+
obj-$(CONFIG_SPI_TEGRA) += spi-tegra.o
57+
obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o
58+
obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o
59+
obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o
60+
obj-$(CONFIG_SPI_TXX9) += spi-txx9.o
61+
obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o
5862

59-
# special build for s3c24xx spi driver with fiq support
60-
spi_s3c24xx_hw-y := spi_s3c24xx.o
61-
spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi_s3c24xx_fiq.o
62-
63-
# ... add above this line ...
64-
65-
# SPI protocol drivers (device/link on bus)
66-
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
67-
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
68-
# ... add above this line ...
69-
70-
# SPI slave controller drivers (upstream link)
71-
# ... add above this line ...
72-
73-
# SPI slave drivers (protocol for that link)
74-
# ... add above this line ...

drivers/spi/atmel_spi.h

Lines changed: 0 additions & 167 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)