sound fixes for 3.19-rc3
Subsystems (5)
Linus,
please pull sound fixes for v3.19-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.19-rc3
The topmost commit is 62f64a880af2e82d1b41cb02cb43b88d30413993
----------------------------------------------------------------
sound fixes for 3.19-rc3
Nothing too exciting as a new year's start here: most of fixes are for ASoC, a boot crash fix on OMAP for deferred probe, a few driver specific fixes (Intel, dwc, rockchip, rt5677), in addition to typo fixes in kerneldoc comments for PCM.
----------------------------------------------------------------
Andrew Jackson (2):
ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap
ASoC: dwc: Iterate over all channels
Fang, Yang A (1):
ASoC: rt5677: fixed rt5677_dsp_vad_put rt5677_dsp_vad_get panic
Jarkko Nikula (3):
ASoC: Intel: Add I2C dependency to two new machines
ASoC: Intel: Fix BYTCR firmware name
ASoC: Intel: Fix BYTCR machine driver MODULE_ALIAS
Jianqun Xu (2):
ASoC: rockchip: i2s: fix error defination of transmit data level
ASoC: rockchip: i2s: fix maxburst of dma data to 4
Jie Yang (1):
ASoC: Intel: correct the fixed free block allocation
Lars-Peter Clausen (1):
ALSA: pcm: Fix kerneldoc for params_*() functions
Mark Brown (1):
ASoC: dapm: Remove snd_soc_of_parse_audio_routing() due to deferred probe
--- include/sound/pcm.h | 10 ++++---- sound/soc/codecs/rt5677.c | 9 ++++--- sound/soc/dwc/designware_i2s.c | 49 +++++++++++++++++++++++-------------- sound/soc/intel/Kconfig | 4 +-- sound/soc/intel/bytcr_dpcm_rt5640.c | 2 +- sound/soc/intel/sst-firmware.c | 6 ++++- sound/soc/intel/sst/sst_acpi.c | 2 +- sound/soc/rockchip/rockchip_i2s.c | 4 +-- sound/soc/rockchip/rockchip_i2s.h | 2 +- sound/soc/soc-core.c | 14 ++++------- 10 files changed, 57 insertions(+), 45 deletions(-)
include/sound/pcm.h +5 -5
@@ -857,7 +857,7 @@ static inline unsigned int params_channels(const struct snd_pcm_hw_params *p) }/** -* params_channels - Get the sample rate from the hw params +* params_rate - Get the sample rate from the hw params * @p: hw params */ static inline unsigned int params_rate (const struct snd_pcm_hw_params *p)
@@ -866,7 +866,7 @@ static inline unsigned int params_rate(const struct snd_pcm_hw_params *p) }/** -* params_channels - Get the period size (in frames) from the hw params +* params_period_size - Get the period size (in frames) from the hw params * @p: hw params */ static inline unsigned int params_period_size (const struct snd_pcm_hw_params *p)
@@ -875,7 +875,7 @@ static inline unsigned int params_period_size(const struct snd_pcm_hw_params *p) }/** -* params_channels - Get the number of periods from the hw params +* params_periods - Get the number of periods from the hw params * @p: hw params */ static inline unsigned int params_periods (const struct snd_pcm_hw_params *p)
@@ -884,7 +884,7 @@ static inline unsigned int params_periods(const struct snd_pcm_hw_params *p) }/** -* params_channels - Get the buffer size (in frames) from the hw params +* params_buffer_size - Get the buffer size (in frames) from the hw params * @p: hw params */ static inline unsigned int params_buffer_size (const struct snd_pcm_hw_params *p)
@@ -893,7 +893,7 @@ static inline unsigned int params_buffer_size(const struct snd_pcm_hw_params *p) }/** -* params_channels - Get the buffer size (in bytes) from the hw params +* params_buffer_bytes - Get the buffer size (in bytes) from the hw params * @p: hw params */ static inline unsigned int params_buffer_bytes (const struct snd_pcm_hw_params *p)
sound/soc/codecs/rt5677.c +5 -4
@@ -784,8 +784,8 @@ static unsigned int bst_tlv[] = {static int rt5677_dsp_vad_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -struct rt5677_priv *rt5677 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct rt5677_priv *rt5677 =snd_soc_component_get_drvdata (component); ucontrol->value.integer.value[0 ] = rt5677->dsp_vad_en;
@@ -795,8 +795,9 @@ static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,static int rt5677_dsp_vad_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -struct rt5677_priv *rt5677 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct rt5677_priv *rt5677 =snd_soc_component_get_drvdata (component); +struct snd_soc_codec *codec =snd_soc_component_to_codec (component); rt5677->dsp_vad_en = !!ucontrol->value.integer.value[0 ];
sound/soc/dwc/designware_i2s.c +30 -19
76 lines not on this page · raw message
sound/soc/intel/Kconfig +2 -2
@@ -89,7 +89,7 @@ config SND_SOC_INTEL_BROADWELL_MACH config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio DSP Support for MID BYT Platform" - depends on X86 + depends on X86 && I2C select SND_SOC_RT5640 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI
@@ -101,7 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH config SND_SOC_INTEL_CHT_BSW_RT5672_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS + depends on X86_INTEL_LPSS && I2C select SND_SOC_RT5670 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI
sound/soc/intel/bytcr_dpcm_rt5640.c +1 -1
@@ -227,4 +227,4 @@ module_platform_driver(snd_byt_mc_driver);MODULE_DESCRIPTION ("ASoC Intel(R) Baytrail CR Machine driver" );MODULE_AUTHOR ("Subhransu S. Prusty <[email protected]>" );MODULE_LICENSE ("GPL v2" ); -MODULE_ALIAS ("platform:bytrt5640-audio" ); +MODULE_ALIAS ("platform:bytt100_rt5640" );
sound/soc/intel/sst-firmware.c +5 -1
@@ -763,8 +763,12 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba/* does block span more than 1 section */ if (ba->offset >= block->offset && ba->offset < block_end) { +/* add block */ +list_move (&block->list, &dsp->used_block_list); +list_add (&block->module_list, block_list);/* align ba to block boundary */ - ba->offset = block->offset; + ba->size -= block_end - ba->offset; + ba->offset = block_end; err =block_alloc_contiguous (dsp, ba, block_list);if (err <0 )
sound/soc/intel/sst/sst_acpi.c +1 -1
@@ -343,7 +343,7 @@ int sst_acpi_remove(struct platform_device *pdev) }static struct sst_machines sst_acpi_bytcr[] = { - {"10EC5640" ,"T100" ,"bytt100_rt5640" ,NULL ,"fw_sst_0f28.bin" , + {"10EC5640" ,"T100" ,"bytt100_rt5640" ,NULL ,"intel/fw_sst_0f28.bin" , &byt_rvp_platform_data }, {}, };
sound/soc/rockchip/rockchip_i2s.c +2 -2
@@ -454,11 +454,11 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->playback_dma_data.addr = res->start +I2S_TXDR ; i2s->playback_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - i2s->playback_dma_data.maxburst =16 ; + i2s->playback_dma_data.maxburst =4 ; i2s->capture_dma_data.addr = res->start +I2S_RXDR ; i2s->capture_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - i2s->capture_dma_data.maxburst =16 ; + i2s->capture_dma_data.maxburst =4 ; i2s->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, i2s);
sound/soc/rockchip/rockchip_i2s.h +1 -1
@@ -127,7 +127,7 @@#define I2S_DMACR_TDE_DISABLE (0 << I2S_DMACR_TDE_SHIFT)#define I2S_DMACR_TDE_ENABLE (1 << I2S_DMACR_TDE_SHIFT)#define I2S_DMACR_TDL_SHIFT 0 -#define I2S_DMACR_TDL (x) ((x - 1) << I2S_DMACR_TDL_SHIFT) +#define I2S_DMACR_TDL (x) ((x) << I2S_DMACR_TDL_SHIFT)#define I2S_DMACR_TDL_MASK (0x1f << I2S_DMACR_TDL_SHIFT)/*
sound/soc/soc-core.c +5 -9
@@ -3230,7 +3230,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname) {struct device_node *np = card->dev->of_node; -int num_routes, old_routes; +int num_routes;struct snd_soc_dapm_route *routes;int i, ret;
@@ -3248,9 +3248,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,return -EINVAL ; } - old_routes = card->num_dapm_routes; - routes =devm_kzalloc (card->dev, - (old_routes + num_routes) *sizeof (*routes), + routes =devm_kzalloc (card->dev, num_routes *sizeof (*routes),GFP_KERNEL );if (!routes) { dev_err(card->dev,
@@ -3258,11 +3256,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,return -EINVAL ; } -memcpy (routes, card->dapm_routes, old_routes *sizeof (*routes)); -for (i =0 ; i < num_routes; i++) { ret =of_property_read_string_index (np, propname, -2 * i, &routes[old_routes + i].sink); +2 * i, &routes[i].sink);if (ret) { dev_err(card->dev, "ASoC: Property '%s' index %d could not be read: %d\n",
@@ -3270,7 +3266,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,return -EINVAL ; } ret =of_property_read_string_index (np, propname, - (2 * i) +1 , &routes[old_routes + i].source); + (2 * i) +1 , &routes[i].source);if (ret) { dev_err(card->dev, "ASoC: Property '%s' index %d could not be read: %d\n",
@@ -3279,7 +3275,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, } } - card->num_dapm_routes += num_routes; + card->num_dapm_routes = num_routes; card->dapm_routes = routes;return 0 ;