diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
| commit | cc99a0861fa1c72335dc91a2e06d0b431911d55e (patch) | |
| tree | b5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/soc/pxa | |
| parent | bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f (diff) | |
| parent | 382225e62bdb8059b7f915b133426425516dd300 (diff) | |
| download | op-kernel-dev-cc99a0861fa1c72335dc91a2e06d0b431911d55e.zip op-kernel-dev-cc99a0861fa1c72335dc91a2e06d0b431911d55e.tar.gz | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/corgi.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/spitz.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index fc592f0..784cff5 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link corgi_dai = { .name = "WM8731", .stream_name = "WM8731", - .cpu_dai_name = "pxa-is2-dai", + .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec-0.001a", + .codec_name = "wm8731-codec-0.001b", .init = corgi_wm8731_init, .ops = &corgi_ops, }; diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6298ee1..a7d4999 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec.0-001a", + .codec_name = "wm8731-codec.0-001b", .init = poodle_wm8731_init, .ops = &poodle_ops, }; diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index c2acb69..8e15713 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link spitz_dai = { .name = "wm8750", .stream_name = "WM8750", - .cpu_dai_name = "pxa-is2", + .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001a", + .codec_name = "wm8750-codec.0-001b", .init = spitz_wm8750_init, .ops = &spitz_ops, }; |
