diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-03 09:55:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-03 09:55:44 +0100 |
| commit | eb10149d17784ad28061ba6c29025a2ef0a5e71a (patch) | |
| tree | d22b6b196d8c7550d0bb1e6c39bc0b5623fa53e6 /sound/soc/fsl/pcm030-audio-fabric.c | |
| parent | dda415d41882449f841f88d829dd65b6ee1c374c (diff) | |
| parent | 854ea639bb6b0b7ec433e0a59405f4f199ffae4f (diff) | |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Very quiet release for ASoC really:
- Standardisation of the logging.
- DT and dmaengine support for Atmel.
- Support for Wolfson ADSP cores.
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090.
Diffstat (limited to 'sound/soc/fsl/pcm030-audio-fabric.c')
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index 4b63ec8eb37..4d261927662 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -29,14 +29,14 @@ struct pcm030_audio_data { static struct snd_soc_dai_link pcm030_fabric_dai[] = { { - .name = "AC97", + .name = "AC97.0", .stream_name = "AC97 Analog", .codec_dai_name = "wm9712-hifi", .cpu_dai_name = "mpc5200-psc-ac97.0", .codec_name = "wm9712-codec", }, { - .name = "AC97", + .name = "AC97.1", .stream_name = "AC97 IEC958", .codec_dai_name = "wm9712-aux", .cpu_dai_name = "mpc5200-psc-ac97.1", |