lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/asoc' into for-linus

Browse Source 
* topic/asoc:
  ASoC: magician: fix PXA SSP clock polarity
  ASoC: Instantiate any forgotten DAPM widgets
  ASoC: Revert duplicated code in SSM2602 driver
  ASoC: Remove odd bit clock ratios for WM8903
This commit is contained in:
Takashi Iwai
2009-06-16 17:38:36 +02:00
parent e3f86d3d3c 33745fb344
commit 21ce3cd633
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/ssm2602.c
View File

@@ -375,10 +375,6 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_codec *codec = socdev->card->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct ssm2602_priv *ssm2602 = codec->private_data; struct ssm2602_priv *ssm2602 = codec->private_data;
if (ssm2602->master_substream == substream)
ssm2602->master_substream = ssm2602->slave_substream;
ssm2602->slave_substream = NULL;
/* deactivate */ /* deactivate */
if (!codec->active) if (!codec->active)
ssm2602_write(codec, SSM2602_ACTIVE, 0); ssm2602_write(codec, SSM2602_ACTIVE, 0);

4
sound/soc/codecs/wm8903.c
View File

@@ -1257,22 +1257,18 @@ static struct {
int div; int div;
} bclk_divs[] = { } bclk_divs[] = {
{ 10, 0 }, { 10, 0 },
{ 15, 1 },
{ 20, 2 }, { 20, 2 },
{ 30, 3 }, { 30, 3 },
{ 40, 4 }, { 40, 4 },
{ 50, 5 }, { 50, 5 },
{ 55, 6 },
{ 60, 7 }, { 60, 7 },
{ 80, 8 }, { 80, 8 },
{ 100, 9 }, { 100, 9 },
{ 110, 10 },
{ 120, 11 }, { 120, 11 },
{ 160, 12 }, { 160, 12 },
{ 200, 13 }, { 200, 13 },
{ 220, 14 }, { 220, 14 },
{ 240, 15 }, { 240, 15 },
{ 250, 16 },
{ 300, 17 }, { 300, 17 },
{ 320, 18 }, { 320, 18 },
{ 440, 19 }, { 440, 19 },

2
sound/soc/pxa/magician.c
View File

@@ -184,7 +184,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,
/* set cpu DAI configuration */ /* set cpu DAI configuration */
ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
sound/soc/soc-core.c
View File

@@ -1389,6 +1389,9 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
snprintf(codec->card->longname, sizeof(codec->card->longname), snprintf(codec->card->longname, sizeof(codec->card->longname),
"%s (%s)", card->name, codec->name); "%s (%s)", card->name, codec->name);
/* Make sure all DAPM widgets are instantiated */
snd_soc_dapm_new_widgets(codec);
ret = snd_card_register(codec->card); ret = snd_card_register(codec->card);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "asoc: failed to register soundcard for %s\n", printk(KERN_ERR "asoc: failed to register soundcard for %s\n",