aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/configs/BF548-EZKIT_defconfig1
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c27
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c28
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c27
4 files changed, 0 insertions, 83 deletions
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index 3e75ac663013..92fa18dce420 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -1285,7 +1285,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1285CONFIG_SDH_BFIN=m 1285CONFIG_SDH_BFIN=m
1286# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set 1286# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set
1287# CONFIG_MMC_SPI is not set 1287# CONFIG_MMC_SPI is not set
1288# CONFIG_SPI_MMC is not set
1289# CONFIG_NEW_LEDS is not set 1288# CONFIG_NEW_LEDS is not set
1290CONFIG_RTC_LIB=y 1289CONFIG_RTC_LIB=y
1291CONFIG_RTC_CLASS=y 1290CONFIG_RTC_CLASS=y
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 07757f70cc3e..dc0384d2b218 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -504,13 +504,6 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
504}; 504};
505#endif 505#endif
506 506
507#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
508static struct bfin5xx_spi_chip spi_mmc_chip_info = {
509 .enable_dma = 1,
510 .bits_per_word = 8,
511};
512#endif
513
514#if defined(CONFIG_PBX) 507#if defined(CONFIG_PBX)
515static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { 508static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
516 .ctl_reg = 0x4, /* send zero */ 509 .ctl_reg = 0x4, /* send zero */
@@ -602,26 +595,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
602 .controller_data = &ad9960_spi_chip_info, 595 .controller_data = &ad9960_spi_chip_info,
603 }, 596 },
604#endif 597#endif
605#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
606 {
607 .modalias = "spi_mmc_dummy",
608 .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
609 .bus_num = 0,
610 .chip_select = 0,
611 .platform_data = NULL,
612 .controller_data = &spi_mmc_chip_info,
613 .mode = SPI_MODE_3,
614 },
615 {
616 .modalias = "spi_mmc",
617 .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
618 .bus_num = 0,
619 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
620 .platform_data = NULL,
621 .controller_data = &spi_mmc_chip_info,
622 .mode = SPI_MODE_3,
623 },
624#endif
625#if defined(CONFIG_PBX) 598#if defined(CONFIG_PBX)
626 { 599 {
627 .modalias = "fxs-spi", 600 .modalias = "fxs-spi",
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 1b08323e2ce6..b0d877626a4d 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -216,13 +216,6 @@ static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
216}; 216};
217#endif 217#endif
218 218
219#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
220static struct bfin5xx_spi_chip spi_mmc_chip_info = {
221 .enable_dma = 1,
222 .bits_per_word = 8,
223};
224#endif
225
226#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) 219#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
227static struct bfin5xx_spi_chip spidev_chip_info = { 220static struct bfin5xx_spi_chip spidev_chip_info = {
228 .enable_dma = 0, 221 .enable_dma = 0,
@@ -265,27 +258,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
265 }, 258 },
266#endif 259#endif
267 260
268#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
269 {
270 .modalias = "spi_mmc_dummy",
271 .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
272 .bus_num = 0,
273 .chip_select = 0,
274 .platform_data = NULL,
275 .controller_data = &spi_mmc_chip_info,
276 .mode = SPI_MODE_3,
277 },
278 {
279 .modalias = "spi_mmc",
280 .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
281 .bus_num = 0,
282 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
283 .platform_data = NULL,
284 .controller_data = &spi_mmc_chip_info,
285 .mode = SPI_MODE_3,
286 },
287#endif
288
289#if defined(CONFIG_PBX) 261#if defined(CONFIG_PBX)
290 { 262 {
291 .modalias = "fxs-spi", 263 .modalias = "fxs-spi",
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index a5e8e5bc6496..e6e722d7767e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -527,13 +527,6 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
527}; 527};
528#endif 528#endif
529 529
530#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
531static struct bfin5xx_spi_chip spi_mmc_chip_info = {
532 .enable_dma = 0,
533 .bits_per_word = 8,
534};
535#endif
536
537#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 530#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
538#define MMC_SPI_CARD_DETECT_INT IRQ_PF5 531#define MMC_SPI_CARD_DETECT_INT IRQ_PF5
539 532
@@ -720,26 +713,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
720 .controller_data = &ad9960_spi_chip_info, 713 .controller_data = &ad9960_spi_chip_info,
721 }, 714 },
722#endif 715#endif
723#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
724 {
725 .modalias = "spi_mmc_dummy",
726 .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
727 .bus_num = 0,
728 .chip_select = 0,
729 .platform_data = NULL,
730 .controller_data = &spi_mmc_chip_info,
731 .mode = SPI_MODE_3,
732 },
733 {
734 .modalias = "spi_mmc",
735 .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
736 .bus_num = 0,
737 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
738 .platform_data = NULL,
739 .controller_data = &spi_mmc_chip_info,
740 .mode = SPI_MODE_3,
741 },
742#endif
743#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 716#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
744 { 717 {
745 .modalias = "mmc_spi", 718 .modalias = "mmc_spi",