sound fixes for 3.17-rc6
Subsystems (8)
Linus,
please pull sound fixes for v3.17-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.17-rc6
The topmost commit is 779608521976e3b8d264f89c67e64c918949cc9b
----------------------------------------------------------------
sound fixes for 3.17-rc6
All small fixes in random various drivers, mostly for ASoC at this time, which look reasonable for a high rc number.
----------------------------------------------------------------
Charles Keepax (1):
ASoC: samsung-i2s: Check secondary DAI exists before referencing
Jianqun (3):
ASoC: rockchip-i2s: fix master mode set bit error
ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller
ASoC: rockchip-i2s: dt: swap tx and rx channed request number in example
Jyri Sarha (1):
ASoC: tlv320aic31xx: Fix 24bit samples with I2S format and 12MHz mclk
Paul Handrigan (1):
ASoC: cs4265: Fix register address to set the proper data type.
Peter Ujfalusi (1):
ASoC: davinci-mcasp: Correct rx format unit configuration
Qiao Zhou (1):
ASoC: soc-pcm: fix dpcm_path_get error handling
Rajeev Kumar (2):
ASoC: dwc: Update email id of the author
ASoC: Update email id of the author
Takashi Iwai (1):
ALSA: hda - Fix invalid pin powermap without jack detection
--- .../devicetree/bindings/sound/rockchip-i2s.txt | 2 +- sound/pci/hda/patch_sigmatel.c | 17 +++++--- sound/soc/codecs/cs4265.c | 6 +-- sound/soc/codecs/sta529.c | 4 +- sound/soc/codecs/tlv320aic31xx.c | 51 +++++++++++++++++----- sound/soc/davinci/davinci-mcasp.c | 11 ++++- sound/soc/dwc/designware_i2s.c | 4 +- sound/soc/rockchip/rockchip_i2s.c | 13 +++--- sound/soc/samsung/i2s.c | 5 ++- sound/soc/soc-compress.c | 6 ++- sound/soc/soc-pcm.c | 6 ++- sound/soc/spear/spear_pcm.c | 4 +- 12 files changed, 91 insertions(+), 38 deletions(-)
Documentation/devicetree/bindings/sound/rockchip-i2s.txt +1 -1
@@ -31,7 +31,7 @@ i2s@ff890000 { #address-cells = <1>; #size-cells = <0>; dmas = <&pdma1 0>, <&pdma1 1>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; clock-names = "i2s_hclk", "i2s_clk"; clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; };
sound/pci/hda/patch_sigmatel.c +12 -5
@@ -566,8 +566,8 @@ static void stac_init_power_map(struct hda_codec *codec)if (snd_hda_jack_tbl_get (codec, nid))continue ;if (def_conf ==AC_JACK_PORT_COMPLEX && - !(spec->vref_mute_led_nid == nid || -is_jack_detectable (codec, nid))) { + spec->vref_mute_led_nid != nid && +is_jack_detectable (codec, nid)) {snd_hda_jack_detect_enable_callback (codec, nid,STAC_PWR_EVENT , jack_update_power);
@@ -4276,11 +4276,18 @@ static int stac_parse_auto_config(struct hda_codec *codec)return err; } -stac_init_power_map (codec); -return 0 ; } +static int stac_build_controls (struct hda_codec *codec) +{ +int err =snd_hda_gen_build_controls (codec); + +if (err <0 ) +return err; +stac_init_power_map (codec); +return 0 ; +}static int stac_init (struct hda_codec *codec) {
@@ -4392,7 +4399,7 @@ static int stac_suspend(struct hda_codec *codec)#endif /* CONFIG_PM */ static const struct hda_codec_ops stac_patch_ops = { - .build_controls = snd_hda_gen_build_controls, + .build_controls = stac_build_controls, .build_pcms = snd_hda_gen_build_pcms, .init = stac_init, .free = stac_free,
sound/soc/codecs/cs4265.c +3 -3
@@ -458,12 +458,12 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream,if (params_width (params) ==16 ) {snd_soc_update_bits (codec,CS4265_DAC_CTL ,CS4265_DAC_CTL_DIF , (1 <<5 )); -snd_soc_update_bits (codec,CS4265_ADC_CTL , +snd_soc_update_bits (codec,CS4265_SPDIF_CTL2 ,CS4265_SPDIF_CTL2_DIF , (1 <<7 )); }else {snd_soc_update_bits (codec,CS4265_DAC_CTL ,CS4265_DAC_CTL_DIF , (3 <<5 )); -snd_soc_update_bits (codec,CS4265_ADC_CTL , +snd_soc_update_bits (codec,CS4265_SPDIF_CTL2 ,CS4265_SPDIF_CTL2_DIF , (1 <<7 )); }break ;
@@ -472,7 +472,7 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, CS4265_DAC_CTL_DIF, 0);snd_soc_update_bits (codec,CS4265_ADC_CTL ,CS4265_ADC_DIF ,0 ); -snd_soc_update_bits (codec,CS4265_ADC_CTL , +snd_soc_update_bits (codec,CS4265_SPDIF_CTL2 ,CS4265_SPDIF_CTL2_DIF , (1 <<6 ));break ;
sound/soc/codecs/sta529.c +2 -2
@@ -4,7 +4,7 @@* sound/soc/codecs/sta529.c -- spear ALSA Soc codec driver * * Copyright (C) 2012 ST Microelectronics -* Rajeev Kumar <[email protected]> +* Rajeev Kumar <[email protected]> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any
@@ -426,5 +426,5 @@ static struct i2c_driver sta529_i2c_driver = {module_i2c_driver (sta529_i2c_driver);MODULE_DESCRIPTION ("ASoC STA529 codec driver" ); -MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" ); +MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" );MODULE_LICENSE ("GPL" );
sound/soc/codecs/tlv320aic31xx.c +39 -12
121 lines not on this page · raw message
sound/soc/davinci/davinci-mcasp.c +10 -1
@@ -467,8 +467,17 @@ static int davinci_config_channel_size(struct davinci_mcasp *mcasp, {u32 fmt;u32 tx_rotate = (word_length /4 ) &0x7 ; -u32 rx_rotate = (32 - word_length) /4 ;u32 mask = (1ULL << word_length) -1 ; +/* +* For captured data we should not rotate, inversion and masking is +* enoguh to get the data to the right position: +* Format data from bus after reverse (XRBUF) +* S16_LE: |LSB|MSB|xxx|xxx| |xxx|xxx|MSB|LSB| +* S24_3LE: |LSB|DAT|MSB|xxx| |xxx|MSB|DAT|LSB| +* S24_LE: |LSB|DAT|MSB|xxx| |xxx|MSB|DAT|LSB| +* S32_LE: |LSB|DAT|DAT|MSB| |MSB|DAT|DAT|LSB| +*/ +u32 rx_rotate =0 ;/* * if s BCLK-to-LRCLK ratio has been configured via the set_clkdiv()
sound/soc/dwc/designware_i2s.c +2 -2
@@ -4,7 +4,7 @@* sound/soc/dwc/designware_i2s.c * * Copyright (C) 2010 ST Microelectronics -* Rajeev Kumar <[email protected]> +* Rajeev Kumar <[email protected]> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any
@@ -455,7 +455,7 @@ static struct platform_driver dw_i2s_driver = {module_platform_driver (dw_i2s_driver); -MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" ); +MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" );MODULE_DESCRIPTION ("DESIGNWARE I2S SoC Interface" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:designware_i2s" );
sound/soc/rockchip/rockchip_i2s.c +7 -6
@@ -165,13 +165,14 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,struct rk_i2s_dev *i2s =to_info (cpu_dai);unsigned int mask =0 , val =0 ; - mask =I2S_CKR_MSS_SLAVE ; + mask =I2S_CKR_MSS_MASK ;switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBS_CFS : - val =I2S_CKR_MSS_SLAVE ; +/* Set source clock in Master mode */ + val =I2S_CKR_MSS_MASTER ;break ;case SND_SOC_DAIFMT_CBM_CFM : - val =I2S_CKR_MSS_MASTER ; + val =I2S_CKR_MSS_SLAVE ;break ;default :return -EINVAL ;
@@ -361,6 +362,8 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg)case I2S_XFER :case I2S_CLR :case I2S_RXDR : +case I2S_FIFOLR : +case I2S_INTSR :return true;default :return false;
@@ -370,8 +373,8 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg)static bool rockchip_i2s_volatile_reg (struct device *dev,unsigned int reg) {switch (reg) { -case I2S_FIFOLR :case I2S_INTSR : +case I2S_CLR :return true;default :return false;
@@ -381,8 +384,6 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)static bool rockchip_i2s_precious_reg (struct device *dev,unsigned int reg) {switch (reg) { -case I2S_FIFOLR : -return true;default :return false; }
sound/soc/samsung/i2s.c +3 -2
@@ -462,7 +462,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,if (dir ==SND_SOC_CLOCK_IN ) rfs =0 ; - if ((rfs && other->rfs && (other->rfs != rfs)) || + if ((rfs && other && other->rfs && (other->rfs != rfs)) || (any_active(i2s) && (((dir == SND_SOC_CLOCK_IN) && !(mod & MOD_CDCLKCON)) ||
@@ -762,7 +762,8 @@ static void i2s_shutdown(struct snd_pcm_substream *substream, }else {u32 mod =readl (i2s->addr +I2SMOD ); i2s->cdclk_out = !(mod &MOD_CDCLKCON ); - other->cdclk_out = i2s->cdclk_out; +if (other) + other->cdclk_out = i2s->cdclk_out; }/* Reset any constraint on RFS and BFS */ i2s->rfs =0 ;
sound/soc/soc-compress.c +5 -1
@@ -101,7 +101,11 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].runtime = fe_substream->runtime; -if (dpcm_path_get (fe, stream, &list) <=0 ) { + ret =dpcm_path_get (fe, stream, &list); +if (ret <0 ) { +mutex_unlock (&fe->card->mutex); + goto fe_err; + }else if (ret ==0 ) {dev_dbg (fe->dev,"ASoC: %s no valid %s route\n" , fe->dai_link->name, stream ?"capture" :"playback" ); }
sound/soc/soc-pcm.c +5 -1
@@ -2352,7 +2352,11 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)mutex_lock_nested (&fe->card->mutex,SND_SOC_CARD_CLASS_RUNTIME ); fe->dpcm[stream].runtime = fe_substream->runtime; -if (dpcm_path_get (fe, stream, &list) <=0 ) { + ret =dpcm_path_get (fe, stream, &list); +if (ret <0 ) { +mutex_unlock (&fe->card->mutex); +return ret; + }else if (ret ==0 ) {dev_dbg (fe->dev,"ASoC: %s no valid %s route\n" , fe->dai_link->name, stream ?"capture" :"playback" ); }
sound/soc/spear/spear_pcm.c +2 -2
@@ -4,7 +4,7 @@* sound/soc/spear/spear_pcm.c * * Copyright (C) 2012 ST Microelectronics -* Rajeev Kumar<[email protected]> +* Rajeev Kumar<[email protected]> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any
@@ -50,6 +50,6 @@ int devm_spear_pcm_platform_register(struct device *dev, }EXPORT_SYMBOL_GPL (devm_spear_pcm_platform_register); -MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" ); +MODULE_AUTHOR ("Rajeev Kumar <[email protected]>" );MODULE_DESCRIPTION ("SPEAr PCM DMA module" );MODULE_LICENSE ("GPL" );