diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-05-28 13:22:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 07:33:41 -0400 |
commit | 15502e0ca0da651b48c7def2983e7bb464349b2a (patch) | |
tree | 885e744594775b644014580158e0da13b5f1904a /arch/blackfin | |
parent | cc37961b21eb3d57d421ca34ffec9bbe0a6096c0 (diff) |
blackfin: Remove references to the bf5x_tdm driver
The bf5x_tdm driver has been removed. Remove all references to it from board
code.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ad7160eval.c | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 30 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 31 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 28 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 28 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 12 |
7 files changed, 2 insertions, 151 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c index d58f50e5aa4b..1e7be62fccb6 100644 --- a/arch/blackfin/mach-bf527/boards/ad7160eval.c +++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c | |||
@@ -283,14 +283,6 @@ static struct platform_device bfin_i2s = { | |||
283 | }; | 283 | }; |
284 | #endif | 284 | #endif |
285 | 285 | ||
286 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
287 | static struct platform_device bfin_tdm = { | ||
288 | .name = "bfin-tdm", | ||
289 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
290 | /* TODO: add platform data here */ | ||
291 | }; | ||
292 | #endif | ||
293 | |||
294 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 286 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
295 | #if defined(CONFIG_MTD_M25P80) \ | 287 | #if defined(CONFIG_MTD_M25P80) \ |
296 | || defined(CONFIG_MTD_M25P80_MODULE) | 288 | || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -800,10 +792,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
800 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) | 792 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) |
801 | &bfin_i2s, | 793 | &bfin_i2s, |
802 | #endif | 794 | #endif |
803 | |||
804 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
805 | &bfin_tdm, | ||
806 | #endif | ||
807 | }; | 795 | }; |
808 | 796 | ||
809 | static int __init ad7160eval_init(void) | 797 | static int __init ad7160eval_init(void) |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 82248955b624..d0a0c5e527cd 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -493,8 +493,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { | |||
493 | }; | 493 | }; |
494 | #endif | 494 | #endif |
495 | 495 | ||
496 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ | 496 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) |
497 | defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
498 | 497 | ||
499 | static const u16 bfin_snd_pin[][7] = { | 498 | static const u16 bfin_snd_pin[][7] = { |
500 | {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, | 499 | {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, |
@@ -549,13 +548,6 @@ static struct platform_device bfin_i2s_pcm = { | |||
549 | }; | 548 | }; |
550 | #endif | 549 | #endif |
551 | 550 | ||
552 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
553 | static struct platform_device bfin_tdm_pcm = { | ||
554 | .name = "bfin-tdm-pcm-audio", | ||
555 | .id = -1, | ||
556 | }; | ||
557 | #endif | ||
558 | |||
559 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 551 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
560 | static struct platform_device bfin_ac97_pcm = { | 552 | static struct platform_device bfin_ac97_pcm = { |
561 | .name = "bfin-ac97-pcm-audio", | 553 | .name = "bfin-ac97-pcm-audio", |
@@ -575,18 +567,6 @@ static struct platform_device bfin_i2s = { | |||
575 | }; | 567 | }; |
576 | #endif | 568 | #endif |
577 | 569 | ||
578 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
579 | static struct platform_device bfin_tdm = { | ||
580 | .name = "bfin-tdm", | ||
581 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
582 | .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]), | ||
583 | .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM], | ||
584 | .dev = { | ||
585 | .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM], | ||
586 | }, | ||
587 | }; | ||
588 | #endif | ||
589 | |||
590 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ | 570 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ |
591 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) | 571 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) |
592 | static const char * const ad1836_link[] = { | 572 | static const char * const ad1836_link[] = { |
@@ -1269,10 +1249,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1269 | &bfin_i2s_pcm, | 1249 | &bfin_i2s_pcm, |
1270 | #endif | 1250 | #endif |
1271 | 1251 | ||
1272 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
1273 | &bfin_tdm_pcm, | ||
1274 | #endif | ||
1275 | |||
1276 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 1252 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
1277 | &bfin_ac97_pcm, | 1253 | &bfin_ac97_pcm, |
1278 | #endif | 1254 | #endif |
@@ -1281,10 +1257,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1281 | &bfin_i2s, | 1257 | &bfin_i2s, |
1282 | #endif | 1258 | #endif |
1283 | 1259 | ||
1284 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
1285 | &bfin_tdm, | ||
1286 | #endif | ||
1287 | |||
1288 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \ | 1260 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \ |
1289 | defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) | 1261 | defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) |
1290 | &bfin_ad1836_machine, | 1262 | &bfin_ad1836_machine, |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 07811c209b9d..90fb0d14b147 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -450,14 +450,6 @@ static struct platform_device bfin_i2s = { | |||
450 | }; | 450 | }; |
451 | #endif | 451 | #endif |
452 | 452 | ||
453 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
454 | static struct platform_device bfin_tdm = { | ||
455 | .name = "bfin-tdm", | ||
456 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
457 | /* TODO: add platform data here */ | ||
458 | }; | ||
459 | #endif | ||
460 | |||
461 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 453 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
462 | static struct platform_device bfin_ac97 = { | 454 | static struct platform_device bfin_ac97 = { |
463 | .name = "bfin-ac97", | 455 | .name = "bfin-ac97", |
@@ -516,10 +508,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
516 | &bfin_i2s, | 508 | &bfin_i2s, |
517 | #endif | 509 | #endif |
518 | 510 | ||
519 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
520 | &bfin_tdm, | ||
521 | #endif | ||
522 | |||
523 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 511 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
524 | &bfin_ac97, | 512 | &bfin_ac97, |
525 | #endif | 513 | #endif |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index a644a8bf92b5..1ea1dda98ad7 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -542,7 +542,6 @@ static struct platform_device bfin_dpmc = { | |||
542 | }; | 542 | }; |
543 | 543 | ||
544 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ | 544 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ |
545 | defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) \ | ||
546 | || defined(CONFIG_SND_BF5XX_AC97) || \ | 545 | || defined(CONFIG_SND_BF5XX_AC97) || \ |
547 | defined(CONFIG_SND_BF5XX_AC97_MODULE) | 546 | defined(CONFIG_SND_BF5XX_AC97_MODULE) |
548 | 547 | ||
@@ -603,13 +602,6 @@ static struct platform_device bfin_i2s_pcm = { | |||
603 | }; | 602 | }; |
604 | #endif | 603 | #endif |
605 | 604 | ||
606 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
607 | static struct platform_device bfin_tdm_pcm = { | ||
608 | .name = "bfin-tdm-pcm-audio", | ||
609 | .id = -1, | ||
610 | }; | ||
611 | #endif | ||
612 | |||
613 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 605 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
614 | static struct platform_device bfin_ac97_pcm = { | 606 | static struct platform_device bfin_ac97_pcm = { |
615 | .name = "bfin-ac97-pcm-audio", | 607 | .name = "bfin-ac97-pcm-audio", |
@@ -675,20 +667,6 @@ static struct platform_device bfin_i2s = { | |||
675 | }; | 667 | }; |
676 | #endif | 668 | #endif |
677 | 669 | ||
678 | #if defined(CONFIG_SND_BF5XX_SOC_TDM) || \ | ||
679 | defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE) | ||
680 | static struct platform_device bfin_tdm = { | ||
681 | .name = "bfin-tdm", | ||
682 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
683 | .num_resources = | ||
684 | ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]), | ||
685 | .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM], | ||
686 | .dev = { | ||
687 | .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM], | ||
688 | }, | ||
689 | }; | ||
690 | #endif | ||
691 | |||
692 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || \ | 670 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || \ |
693 | defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) | 671 | defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) |
694 | static struct platform_device bfin_ac97 = { | 672 | static struct platform_device bfin_ac97 = { |
@@ -761,10 +739,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
761 | &bfin_i2s_pcm, | 739 | &bfin_i2s_pcm, |
762 | #endif | 740 | #endif |
763 | 741 | ||
764 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
765 | &bfin_tdm_pcm, | ||
766 | #endif | ||
767 | |||
768 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 742 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
769 | &bfin_ac97_pcm, | 743 | &bfin_ac97_pcm, |
770 | #endif | 744 | #endif |
@@ -792,11 +766,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
792 | &bfin_i2s, | 766 | &bfin_i2s, |
793 | #endif | 767 | #endif |
794 | 768 | ||
795 | #if defined(CONFIG_SND_BF5XX_SOC_TDM) || \ | ||
796 | defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE) | ||
797 | &bfin_tdm, | ||
798 | #endif | ||
799 | |||
800 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || \ | 769 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || \ |
801 | defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) | 770 | defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) |
802 | &bfin_ac97, | 771 | &bfin_ac97, |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index d978ca93fcf7..44fd1d4682ac 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -2570,7 +2570,6 @@ static struct platform_device bfin_dpmc = { | |||
2570 | }; | 2570 | }; |
2571 | 2571 | ||
2572 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ | 2572 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ |
2573 | defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \ | ||
2574 | defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 2573 | defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
2575 | 2574 | ||
2576 | #define SPORT_REQ(x) \ | 2575 | #define SPORT_REQ(x) \ |
@@ -2628,13 +2627,6 @@ static struct platform_device bfin_i2s_pcm = { | |||
2628 | }; | 2627 | }; |
2629 | #endif | 2628 | #endif |
2630 | 2629 | ||
2631 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
2632 | static struct platform_device bfin_tdm_pcm = { | ||
2633 | .name = "bfin-tdm-pcm-audio", | ||
2634 | .id = -1, | ||
2635 | }; | ||
2636 | #endif | ||
2637 | |||
2638 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 2630 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
2639 | static struct platform_device bfin_ac97_pcm = { | 2631 | static struct platform_device bfin_ac97_pcm = { |
2640 | .name = "bfin-ac97-pcm-audio", | 2632 | .name = "bfin-ac97-pcm-audio", |
@@ -2699,18 +2691,6 @@ static struct platform_device bfin_i2s = { | |||
2699 | }; | 2691 | }; |
2700 | #endif | 2692 | #endif |
2701 | 2693 | ||
2702 | #if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE) | ||
2703 | static struct platform_device bfin_tdm = { | ||
2704 | .name = "bfin-tdm", | ||
2705 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
2706 | .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]), | ||
2707 | .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM], | ||
2708 | .dev = { | ||
2709 | .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM], | ||
2710 | }, | ||
2711 | }; | ||
2712 | #endif | ||
2713 | |||
2714 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) | 2694 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) |
2715 | static struct platform_device bfin_ac97 = { | 2695 | static struct platform_device bfin_ac97 = { |
2716 | .name = "bfin-ac97", | 2696 | .name = "bfin-ac97", |
@@ -2935,10 +2915,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
2935 | &bfin_i2s_pcm, | 2915 | &bfin_i2s_pcm, |
2936 | #endif | 2916 | #endif |
2937 | 2917 | ||
2938 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
2939 | &bfin_tdm_pcm, | ||
2940 | #endif | ||
2941 | |||
2942 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 2918 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
2943 | &bfin_ac97_pcm, | 2919 | &bfin_ac97_pcm, |
2944 | #endif | 2920 | #endif |
@@ -2961,10 +2937,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
2961 | &bfin_i2s, | 2937 | &bfin_i2s, |
2962 | #endif | 2938 | #endif |
2963 | 2939 | ||
2964 | #if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE) | ||
2965 | &bfin_tdm, | ||
2966 | #endif | ||
2967 | |||
2968 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) | 2940 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) |
2969 | &bfin_ac97, | 2941 | &bfin_ac97, |
2970 | #endif | 2942 | #endif |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index c4d07f040947..372eb54944ef 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -1393,7 +1393,6 @@ static struct platform_device bfin_dpmc = { | |||
1393 | }; | 1393 | }; |
1394 | 1394 | ||
1395 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ | 1395 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ |
1396 | defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \ | ||
1397 | defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 1396 | defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
1398 | 1397 | ||
1399 | #define SPORT_REQ(x) \ | 1398 | #define SPORT_REQ(x) \ |
@@ -1461,13 +1460,6 @@ static struct platform_device bfin_i2s_pcm = { | |||
1461 | }; | 1460 | }; |
1462 | #endif | 1461 | #endif |
1463 | 1462 | ||
1464 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
1465 | static struct platform_device bfin_tdm_pcm = { | ||
1466 | .name = "bfin-tdm-pcm-audio", | ||
1467 | .id = -1, | ||
1468 | }; | ||
1469 | #endif | ||
1470 | |||
1471 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 1463 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
1472 | static struct platform_device bfin_ac97_pcm = { | 1464 | static struct platform_device bfin_ac97_pcm = { |
1473 | .name = "bfin-ac97-pcm-audio", | 1465 | .name = "bfin-ac97-pcm-audio", |
@@ -1501,18 +1493,6 @@ static struct platform_device bfin_i2s = { | |||
1501 | }; | 1493 | }; |
1502 | #endif | 1494 | #endif |
1503 | 1495 | ||
1504 | #if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE) | ||
1505 | static struct platform_device bfin_tdm = { | ||
1506 | .name = "bfin-tdm", | ||
1507 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
1508 | .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]), | ||
1509 | .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM], | ||
1510 | .dev = { | ||
1511 | .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM], | ||
1512 | }, | ||
1513 | }; | ||
1514 | #endif | ||
1515 | |||
1516 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) | 1496 | #if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE) |
1517 | static struct platform_device bfin_ac97 = { | 1497 | static struct platform_device bfin_ac97 = { |
1518 | .name = "bfin-ac97", | 1498 | .name = "bfin-ac97", |
@@ -1646,9 +1626,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
1646 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) | 1626 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) |
1647 | &bfin_i2s_pcm, | 1627 | &bfin_i2s_pcm, |
1648 | #endif | 1628 | #endif |
1649 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | 1629 | |
1650 | &bfin_tdm_pcm, | ||
1651 | #endif | ||
1652 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 1630 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
1653 | &bfin_ac97_pcm, | 1631 | &bfin_ac97_pcm, |
1654 | #endif | 1632 | #endif |
@@ -1661,10 +1639,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
1661 | &bfin_i2s, | 1639 | &bfin_i2s, |
1662 | #endif | 1640 | #endif |
1663 | 1641 | ||
1664 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
1665 | &bfin_tdm, | ||
1666 | #endif | ||
1667 | |||
1668 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 1642 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
1669 | &bfin_ac97, | 1643 | &bfin_ac97, |
1670 | #endif | 1644 | #endif |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 9512c369bc0e..92938e79b9e3 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -523,14 +523,6 @@ static struct platform_device bfin_i2s = { | |||
523 | }; | 523 | }; |
524 | #endif | 524 | #endif |
525 | 525 | ||
526 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
527 | static struct platform_device bfin_tdm = { | ||
528 | .name = "bfin-tdm", | ||
529 | .id = CONFIG_SND_BF5XX_SPORT_NUM, | ||
530 | /* TODO: add platform data here */ | ||
531 | }; | ||
532 | #endif | ||
533 | |||
534 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 526 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
535 | static struct platform_device bfin_ac97 = { | 527 | static struct platform_device bfin_ac97 = { |
536 | .name = "bfin-ac97", | 528 | .name = "bfin-ac97", |
@@ -611,10 +603,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
611 | &bfin_i2s, | 603 | &bfin_i2s, |
612 | #endif | 604 | #endif |
613 | 605 | ||
614 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
615 | &bfin_tdm, | ||
616 | #endif | ||
617 | |||
618 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | 606 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) |
619 | &bfin_ac97, | 607 | &bfin_ac97, |
620 | #endif | 608 | #endif |