[Linux-kernel-commits] [5777] trunk: bug [#3991] - Retire old spi_mmc driver.

Mon, 01 Dec 2008 20:12:00 -0800

Title: [5777] trunk: bug [#3991] - Retire old spi_mmc driver.
Revision
5777
Author
adamliyi
Date
2008-12-01 22:11:38 -0600 (Mon, 01 Dec 2008)

Log Message

bug [#3991] - Retire old spi_mmc driver. Turn to use the mmc_spi driver 
in mainline kernel. 


Modified Paths




Removed Paths


    

  • trunk/drivers/mmc/spi_mmc/
    •

Diff

Modified: trunk/arch/blackfin/configs/BF548-EZKIT_defconfig (5776 => 5777)


--- trunk/arch/blackfin/configs/BF548-EZKIT_defconfig	2008-12-02 03:28:20 UTC (rev 5776)
+++ trunk/arch/blackfin/configs/BF548-EZKIT_defconfig	2008-12-02 04:11:38 UTC (rev 5777)
@@ -1285,7 +1285,6 @@
 CONFIG_SDH_BFIN=m
 # CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set
 # CONFIG_MMC_SPI is not set
-# CONFIG_SPI_MMC is not set
 # CONFIG_NEW_LEDS is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y

Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (5776 => 5777)


--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2008-12-02 03:28:20 UTC (rev 5776)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2008-12-02 04:11:38 UTC (rev 5777)
@@ -504,13 +504,6 @@
 };
 #endif
 
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-static struct bfin5xx_spi_chip spi_mmc_chip_info = {
-	.enable_dma = 1,
-	.bits_per_word = 8,
-};
-#endif
-
 #if defined(CONFIG_PBX)
 static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
 	.ctl_reg	= 0x4, /* send zero */
@@ -602,26 +595,6 @@
 		.controller_data = &ad9960_spi_chip_info,
 	},
 #endif
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-	{
-		.modalias = "spi_mmc_dummy",
-		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = 0,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-	{
-		.modalias = "spi_mmc",
-		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = CONFIG_SPI_MMC_CS_CHAN,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-#endif
 #if defined(CONFIG_PBX)
 	{
 		.modalias = "fxs-spi",

Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (5776 => 5777)


--- trunk/arch/blackfin/mach-bf533/boards/stamp.c	2008-12-02 03:28:20 UTC (rev 5776)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c	2008-12-02 04:11:38 UTC (rev 5777)
@@ -216,13 +216,6 @@
 };
 #endif
 
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-static struct bfin5xx_spi_chip spi_mmc_chip_info = {
-	.enable_dma = 1,
-	.bits_per_word = 8,
-};
-#endif
-
 #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
 static struct bfin5xx_spi_chip spidev_chip_info = {
 	.enable_dma = 0,
@@ -265,27 +258,6 @@
 	},
 #endif
 
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-	{
-		.modalias = "spi_mmc_dummy",
-		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = 0,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-	{
-		.modalias = "spi_mmc",
-		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = CONFIG_SPI_MMC_CS_CHAN,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-#endif
-
 #if defined(CONFIG_PBX)
 	{
 		.modalias = "fxs-spi",

Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (5776 => 5777)


--- trunk/arch/blackfin/mach-bf537/boards/stamp.c	2008-12-02 03:28:20 UTC (rev 5776)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c	2008-12-02 04:11:38 UTC (rev 5777)
@@ -527,13 +527,6 @@
 };
 #endif
 
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-static struct bfin5xx_spi_chip spi_mmc_chip_info = {
-	.enable_dma = 0,
-	.bits_per_word = 8,
-};
-#endif
-
 #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
 #define MMC_SPI_CARD_DETECT_INT IRQ_PF5
 
@@ -720,26 +713,6 @@
 		.controller_data = &ad9960_spi_chip_info,
 	},
 #endif
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-	{
-		.modalias = "spi_mmc_dummy",
-		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = 0,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-	{
-		.modalias = "spi_mmc",
-		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
-		.bus_num = 0,
-		.chip_select = CONFIG_SPI_MMC_CS_CHAN,
-		.platform_data = NULL,
-		.controller_data = &spi_mmc_chip_info,
-		.mode = SPI_MODE_3,
-	},
-#endif
 #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
 	{
 		.modalias = "mmc_spi",

Modified: trunk/drivers/mmc/Kconfig (5776 => 5777)


--- trunk/drivers/mmc/Kconfig	2008-12-02 03:28:20 UTC (rev 5776)
+++ trunk/drivers/mmc/Kconfig	2008-12-02 04:11:38 UTC (rev 5777)
@@ -27,6 +27,4 @@
 
 source "drivers/mmc/host/Kconfig"
 
-source "drivers/mmc/spi_mmc/Kconfig"
-
 endif # MMC

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to