diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-08-13 00:27:31 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-16 22:10:24 -0400 |
commit | 0198b3bcaed1374f454e56e46f0e1ca1fc24e0a1 (patch) | |
tree | 883a78de3ff7c1b560ebf18cc6c78e9a7065431f /arch/blackfin/mach-bf527/boards | |
parent | c4baebf2683d16f24a84a99268ef5f7318905337 (diff) |
Blackfin: drop board resources for dead devices (pbx/ad9960)
These hardware devices are dead and the drivers never cleaned up/merged,
so punt the useless board resource info.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf527/boards')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 43 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 27 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 43 |
3 files changed, 0 insertions, 113 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 18b9bd7d7d64..fdd518c1b87b 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -495,13 +495,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | |||
495 | }; | 495 | }; |
496 | #endif | 496 | #endif |
497 | 497 | ||
498 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
499 | static struct bfin5xx_spi_chip ad9960_spi_chip_info = { | ||
500 | .enable_dma = 0, | ||
501 | .bits_per_word = 16, | ||
502 | }; | ||
503 | #endif | ||
504 | |||
505 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 498 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) |
506 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { | 499 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { |
507 | .enable_dma = 0, | 500 | .enable_dma = 0, |
@@ -509,15 +502,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { | |||
509 | }; | 502 | }; |
510 | #endif | 503 | #endif |
511 | 504 | ||
512 | #if defined(CONFIG_PBX) | ||
513 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | ||
514 | .ctl_reg = 0x4, /* send zero */ | ||
515 | .enable_dma = 0, | ||
516 | .bits_per_word = 8, | ||
517 | .cs_change_per_word = 1, | ||
518 | }; | ||
519 | #endif | ||
520 | |||
521 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 505 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
522 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 506 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
523 | .enable_dma = 0, | 507 | .enable_dma = 0, |
@@ -591,15 +575,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
591 | .controller_data = &ad1836_spi_chip_info, | 575 | .controller_data = &ad1836_spi_chip_info, |
592 | }, | 576 | }, |
593 | #endif | 577 | #endif |
594 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
595 | { | ||
596 | .modalias = "ad9960-spi", | ||
597 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | ||
598 | .bus_num = 0, | ||
599 | .chip_select = 1, | ||
600 | .controller_data = &ad9960_spi_chip_info, | ||
601 | }, | ||
602 | #endif | ||
603 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 578 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) |
604 | { | 579 | { |
605 | .modalias = "mmc_spi", | 580 | .modalias = "mmc_spi", |
@@ -610,24 +585,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
610 | .mode = SPI_MODE_3, | 585 | .mode = SPI_MODE_3, |
611 | }, | 586 | }, |
612 | #endif | 587 | #endif |
613 | #if defined(CONFIG_PBX) | ||
614 | { | ||
615 | .modalias = "fxs-spi", | ||
616 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
617 | .bus_num = 0, | ||
618 | .chip_select = 8 - CONFIG_J11_JUMPER, | ||
619 | .controller_data = &spi_si3xxx_chip_info, | ||
620 | .mode = SPI_MODE_3, | ||
621 | }, | ||
622 | { | ||
623 | .modalias = "fxo-spi", | ||
624 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
625 | .bus_num = 0, | ||
626 | .chip_select = 8 - CONFIG_J19_JUMPER, | ||
627 | .controller_data = &spi_si3xxx_chip_info, | ||
628 | .mode = SPI_MODE_3, | ||
629 | }, | ||
630 | #endif | ||
631 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 588 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
632 | { | 589 | { |
633 | .modalias = "ad7877", | 590 | .modalias = "ad7877", |
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 809c7907b6e3..68b4c804364c 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -263,15 +263,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { | |||
263 | }; | 263 | }; |
264 | #endif | 264 | #endif |
265 | 265 | ||
266 | #if defined(CONFIG_PBX) | ||
267 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | ||
268 | .ctl_reg = 0x4, /* send zero */ | ||
269 | .enable_dma = 0, | ||
270 | .bits_per_word = 8, | ||
271 | .cs_change_per_word = 1, | ||
272 | }; | ||
273 | #endif | ||
274 | |||
275 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 266 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
276 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 267 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
277 | .enable_dma = 0, | 268 | .enable_dma = 0, |
@@ -376,24 +367,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
376 | .mode = SPI_MODE_3, | 367 | .mode = SPI_MODE_3, |
377 | }, | 368 | }, |
378 | #endif | 369 | #endif |
379 | #if defined(CONFIG_PBX) | ||
380 | { | ||
381 | .modalias = "fxs-spi", | ||
382 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
383 | .bus_num = 0, | ||
384 | .chip_select = 8 - CONFIG_J11_JUMPER, | ||
385 | .controller_data = &spi_si3xxx_chip_info, | ||
386 | .mode = SPI_MODE_3, | ||
387 | }, | ||
388 | { | ||
389 | .modalias = "fxo-spi", | ||
390 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
391 | .bus_num = 0, | ||
392 | .chip_select = 8 - CONFIG_J19_JUMPER, | ||
393 | .controller_data = &spi_si3xxx_chip_info, | ||
394 | .mode = SPI_MODE_3, | ||
395 | }, | ||
396 | #endif | ||
397 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 370 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
398 | { | 371 | { |
399 | .modalias = "ad7877", | 372 | .modalias = "ad7877", |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 617a28738438..4ab9cfa74fdd 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -512,13 +512,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | |||
512 | }; | 512 | }; |
513 | #endif | 513 | #endif |
514 | 514 | ||
515 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
516 | static struct bfin5xx_spi_chip ad9960_spi_chip_info = { | ||
517 | .enable_dma = 0, | ||
518 | .bits_per_word = 16, | ||
519 | }; | ||
520 | #endif | ||
521 | |||
522 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 515 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) |
523 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { | 516 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { |
524 | .enable_dma = 0, | 517 | .enable_dma = 0, |
@@ -526,15 +519,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { | |||
526 | }; | 519 | }; |
527 | #endif | 520 | #endif |
528 | 521 | ||
529 | #if defined(CONFIG_PBX) | ||
530 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | ||
531 | .ctl_reg = 0x4, /* send zero */ | ||
532 | .enable_dma = 0, | ||
533 | .bits_per_word = 8, | ||
534 | .cs_change_per_word = 1, | ||
535 | }; | ||
536 | #endif | ||
537 | |||
538 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 522 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
539 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 523 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
540 | .enable_dma = 0, | 524 | .enable_dma = 0, |
@@ -632,15 +616,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
632 | .controller_data = &ad1836_spi_chip_info, | 616 | .controller_data = &ad1836_spi_chip_info, |
633 | }, | 617 | }, |
634 | #endif | 618 | #endif |
635 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
636 | { | ||
637 | .modalias = "ad9960-spi", | ||
638 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | ||
639 | .bus_num = 0, | ||
640 | .chip_select = 1, | ||
641 | .controller_data = &ad9960_spi_chip_info, | ||
642 | }, | ||
643 | #endif | ||
644 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | 619 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) |
645 | { | 620 | { |
646 | .modalias = "mmc_spi", | 621 | .modalias = "mmc_spi", |
@@ -652,24 +627,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
652 | }, | 627 | }, |
653 | #endif | 628 | #endif |
654 | 629 | ||
655 | #if defined(CONFIG_PBX) | ||
656 | { | ||
657 | .modalias = "fxs-spi", | ||
658 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
659 | .bus_num = 0, | ||
660 | .chip_select = 8 - CONFIG_J11_JUMPER, | ||
661 | .controller_data = &spi_si3xxx_chip_info, | ||
662 | .mode = SPI_MODE_3, | ||
663 | }, | ||
664 | { | ||
665 | .modalias = "fxo-spi", | ||
666 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
667 | .bus_num = 0, | ||
668 | .chip_select = 8 - CONFIG_J19_JUMPER, | ||
669 | .controller_data = &spi_si3xxx_chip_info, | ||
670 | .mode = SPI_MODE_3, | ||
671 | }, | ||
672 | #endif | ||
673 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 630 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
674 | { | 631 | { |
675 | .modalias = "ad7877", | 632 | .modalias = "ad7877", |