tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Blackfin: boards: fix pcm device name

The pcm driver name has been changed, but the device name has not.

Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

authored by

Scott Jiang and committed by
Mike Frysinger 2b6678c5 6ebc2bb9

+56 -11
+28 -5
arch/blackfin/mach-bf527/boards/ezkit.c
··· 539 539 BFIN_SND_RES(0), 540 540 BFIN_SND_RES(1), 541 541 }; 542 + #endif 542 543 543 - static struct platform_device bfin_pcm = { 544 - .name = "bfin-pcm-audio", 544 + #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) 545 + static struct platform_device bfin_i2s_pcm = { 546 + .name = "bfin-i2s-pcm-audio", 547 + .id = -1, 548 + }; 549 + #endif 550 + 551 + #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) 552 + static struct platform_device bfin_tdm_pcm = { 553 + .name = "bfin-tdm-pcm-audio", 554 + .id = -1, 555 + }; 556 + #endif 557 + 558 + #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) 559 + static struct platform_device bfin_ac97_pcm = { 560 + .name = "bfin-ac97-pcm-audio", 545 561 .id = -1, 546 562 }; 547 563 #endif ··· 1233 1217 &ezkit_flash_device, 1234 1218 #endif 1235 1219 1236 - #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ 1237 - defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) 1238 - &bfin_pcm, 1220 + #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) 1221 + &bfin_i2s_pcm, 1222 + #endif 1223 + 1224 + #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) 1225 + &bfin_tdm_pcm, 1226 + #endif 1227 + 1228 + #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) 1229 + &bfin_ac97_pcm, 1239 1230 #endif 1240 1231 1241 1232 #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+28 -6
arch/blackfin/mach-bf537/boards/stamp.c
··· 2517 2517 BFIN_SND_RES(0), 2518 2518 BFIN_SND_RES(1), 2519 2519 }; 2520 + #endif 2520 2521 2521 - static struct platform_device bfin_pcm = { 2522 - .name = "bfin-pcm-audio", 2522 + #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) 2523 + static struct platform_device bfin_i2s_pcm = { 2524 + .name = "bfin-i2s-pcm-audio", 2525 + .id = -1, 2526 + }; 2527 + #endif 2528 + 2529 + #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) 2530 + static struct platform_device bfin_tdm_pcm = { 2531 + .name = "bfin-tdm-pcm-audio", 2532 + .id = -1, 2533 + }; 2534 + #endif 2535 + 2536 + #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) 2537 + static struct platform_device bfin_ac97_pcm = { 2538 + .name = "bfin-ac97-pcm-audio", 2523 2539 .id = -1, 2524 2540 }; 2525 2541 #endif ··· 2770 2754 &stamp_flash_device, 2771 2755 #endif 2772 2756 2773 - #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ 2774 - defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \ 2775 - defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) 2776 - &bfin_pcm, 2757 + #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) 2758 + &bfin_i2s_pcm, 2759 + #endif 2760 + 2761 + #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) 2762 + &bfin_tdm_pcm, 2763 + #endif 2764 + 2765 + #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) 2766 + &bfin_ac97_pcm, 2777 2767 #endif 2778 2768 2779 2769 #if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)