Skip to contentSkip to conversation

ASoC updates for 3.2

DISCUSSION Mark Brown 2 participants 4 messages Nov 2, 2011

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb:

ASoC: wm8940: Properly set codec->dapm.bias_level (2011-10-27 09:17:08 +0200)

are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.2

The usual connection of small, local fixes to specific drivers.

Axel Lin (5):
ASoC: wm8940: Fix mask for setting BCLKDIV
ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode
ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode
ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt

Hong Xu (1):
ASoC: WM8904: Set `invert' bit for Capture Switch

Mark Brown (4):
ASoC: Fix return value of wm5100_gpio_direction_out()
ASoC: Ensure WM8962 PLL registers are reset
ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK

 sound/soc/codecs/tlv320aic23.c |    1 +
 sound/soc/codecs/tlv320aic3x.c |    1 +
 sound/soc/codecs/wm5100.c      |   12 ++++++++----
 sound/soc/codecs/wm8711.c      |    4 ++--
 sound/soc/codecs/wm8904.c      |    2 +-
 sound/soc/codecs/wm8940.c      |    2 +-
 sound/soc/codecs/wm8962.c      |   30 ++++++++++++++++++++----------
 7 files changed, 34 insertions(+), 18 deletions(-)
#1 lore raw

At Wed, 2 Nov 2011 11:50:43 +0000,

Quoted 9 lines · Mark Brown

The following changes since commit 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb:

ASoC: wm8940: Properly set codec->dapm.bias_level (2011-10-27 09:17:08 +0200)

are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.2

The usual connection of small, local fixes to specific drivers.

Strangely, the diffstat shows differently with my pull,

 sound/soc/codecs/tlv320aic23.c |    1 +
 sound/soc/codecs/tlv320aic3x.c |    1 +
 sound/soc/codecs/wm5100.c      |   12 ++++++++----
 sound/soc/codecs/wm8711.c      |    4 ++--
 sound/soc/codecs/wm8904.c      |    2 +-
 sound/soc/codecs/wm8940.c      |    2 +-
 sound/soc/codecs/wm8962.c      |   28 +++++++++++++++++++---------
 7 files changed, 33 insertions(+), 17 deletions(-)

while yours are:

Quoted 8 lines
 sound/soc/codecs/tlv320aic23.c |    1 +
 sound/soc/codecs/tlv320aic3x.c |    1 +
 sound/soc/codecs/wm5100.c      |   12 ++++++++----
 sound/soc/codecs/wm8711.c      |    4 ++--
 sound/soc/codecs/wm8904.c      |    2 +-
 sound/soc/codecs/wm8940.c      |    2 +-
 sound/soc/codecs/wm8962.c      |   30 ++++++++++++++++++++----------
 7 files changed, 34 insertions(+), 18 deletions(-)

I pulled and pushed out anyway. Please check later whether everything is OK.

thanks,

Takashi

author
#2 lore raw
Quoted 5 lines · Takashi Iwai
Quoted 1 line · Mark Brown

The usual connection of small, local fixes to specific drivers.

Strangely, the diffstat shows differently with my pull,

There's no diff with my for-3.2 branch so the result is the same.

#3 lore raw

At Wed, 2 Nov 2011 13:17:55 +0000,

Quoted 9 lines · Mark Brown
Quoted 5 lines · Takashi Iwai
Quoted 1 line · Mark Brown

The usual connection of small, local fixes to specific drivers.

Strangely, the diffstat shows differently with my pull,

There's no diff with my for-3.2 branch so the result is the same.

OK, thanks.

Takashi