diff options
author | Scott Jiang <scott.jiang@analog.com> | 2011-07-05 19:27:25 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-23 01:18:34 -0400 |
commit | 2b6678c552ea05e7732fa1486ae1f56cb4a45f47 (patch) | |
tree | 8cd6b2ecae3a66fc3f61714512777e7cc166de3b /arch/blackfin/mach-bf527 | |
parent | 6ebc2bb92a35a651d0573d67664eb286505bb985 (diff) |
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>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 094853ac3c0d..4e9dc9cf8241 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -539,9 +539,25 @@ static struct resource bfin_snd_resources[][4] = { | |||
539 | BFIN_SND_RES(0), | 539 | BFIN_SND_RES(0), |
540 | BFIN_SND_RES(1), | 540 | BFIN_SND_RES(1), |
541 | }; | 541 | }; |
542 | #endif | ||
543 | |||
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 | ||
542 | 550 | ||
543 | static struct platform_device bfin_pcm = { | 551 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) |
544 | .name = "bfin-pcm-audio", | 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 | .id = -1, | 561 | .id = -1, |
546 | }; | 562 | }; |
547 | #endif | 563 | #endif |
@@ -1217,9 +1233,16 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1217 | &ezkit_flash_device, | 1233 | &ezkit_flash_device, |
1218 | #endif | 1234 | #endif |
1219 | 1235 | ||
1220 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \ | 1236 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) |
1221 | defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | 1237 | &bfin_i2s_pcm, |
1222 | &bfin_pcm, | 1238 | #endif |
1239 | |||
1240 | #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) | ||
1241 | &bfin_tdm_pcm, | ||
1242 | #endif | ||
1243 | |||
1244 | #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) | ||
1245 | &bfin_ac97_pcm, | ||
1223 | #endif | 1246 | #endif |
1224 | 1247 | ||
1225 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) | 1248 | #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) |