December 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 00/14] ASoC: Compile fixes with W=1
by Vinod Koul 15 Dec '16

15 Dec '16

We seem to have few warnings in ASoC (I have tried only one config today) when we compile with W=1. So this is first set to fix these warning, which predominantly are unused but initialized variables. Few instances actually helped remove a bit more code as well. Vinod Koul (14): ASoC: Intel: Skylake: remove unused 'ret' ASoC: Intel: sst: remove unused 'msg_high' ASoC: Intel: sst: remove unused 'ops' ASoC: topology: remove unused 'err' ASoC: hdac_hdmi: remove unused 'dai_map' ASoC: max98090: remove superflous check for 'micbias' ASoC: AMD: remove unused ‘dma_buffer’ ASoC: adau17x1: remove unused ‘ret’ ASoC: max9867: remove unused ‘ret’ ASoC: pcm3168a: remove unused ‘format’ ASoC: img: remove unused ‘format’ ASoC: Intel: sst: remove unused ‘ret_val’ ASoC: samsung: smdk_wm8580: remove unused ‘bfs’ ASoC: zx296702-i2s: remove unused ‘format’ sound/soc/amd/acp-pcm-dma.c | 3 --- sound/soc/codecs/adau17x1.c | 3 +-- sound/soc/codecs/hdac_hdmi.c | 5 ----- sound/soc/codecs/max98090.c | 2 +- sound/soc/codecs/max9867.c | 5 ++--- sound/soc/codecs/pcm3168a.c | 2 -- sound/soc/img/img-parallel-out.c | 2 -- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 ++-- sound/soc/intel/atom/sst/sst_ipc.c | 2 -- sound/soc/intel/atom/sst/sst_stream.c | 2 -- sound/soc/intel/skylake/skl-topology.c | 3 +-- sound/soc/samsung/smdk_wm8580.c | 5 +---- sound/soc/soc-topology.c | 4 ++-- sound/soc/zte/zx296702-i2s.c | 5 +---- 14 files changed, 11 insertions(+), 36 deletions(-) -- 1.9.1

4 25

[alsa-devel] [PATCH] ASoC: topology: kfree kcontrol->private_value before freeing kcontrol
by Colin King 15 Dec '16

15 Dec '16

From: Colin Ian King <colin.king(a)canonical.com> kcontrol->private_value is being kfree'd after kcontrol has been freed (in previous call to snd_ctl_remove). Instead, fix this by kfreeing the private_value before kcontrol. CoverityScan CID#1388311 "Read from pointer after free" Fixes: eea3dd4f1247a ("ASoC: topology: Only free TLV for volume mixers of a widget") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/soc-topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 11feb19..b5472e0 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -514,13 +514,12 @@ static void remove_widget(struct snd_soc_component *comp, == SND_SOC_TPLG_TYPE_MIXER) kfree(kcontrol->tlv.p); - snd_ctl_remove(card, kcontrol); - /* Private value is used as struct soc_mixer_control * for volume mixers or soc_bytes_ext for bytes * controls. */ kfree((void *)kcontrol->private_value); + snd_ctl_remove(card, kcontrol); } kfree(w->kcontrol_news); } -- 2.10.2

2 1

[alsa-devel] [PATCH] ASoC: rt5665: Make SND_SOC_RT5665 entry sort in Kconfig and Makefile
by Axel Lin 15 Dec '16

15 Dec '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/Kconfig | 10 +++++----- sound/soc/codecs/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 9e1718a..cfc108e 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -117,8 +117,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_RT5651 if I2C select SND_SOC_RT5659 if I2C select SND_SOC_RT5660 if I2C - select SND_SOC_RT5665 if I2C select SND_SOC_RT5663 if I2C + select SND_SOC_RT5665 if I2C select SND_SOC_RT5670 if I2C select SND_SOC_RT5677 if I2C && SPI_MASTER select SND_SOC_SGTL5000 if I2C @@ -668,8 +668,8 @@ config SND_SOC_RL6231 default y if SND_SOC_RT5651=y default y if SND_SOC_RT5659=y default y if SND_SOC_RT5660=y - default y if SND_SOC_RT5665=y default y if SND_SOC_RT5663=y + default y if SND_SOC_RT5665=y default y if SND_SOC_RT5670=y default y if SND_SOC_RT5677=y default m if SND_SOC_RT5514=m @@ -679,8 +679,8 @@ config SND_SOC_RL6231 default m if SND_SOC_RT5651=m default m if SND_SOC_RT5659=m default m if SND_SOC_RT5660=m - default m if SND_SOC_RT5665=m default m if SND_SOC_RT5663=m + default m if SND_SOC_RT5665=m default m if SND_SOC_RT5670=m default m if SND_SOC_RT5677=m @@ -728,10 +728,10 @@ config SND_SOC_RT5659 config SND_SOC_RT5660 tristate -config SND_SOC_RT5665 +config SND_SOC_RT5663 tristate -config SND_SOC_RT5663 +config SND_SOC_RT5665 tristate config SND_SOC_RT5670 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 7e1dad7..2624c73 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -118,8 +118,8 @@ snd-soc-rt5645-objs := rt5645.o snd-soc-rt5651-objs := rt5651.o snd-soc-rt5659-objs := rt5659.o snd-soc-rt5660-objs := rt5660.o -snd-soc-rt5665-objs := rt5665.o snd-soc-rt5663-objs := rt5663.o +snd-soc-rt5665-objs := rt5665.o snd-soc-rt5670-objs := rt5670.o snd-soc-rt5677-objs := rt5677.o snd-soc-rt5677-spi-objs := rt5677-spi.o @@ -346,8 +346,8 @@ obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o obj-$(CONFIG_SND_SOC_RT5659) += snd-soc-rt5659.o obj-$(CONFIG_SND_SOC_RT5660) += snd-soc-rt5660.o -obj-$(CONFIG_SND_SOC_RT5665) += snd-soc-rt5665.o obj-$(CONFIG_SND_SOC_RT5663) += snd-soc-rt5663.o +obj-$(CONFIG_SND_SOC_RT5665) += snd-soc-rt5665.o obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o obj-$(CONFIG_SND_SOC_RT5677_SPI) += snd-soc-rt5677-spi.o -- 2.9.3

2 1

[alsa-devel] [PATCH 1/1 linux-next] ASoC: samsung: include gpio consumer.h
by Fabian Frederick 15 Dec '16

15 Dec '16

Fix the following build errors sound/soc/samsung/tm2_wm5110.c:220:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] sound/soc/samsung/tm2_wm5110.c:438:24: error: implicit declaration of function 'devm_gpiod_get' [-Werror=implicit-function-declaration] Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- sound/soc/samsung/tm2_wm5110.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 5cdf7d1..24cc9d6 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> #include <sound/pcm_params.h> -- 2.7.4

3 4

[alsa-devel] [PATCH V2 2/2] ASoC: samsung: add GPIOLIB dependency
by Fabian Frederick 15 Dec '16

15 Dec '16

Both SND_SOC_SMARTQ and SND_SOC_SAMSUNG_TM2_WM5110 use gpio/consumer.h This patch adds GPIOLIB || COMPILE_TEST to Kconfig entries to avoid any build errors. See commit 638f958baeaf ("extcon: Allow compile test of GPIO consumers if !GPIOLIB") for similar problem and explanations. Reported-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- sound/soc/samsung/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 7c42315..f1f1d79 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -111,6 +111,7 @@ config SND_SOC_SAMSUNG_RX1950_UDA1380 config SND_SOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" depends on MACH_SMARTQ || COMPILE_TEST + depends on GPIOLIB || COMPILE_TEST depends on I2C select SND_SAMSUNG_I2S select SND_SOC_WM8750 @@ -193,6 +194,7 @@ config SND_SOC_ARNDALE_RT5631_ALC5631 config SND_SOC_SAMSUNG_TM2_WM5110 tristate "SoC I2S Audio support for WM5110 on TM2 board" depends on SND_SOC_SAMSUNG && MFD_ARIZONA && I2C && SPI_MASTER + depends on GPIOLIB || COMPILE_TEST select SND_SOC_MAX98504 select SND_SOC_WM5110 select SND_SAMSUNG_I2S -- 2.7.4

3 2

[alsa-devel] [PATCH] ASoC: samsung: Remove tests of member address
by Krzysztof Kozlowski 15 Dec '16

15 Dec '16

The driver was checking for non-NULL address of struct's members: - s3c_audio_pdata->type (union), - s3c_audio_pdata->type.i2s (embedded struct). This is pointless as these will be always non-NULL. The 's3c_audio_pdata' is always initialized in static memory so it will be zeroed. Additionally the 'type' member was an union with only one member. It is safe to reorganize the structures to get rid of useless union and checks for addresses to fix the coccinelle warning: >> sound/soc/samsung/i2s.c:1270:2-4: ERROR: test of a variable/field address Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> --- Not tested on the hardware. --- arch/arm/mach-s3c64xx/dev-audio.c | 4 +--- include/linux/platform_data/asoc-s3c.h | 6 ++---- sound/soc/samsung/i2s.c | 10 ++-------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index b57783371d52..247dcc0b691e 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c @@ -106,9 +106,7 @@ static struct s3c_audio_pdata i2sv4_pdata = { .dma_playback = DMACH_HSI_I2SV40_TX, .dma_capture = DMACH_HSI_I2SV40_RX, .type = { - .i2s = { - .quirks = QUIRK_PRI_6CHAN, - }, + .quirks = QUIRK_PRI_6CHAN, }, }; diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index 15bf56ee8af7..90641a5daaf0 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h @@ -18,7 +18,7 @@ extern void s3c64xx_ac97_setup_gpio(int); -struct samsung_i2s { +struct samsung_i2s_type { /* If the Primary DAI has 5.1 Channels */ #define QUIRK_PRI_6CHAN (1 << 0) /* If the I2S block has a Stereo Overlay Channel */ @@ -47,7 +47,5 @@ struct s3c_audio_pdata { void *dma_capture; void *dma_play_sec; void *dma_capture_mic; - union { - struct samsung_i2s i2s; - } type; + struct samsung_i2s_type type; }; diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index e00974bc5616..d55326289a4a 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1218,7 +1218,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) { struct i2s_dai *pri_dai, *sec_dai = NULL; struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data; - struct samsung_i2s *i2s_cfg = NULL; struct resource *res; u32 regs_base, quirks = 0, idma_addr = 0; struct device_node *np = pdev->dev.of_node; @@ -1267,13 +1266,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) pri_dai->dma_capture.filter_data = i2s_pdata->dma_capture; pri_dai->filter = i2s_pdata->dma_filter; - if (&i2s_pdata->type) - i2s_cfg = &i2s_pdata->type.i2s; - - if (i2s_cfg) { - quirks = i2s_cfg->quirks; - idma_addr = i2s_cfg->idma_addr; - } + quirks = i2s_pdata->type.quirks; + idma_addr = i2s_pdata->type.idma_addr; } else { quirks = i2s_dai_data->quirks; if (of_property_read_u32(np, "samsung,idma-addr", -- 2.7.4

3 2

[alsa-devel] [PATCH] ASoC: wm8753: Add control to allow swapping HiFi DAC channels
by Alexander Shiyan 15 Dec '16

15 Dec '16

This patch adds a control to allow swapping HiFi DAC Left/Right channels. Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- sound/soc/codecs/wm8753.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 9bdf544..d05d76e 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -280,6 +280,7 @@ static const DECLARE_TLV_DB_SCALE(voice_mix_tlv, -1200, 300, 0); static const DECLARE_TLV_DB_SCALE(pga_tlv, -1725, 75, 0); static const struct snd_kcontrol_new wm8753_snd_controls[] = { +SOC_SINGLE("Hi-Fi DAC Left/Right channel Swap", WM8753_HIFI, 5, 1, 0), SOC_DOUBLE_R_TLV("PCM Volume", WM8753_LDAC, WM8753_RDAC, 0, 255, 0, dac_tlv), SOC_DOUBLE_R_TLV("ADC Capture Volume", WM8753_LADC, WM8753_RADC, 0, 255, 0, @@ -1087,7 +1088,7 @@ static int wm8753_i2s_set_dai_fmt(struct snd_soc_codec *codec, { u16 ioctl, hifi; - hifi = snd_soc_read(codec, WM8753_HIFI) & 0x011f; + hifi = snd_soc_read(codec, WM8753_HIFI) & 0x013f; ioctl = snd_soc_read(codec, WM8753_IOCTL) & 0x00ae; /* set master/slave audio interface */ -- 2.4.9

2 1

[alsa-devel] [PATCH 0/2] register atmel-ssc as sound DAI w/o platform driver
by Peter Rosin 15 Dec '16

15 Dec '16

Hi! The Atmel SSC is currently not usable as an audio DAI unless someone registers it with ASoC. This is currently delegated to a platform driver for every possible audio use, and prevents the SSC from being used as a cpu DAI with the simple-audio-card driver. The first patch fixes this. The second patch simplifies one of these platform drivers, since it can now rely on the SSC to register itself with ASoC. However, this may not be a possible simplification for other, older, drivers since it also requires device tree changes. Cheers, Peter Peter Rosin (2): misc: atmel-ssc: register as sound DAI if #sound-dai-cells is present ASoC: atmel: tse850: rely on the ssc to register as a cpu dai by itself .../devicetree/bindings/misc/atmel-ssc.txt | 2 + .../bindings/sound/axentia,tse850-pcm5142.txt | 5 +-- drivers/misc/atmel-ssc.c | 50 ++++++++++++++++++++++ include/linux/atmel-ssc.h | 1 + sound/soc/atmel/tse850-pcm5142.c | 23 ++-------- 5 files changed, 58 insertions(+), 23 deletions(-) -- 2.1.4

3 5

[alsa-devel] [PATCH v2 0/2] register atmel-ssc as sound DAI w/o platform driver
by Peter Rosin 15 Dec '16

15 Dec '16

Hi! v1 -> v2 changes - add ack from Rob Herring on patch 1/2. - add reasons why breaking compatibility is ok for patch 2/2 (requested by Rob). - add #sound-dai-cells to the ssc0 node in the devcietree example. The Atmel SSC is currently not usable as an audio DAI unless someone registers it with ASoC. This is currently delegated to a platform driver for every possible audio use, and prevents the SSC from being used as a cpu DAI with the simple-audio-card driver. The first patch fixes this. The second patch simplifies one of these platform drivers, since it can now rely on the SSC to register itself with ASoC. However, this may not be a possible simplification for other, older, drivers since it also requires device tree changes. Cheers, Peter Peter Rosin (2): misc: atmel-ssc: register as sound DAI if #sound-dai-cells is present ASoC: atmel: tse850: rely on the ssc to register as a cpu dai by itself .../devicetree/bindings/misc/atmel-ssc.txt | 2 + .../bindings/sound/axentia,tse850-pcm5142.txt | 11 +++-- drivers/misc/atmel-ssc.c | 50 ++++++++++++++++++++++ include/linux/atmel-ssc.h | 1 + sound/soc/atmel/tse850-pcm5142.c | 23 ++-------- 5 files changed, 64 insertions(+), 23 deletions(-) -- 2.1.4

4 5

[alsa-devel] [PATCH v2 00/13] ASoC: Intel: Skylake: Driver updates
by jeeja.kp＠intel.com 15 Dec '16

15 Dec '16

From: Jeeja KP <jeeja.kp(a)intel.com> This patch series includes driver updates for the handling scenarios during System S0/S3 transitions when audio stream is stopped during system. o move DMA configuration in DSP Gateway Module widget event handler to ensure DMA is configured after resume. o Enable SSP MLCK using Supply widget. This will ensure the MCLK is enabled when the widget is power on. o Check DMA decouple register state before coupling/decoupling the DMA. o In case of HDMI pass-through pipe, reset only the FE Pipe when stream in in XRUN state. o Resume the stream from HW renderer position. o HDMI Codec pin and converter state need to be restored when stream is resumed. Changes in v2: - Addressed Mark's comment on patch 1, split this into 2 as this had additional changes other than configuring the DMA. - Addressed Takashi's comment on the usage of snd_hdac_updatel() Jeeja KP (13): ASoC: Intel: Skylake: Update link_index and format in pipe params ASoC: Intel: Skylake: Add helper function to setup host/link dma ASoC: Intel: Skylake: Configure DMA in PRE_PMD handler of Mixer ASoC: Intel: Skylake: Removed unused skl_get_format() ALSA: hda: check stream decoupled register state ASoC: Intel: Skylake: Add set_tristate DAI ops to enable SSP MCLK ASoC: Intel: Skylake: Remove unused SSP BE prepare DAI ops ASoC: Intel: Skylake: Add supply widget as non DSP widget ASoC: Intel: Skylake: Add supply widget in skl_nau_max machine ASoC: Intel: Skylake: Add supply widget in bxt_da_max machine ASoC: Intel: Skylake: Don't reset pass-through pipe in BE prepare ASoC: Intel: Skylake: set the resume point to LPIB ASoC: hdac_hdmi: Enable pin and converter in prepare sound/hda/ext/hdac_ext_stream.c | 15 +- sound/soc/codecs/hdac_hdmi.c | 28 ++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 34 ++++ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 34 ++++ sound/soc/intel/skylake/skl-pcm.c | 210 +++++++++++++----------- sound/soc/intel/skylake/skl-topology.c | 27 ++- sound/soc/intel/skylake/skl-topology.h | 6 + 7 files changed, 240 insertions(+), 114 deletions(-) -- 2.5.0

4 17