ASoC updates for 2.6.31
Subsystems (5)
cover ASoC updates for 2.6.31
The following changes since commit 236e6723bedb483b2ebf73ada01e2c853c5cac01:
Mark Brown (1):
ASoC: Fix lm4857 control
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31
Mark Brown (3):
ASoC: Remove odd bit clock ratios for WM8903
ASoC: Revert duplicated code in SSM2602 driver
ASoC: Instantiate any forgotten DAPM widgets
Philipp Zabel (1):
ASoC: magician: fix PXA SSP clock polarity
sound/soc/codecs/ssm2602.c | 4 ---- sound/soc/codecs/wm8903.c | 4 ---- sound/soc/pxa/magician.c | 2 +- sound/soc/soc-core.c | 3 +++ 4 files changed, 4 insertions(+), 9 deletions(-)
PATCH 1/4 ASoC: Remove odd bit clock ratios for WM8903
These are not supported since performance can not be guaranteed when they are in use.
--- sound/soc/codecs/wm8903.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8903.c +0 -4
@@ -1257,22 +1257,18 @@ static struct {int div; } bclk_divs[] = { { 10, 0 }, - { 15, 1 }, { 20, 2 }, { 30, 3 }, { 40, 4 }, { 50, 5 }, - { 55, 6 }, { 60, 7 }, { 80, 8 }, { 100, 9 }, - { 110, 10 }, { 120, 11 }, { 160, 12 }, { 200, 13 }, { 220, 14 }, { 240, 15 }, - { 250, 16 }, { 300, 17 }, { 320, 18 }, { 440, 19 },
Signature · 1 line
1.6.3.1
PATCH 2/4 ASoC: Revert duplicated code in SSM2602 driver
In reply to Mark BrownThe Blackfin submission was done as a patch against a different tree and contained a duplicate hunk which will cause us to loose track of the substream pointers when shutting down. Remove one of the duplicated hunks.
--- sound/soc/codecs/ssm2602.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
sound/soc/codecs/ssm2602.c +0 -4
@@ -375,10 +375,6 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,struct snd_soc_codec *codec = socdev->card->codec;struct ssm2602_priv *ssm2602 = codec->private_data; -if (ssm2602->master_substream == substream) - ssm2602->master_substream = ssm2602->slave_substream; - - ssm2602->slave_substream =NULL ;/* deactivate */ if (!codec->active)ssm2602_write (codec,SSM2602_ACTIVE ,0 );
Signature · 1 line
1.6.3.1
PATCH 3/4 ASoC: Instantiate any forgotten DAPM widgets
In reply to Mark BrownWith the recent changes to the DAPM power checks it has become important to explicitly instantiate all widgets but some drivers were forgetting to do that. Since everything needs to do it add a call to instantiate them immediately before the card registration - it does no harm when it is called repeatedly and saves work in drivers.
--- sound/soc/soc-core.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +3 -0
@@ -1389,6 +1389,9 @@ int snd_soc_init_card(struct snd_soc_device *socdev)snprintf (codec->card->longname,sizeof (codec->card->longname),"%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);if (ret <0 ) { printk(KERN_ERR "asoc: failed to register soundcard for %s\n",
Signature · 1 line
1.6.3.1
PATCH 4/4 ASoC: magician: fix PXA SSP clock polarity
In reply to Mark BrownFrom: Philipp Zabel <[email protected]>
Follow-up fix needed since "ASoC: pxa-ssp.c fix clock/frame invert".
--- sound/soc/pxa/magician.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/pxa/magician.c +1 -1
@@ -184,7 +184,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,/* set cpu DAI configuration */ 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 )return ret;
Signature · 1 line
1.6.3.1
At Mon, 15 Jun 2009 10:32:23 +0100,
Quoted 8 lines · Mark Brown
The following changes since commit
236e6723bedb483b2ebf73ada01e2c853c5cac01:
Mark Brown (1):
ASoC: Fix lm4857 controlare available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.gitfor-2.6.31
Pulled now. Thanks.
Takashi