commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=ae3e8676c5814c38f8e43ab600422414bf496382 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Scott Jiang <[email protected]> --- drivers/spi/Kconfig | 7 ++++--- drivers/spi/Makefile | 2 +- drivers/spi/{spi-bfin6xx.c => spi-bfin-v3.c} | 16 +++++++--------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index b50348d..7f4cf97 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -87,11 +87,12 @@ config SPI_BFIN5XX help This is the SPI controller master driver for Blackfin 5xx processor. -config SPI_BFIN6XX - tristate "SPI controller driver for ADI Blackfin6xx" +config SPI_BFIN_V3 + tristate "SPI controller v3 for Blackfin" depends on BLACKFIN && BF60x help - This is the SPI controller master driver for Blackfin 6xx processor. + This is the SPI controller v3 master driver + found on Blackfin 60x processor. config SPI_BFIN_SPORT tristate "SPI bus via Blackfin SPORT" diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 869719f..7d5dfb1 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_SPI_ATH79) += spi-ath79.o obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o -obj-$(CONFIG_SPI_BFIN6XX) += spi-bfin6xx.o +obj-$(CONFIG_SPI_BFIN_V3) += spi-bfin-v3.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o diff --git a/drivers/spi/spi-bfin6xx.c b/drivers/spi/spi-bfin-v3.c similarity index 98% rename from drivers/spi/spi-bfin6xx.c rename to drivers/spi/spi-bfin-v3.c index aac10dd..2cc081d 100644 --- a/drivers/spi/spi-bfin6xx.c +++ b/drivers/spi/spi-bfin-v3.c @@ -28,7 +28,7 @@ #include <linux/spi/spi.h> #include <linux/types.h> -#include <asm/bfin6xx_spi.h> +#include <asm/bfin_spi3.h> #include <asm/cacheflush.h> #include <asm/dma.h> #include <asm/portmux.h> @@ -649,7 +649,7 @@ static int bfin_spi_setup(struct spi_device *spi) } if (!chip) { - struct bfin6xx_spi_chip *chip_info = spi->controller_data; + struct bfin_spi3_chip *chip_info = spi->controller_data; chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (!chip) { @@ -784,7 +784,7 @@ static irqreturn_t bfin_spi_rx_dma_isr(int irq, void *dev_id) static int bfin_spi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct bfin6xx_spi_master *info = dev->platform_data; + struct bfin_spi3_master *info = dev->platform_data; struct spi_master *master; struct bfin_spi_master *drv_data; struct resource *mem, *res; @@ -870,7 +870,7 @@ static int bfin_spi_probe(struct platform_device *pdev) set_dma_callback(drv_data->rx_dma, bfin_spi_rx_dma_isr, drv_data); /* request CLK, MOSI and MISO */ - ret = peripheral_request_list(drv_data->pin_req, "bfin-spi"); + ret = peripheral_request_list(drv_data->pin_req, "bfin-spi3"); if (ret < 0) { dev_err(dev, "can not request spi pins\n"); goto err_free_rx_dma; @@ -961,19 +961,17 @@ static int bfin_spi_resume(struct device *dev) return ret; } +#endif static const struct dev_pm_ops bfin_spi_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(bfin_spi_suspend, bfin_spi_resume) }; -#endif /* CONFIG_PM */ -MODULE_ALIAS("platform:bfin-spi"); +MODULE_ALIAS("platform:bfin-spi3"); static struct platform_driver bfin_spi_driver = { .driver = { - .name = "bfin-spi", + .name = "bfin-spi3", .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &bfin_spi_pm_ops, -#endif }, .remove = bfin_spi_remove, };
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
