sound fix for 2.6.35-rc6
Subsystems (3)
Linus,
please pull sound fixe for v2.6.35-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/asoc
This time only fixes for ASoC as below.
Thanks!
Takashi
===
Axel Lin (2):
ASoC: wm8727: add a missing return in wm8727_platform_probe ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
Chanwoo Choi (1):
ASoC: Select wm_hubs automatically for WM8994
Kuninori Morimoto (2):
ASoC: fsi: fixup clock inversion operation
ASoC: fsi: fixup wrong value setting order of TDM
Mark Brown (1):
ASoC: Remove duplicate AUX definition from WM8776
--- sound/soc/codecs/Kconfig | 4 ++-- sound/soc/codecs/wm8727.c | 2 ++ sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8988.c | 1 - sound/soc/sh/fsi.c | 27 +++++++++++---------------- 5 files changed, 15 insertions(+), 20 deletions(-)
sound/soc/codecs/Kconfig +2 -2
@@ -83,8 +83,8 @@ config SND_SOC_ALL_CODECS config SND_SOC_WM_HUBS tristate - default y if SND_SOC_WM8993=y - default m if SND_SOC_WM8993=m + default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y + default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m config SND_SOC_AC97_CODEC tristate
sound/soc/codecs/wm8727.c +2 -0
@@ -127,6 +127,8 @@ static __devinit int wm8727_platform_probe(struct platform_device *pdev) goto err_codec; } +return 0 ; + err_codec:snd_soc_unregister_codec (codec); err:
sound/soc/codecs/wm8776.c +0 -1
@@ -94,7 +94,6 @@ SOC_DAPM_SINGLE("Bypass Switch", WM8776_OUTMUX, 2, 1, 0),static const struct snd_soc_dapm_widget wm8776_dapm_widgets[] = {SND_SOC_DAPM_INPUT ("AUX" ), -SND_SOC_DAPM_INPUT ("AUX" ),SND_SOC_DAPM_INPUT ("AIN1" ),SND_SOC_DAPM_INPUT ("AIN2" ),
sound/soc/codecs/wm8988.c +0 -1
@@ -885,7 +885,6 @@ static int wm8988_register(struct wm8988_priv *wm8988, ret =snd_soc_register_dai (&wm8988_dai);if (ret !=0 ) {dev_err (codec->dev,"Failed to register DAI: %d\n" , ret); -snd_soc_unregister_codec (codec); goto err_codec; }
sound/soc/sh/fsi.c +11 -16
@@ -683,20 +683,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,/* clock inversion (CKG2) */ data =0 ; -switch (SH_FSI_INVERSION_MASK & flags) { -case SH_FSI_LRM_INV : - data =1 <<12 ; -break ; -case SH_FSI_BRM_INV : - data =1 <<8 ; -break ; -case SH_FSI_LRS_INV : - data =1 <<4 ; -break ; -case SH_FSI_BRS_INV : - data =1 <<0 ; -break ; - } +if (SH_FSI_LRM_INV & flags) + data |=1 <<12 ; +if (SH_FSI_BRM_INV & flags) + data |=1 <<8 ; +if (SH_FSI_LRS_INV & flags) + data |=1 <<4 ; +if (SH_FSI_BRS_INV & flags) + data |=1 <<0 ; +fsi_reg_write (fsi,CKG2 , data);/* do fmt, di fmt */
@@ -726,15 +721,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,break ;case SH_FSI_FMT_TDM : msg ="TDM" ; - data =CR_FMT (CR_TDM ) | (fsi->chan -1 ); fsi->chan = is_play ?SH_FSI_GET_CH_O (flags) :SH_FSI_GET_CH_I (flags); + data =CR_FMT (CR_TDM ) | (fsi->chan -1 );break ;case SH_FSI_FMT_TDM_DELAY : msg ="TDM Delay" ; - data =CR_FMT (CR_TDM_D ) | (fsi->chan -1 ); fsi->chan = is_play ?SH_FSI_GET_CH_O (flags) :SH_FSI_GET_CH_I (flags); + data =CR_FMT (CR_TDM_D ) | (fsi->chan -1 );break ;default :dev_err (dai->dev,"unknown format.\n" );