diff options
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/sdp4430.c | 24 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 000ae1546de..d31cfd62023 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -339,7 +339,7 @@ static struct twl4030_vibra_data twl6040_vibra = { }; static struct twl4030_audio_data twl6040_audio = { - .audio_card_name = "Panda", + .audio_card_name = "sdp4430-defname", .codec = &twl6040_codec, .vibra = &twl6040_vibra, .audpwron_gpio = 127, diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index 02df27aa596..9cc609a1f0e 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -705,7 +705,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MM-UL & MM_DL */ .cpu_dai_name = "MultiMedia1", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .init = sdp4430_twl6040_fe_init, .dsp_link = &fe_media, @@ -717,7 +717,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MM-UL2 */ .cpu_dai_name = "MultiMedia2", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_media_capture, }, @@ -728,7 +728,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - VX-UL & VX-DL */ .cpu_dai_name = "Voice", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_media, .no_host_mode = SND_SOC_DAI_LINK_OPT_HOST, @@ -740,7 +740,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - TONES_DL */ .cpu_dai_name = "Tones", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_tones, }, @@ -751,7 +751,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - DMIC UL 2 */ .cpu_dai_name = "Vibra", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_vib, }, @@ -762,7 +762,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MODEM <-> McBSP2 */ .cpu_dai_name = "MODEM", .platform_name = "aess", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .init = sdp4430_twl6040_fe_init, .dsp_link = &fe_modem, @@ -777,7 +777,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MM-DL (mmap) */ .cpu_dai_name = "MultiMedia1 LP", .platform_name = "aess", - + .codec_name = "twl6040-codec", .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_lp_media, }, @@ -788,7 +788,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MCBSP2 - MM-EXT */ .cpu_dai_name = "omap-mcbsp-dai.1", .platform_name = "omap-pcm-audio", - + .codec_name = "twl6040-codec", /* FM */ .codec_dai_name = "FM Digital", @@ -923,7 +923,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* Bluetooth */ .codec_dai_name = "Bluetooth", - + .codec_name = "twl6040-codec", .no_pcm = 1, /* don't create ALSA pcm for this */ .no_codec = 1, /* TODO: have a dummy CODEC */ .be_hw_params_fixup = mcbsp_be_hw_params_fixup, @@ -941,7 +941,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* Bluetooth */ .codec_dai_name = "Bluetooth", - + .codec_name = "twl6040-codec", .no_pcm = 1, /* don't create ALSA pcm for this */ .no_codec = 1, /* TODO: have a dummy CODEC */ .init = sdp4430_bt_init, @@ -957,7 +957,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MCBSP2 - MM-EXT */ .cpu_dai_name = "omap-mcbsp-dai.1", .platform_name = "aess", - + .codec_name = "twl6040-codec", /* FM */ .codec_dai_name = "FM Digital", @@ -974,7 +974,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* ABE components - MCBSP2 - MM-EXT */ .cpu_dai_name = "omap-mcbsp-dai.1", .platform_name = "aess", - + .codec_name = "twl6040-codec", /* MODEM */ .codec_dai_name = "MODEM", diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2f6bcdb69b8..8d9478681b9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3015,6 +3015,8 @@ int snd_soc_register_card(struct snd_soc_card *card) if (!card->name || !card->dev) return -EINVAL; + pr_info("snd_soc_register_card: name=%s\n", card->name); + for (i = 0; i < card->num_links; i++) { struct snd_soc_dai_link *link = &card->dai_link[i]; |