diff options
| author | Mingkai Hu <Mingkai.hu@freescale.com> | 2010-10-12 06:18:30 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 23:38:12 -0400 |
| commit | 3272029fb33a88873b9b02224ebeb23bf3a4668e (patch) | |
| tree | 5a01a8506285fb418c1334019b5c37575b40c9d7 /drivers/spi | |
| parent | 492c032beccd53f807811b6c14909630d409dd8c (diff) | |
spi/mpc8xxx: rename spi_mpc8xxx.c to spi_fsl_spi.c
This will pave the way to refactor out the common code which can be used
by the eSPI controller driver, and rename the SPI controller dirver to the
file spi_fsl_spi.c.
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/spi/spi_fsl_spi.c (renamed from drivers/spi/spi_mpc8xxx.c) | 0 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index d966de1afc52..e8f02a6f2d23 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -182,12 +182,13 @@ config SPI_MPC512x_PSC | |||
| 182 | This enables using the Freescale MPC5121 Programmable Serial | 182 | This enables using the Freescale MPC5121 Programmable Serial |
| 183 | Controller in SPI master mode. | 183 | Controller in SPI master mode. |
| 184 | 184 | ||
| 185 | config SPI_MPC8xxx | 185 | config SPI_FSL_SPI |
| 186 | tristate "Freescale MPC8xxx SPI controller" | 186 | tristate "Freescale SPI controller" |
| 187 | depends on FSL_SOC | 187 | depends on FSL_SOC |
| 188 | help | 188 | help |
| 189 | This enables using the Freescale MPC8xxx SPI controllers in master | 189 | This enables using the Freescale SPI controllers in master mode. |
| 190 | mode. | 190 | MPC83xx platform uses the controller in cpu mode or CPM/QE mode. |
| 191 | MPC8569 uses the controller in QE mode, MPC8610 in cpu mode. | ||
| 191 | 192 | ||
| 192 | config SPI_OMAP_UWIRE | 193 | config SPI_OMAP_UWIRE |
| 193 | tristate "OMAP1 MicroWire" | 194 | tristate "OMAP1 MicroWire" |
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f32d11e1ffec..c6a56c798823 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -32,7 +32,7 @@ obj-$(CONFIG_SPI_PL022) += amba-pl022.o | |||
| 32 | obj-$(CONFIG_SPI_MPC512x_PSC) += mpc512x_psc_spi.o | 32 | obj-$(CONFIG_SPI_MPC512x_PSC) += mpc512x_psc_spi.o |
| 33 | obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o | 33 | obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o |
| 34 | obj-$(CONFIG_SPI_MPC52xx) += mpc52xx_spi.o | 34 | obj-$(CONFIG_SPI_MPC52xx) += mpc52xx_spi.o |
| 35 | obj-$(CONFIG_SPI_MPC8xxx) += spi_mpc8xxx.o | 35 | obj-$(CONFIG_SPI_FSL_SPI) += spi_fsl_spi.o |
| 36 | obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx.o | 36 | obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx.o |
| 37 | obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o | 37 | obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o |
| 38 | obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o | 38 | obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o |
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_fsl_spi.c index 1dd86b835cd8..1dd86b835cd8 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_fsl_spi.c | |||