diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
| commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
| tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/soc/blackfin/bf5xx-ad193x.c | |
| parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
| parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ad193x.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad193x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index d6651c033cb..5956584ea3a 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c @@ -56,7 +56,7 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream, switch (params_rate(params)) { case 48000: - clk = 12288000; + clk = 24576000; break; } @@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { .cpu_dai_name = "bfin-tdm.0", .codec_dai_name ="ad193x-hifi", .platform_name = "bfin-tdm-pcm-audio", - .codec_name = "ad193x.5", + .codec_name = "spi0.5", .ops = &bf5xx_ad193x_ops, }, { @@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { .cpu_dai_name = "bfin-tdm.1", .codec_dai_name ="ad193x-hifi", .platform_name = "bfin-tdm-pcm-audio", - .codec_name = "ad193x.5", + .codec_name = "spi0.5", .ops = &bf5xx_ad193x_ops, }, }; |