September 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()'
by Christophe JAILLET 19 Sep '17

19 Sep '17

All error handling paths in this function 'goto err' except this one. If one of the 2 previous memory allocations fails, we should go through the existing error handling path. Otherwise there is an unbalanced pm_runtime_enable()/pm_runtime_disable(). Fixes: dd55ff8346a9 ("ASoC: davinci-mcasp: Add set_tdm_slots() support") Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/davinci/davinci-mcasp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index f395bbc7c354..23b0da7df1f2 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1982,8 +1982,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) GFP_KERNEL); if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list || - !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list) - return -ENOMEM; + !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list) { + ret = -ENOMEM; + goto err; + } ret = davinci_mcasp_set_ch_constraints(mcasp); if (ret) -- 2.11.0

3 2

[alsa-devel] Applied "ASoC: Intel: Headset button support in kabylake machine driver" to the asoc tree
by Mark Brown 19 Sep '17

19 Sep '17

The patch ASoC: Intel: Headset button support in kabylake machine driver has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From ae09a4783b9caf9307f303ef039f8297ce0371fe Mon Sep 17 00:00:00 2001 From: Naveen M <naveen.m(a)intel.com> Date: Fri, 15 Sep 2017 13:43:21 +0530 Subject: [PATCH] ASoC: Intel: Headset button support in kabylake machine driver Patch adds headset button support for kabylake machine driver (kbl_rt5663_max98927). Signed-off-by: Naveen M <naveen.m(a)intel.com> Acked-By: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 7f7607420706..e45b6feca076 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -17,6 +17,7 @@ * GNU General Public License for more details. */ +#include <linux/input.h> #include <linux/module.h> #include <linux/platform_device.h> #include <sound/core.h> @@ -208,6 +209,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) int ret; struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_jack *jack; /* * Headset buttons map to the google Reference headset. @@ -221,6 +223,13 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) dev_err(rtd->dev, "Headset Jack creation failed %d\n", ret); return ret; } + + jack = &ctx->kabylake_headset; + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + rt5663_set_jack_detect(codec, &ctx->kabylake_headset); return ret; } -- 2.14.1

1 0

[alsa-devel] [PATCH] ASoC: Intel: atom: make sst_platform_compr_ops const
by Bhumika Goyal 19 Sep '17

19 Sep '17

Make this const as it not modified in the file referencing it. It only stored in the const field 'compr_ops' of a snd_soc_platform_driver structure. Also, add const to the declaration in the header file. Signed-off-by: Bhumika Goyal <bhumirks(a)gmail.com> --- sound/soc/intel/atom/sst-mfld-platform-compress.c | 2 +- sound/soc/intel/atom/sst-mfld-platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-compress.c b/sound/soc/intel/atom/sst-mfld-platform-compress.c index 1bead81..1dbcab5 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-compress.c +++ b/sound/soc/intel/atom/sst-mfld-platform-compress.c @@ -259,7 +259,7 @@ static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream, return stream->compr_ops->set_metadata(sst->dev, stream->id, metadata); } -struct snd_compr_ops sst_platform_compr_ops = { +const struct snd_compr_ops sst_platform_compr_ops = { .open = sst_platform_compr_open, .free = sst_platform_compr_free, diff --git a/sound/soc/intel/atom/sst-mfld-platform.h b/sound/soc/intel/atom/sst-mfld-platform.h index cb32cc7..31a58c2 100644 --- a/sound/soc/intel/atom/sst-mfld-platform.h +++ b/sound/soc/intel/atom/sst-mfld-platform.h @@ -25,7 +25,7 @@ #include "sst-atom-controls.h" extern struct sst_device *sst; -extern struct snd_compr_ops sst_platform_compr_ops; +extern const struct snd_compr_ops sst_platform_compr_ops; #define SST_MONO 1 #define SST_STEREO 2 -- 1.9.1

2 1

[alsa-devel] [PATCH v3 0/5] This series of patches fix the boot time dapm route warnings(without rt5514):
by Jeffy Chen 19 Sep '17

19 Sep '17

[ 2.475501] rk3399-gru-sound sound: ASoC: no sink widget found for DMIC1L [ 2.475503] rk3399-gru-sound sound: ASoC: Failed to add route Int Mic -> direct -> DMIC1L [ 2.475505] rk3399-gru-sound sound: ASoC: no sink widget found for DMIC1R [ 2.475507] rk3399-gru-sound sound: ASoC: Failed to add route Int Mic -> direct -> DMIC1R And support detect rt5514-dsp codec and rt5514 codec by checking bus_type. Changes in v3: Rebase onto for-next 20170919 Changes in v2: Separate HDMI/DMIC patches. Fix DMic typo. Jeffy Chen (5): ASoC: rockchip: Add dapm route for HDMI ASoC: rockchip: Add dapm route for DMic ASoC: rockchip: Init dapm routes dynamically ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec ASoC: rt5514: Add devicetree binding support for rt5514-spi Documentation/devicetree/bindings/sound/rt5514.txt | 13 +- sound/soc/rockchip/rk3399_gru_sound.c | 149 +++++++++++++++++---- 2 files changed, 132 insertions(+), 30 deletions(-) -- 2.11.0

2 6

[alsa-devel] [PATCH 0/5] BYT/CHT-Realtek remaining fixes
by Pierre-Louis Bossart 19 Sep '17

19 Sep '17

This last batch for the week is about simplification of the MCLK-related code for byt/cht-realtek machine drivers and fixes for rt5651. This is mostly a v2 of patches I submitted earlier, with improvements suggested by Andy Shevchenko, a fixed mistake on quirk management flagged by Vinod Koul and better commit messages. No new functionality otherwise. Pierre-Louis Bossart (5): ASoC: Intel: boards: use devm_clk_get() unconditionally ASoC: Intel: bytcr-rt5651: fix capture routes ASoC: Intel: bytcr_rt5651: add MCLK support and fix quirks ASoC: Intel: bytcr_rt5651: filter codec name ASoC: Intel: bytcr_rt5640: simplify MCLK quirk tests sound/soc/intel/boards/bytcr_rt5640.c | 8 +- sound/soc/intel/boards/bytcr_rt5651.c | 277 ++++++++++++++++++++++++++++---- sound/soc/intel/boards/cht_bsw_rt5645.c | 14 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 27 +--- 4 files changed, 265 insertions(+), 61 deletions(-) -- 2.9.3

4 11

[alsa-devel] [PATCH] ASoC: fsl-asoc-card: Don't error out if ENOTSUPP
by Nicolin Chen 19 Sep '17

19 Sep '17

The snd_soc_component_set_sysclk() and snd_soc_dai_set_tdm_slot() in the soc-core.c will return -ENOTSUPP if there is no function implementation for them in the dai and component drivers. So this patch tries to ignore this errno. Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- sound/soc/fsl/fsl-asoc-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 2db4d0c..3772abb 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -166,7 +166,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, cpu_priv->sysclk_id[tx], cpu_priv->sysclk_freq[tx], cpu_priv->sysclk_dir[tx]); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set sysclk for cpu dai\n"); return ret; } @@ -174,7 +174,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, if (cpu_priv->slot_width) { ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, cpu_priv->slot_width); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set TDM slot for cpu dai\n"); return ret; } @@ -270,7 +270,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->fll_id, pll_out, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set SYSCLK: %d\n", ret); return ret; } @@ -283,7 +283,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to switch away from FLL: %d\n", ret); return ret; } @@ -459,7 +459,7 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set sysclk in %s\n", __func__); return ret; } -- 2.7.4

2 1

[alsa-devel] [PATCH 0/7] BYT/CHT clocks/max98090 updates
by Pierre-Louis Bossart 19 Sep '17

19 Sep '17

This patchset corrects issues with an earlier submission (missing signoffs, error case not consistent) and enables the cht_bsw_max98090 machine driver on Baytrail. This should help distributions solve problems with Baytrail Chromebooks which required a specific build. These patches were tested on Lenovo 100s ('orco'/Baytrail) and Acer R11 ('cyan'/Cherrytrail), using the same build based on CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m. Playback on speakers/headphone and capture from internal mic work fine. UCM files are available at https://github.com/plbossart/UCM/tree/master/byt-max98090 Thanks to Jarkko Nikula and Andy Shevchenko for their comments on an initial version reviewed internally at Intel. Fang, Yang A (1): ASoC: ts3a227e: add acpi table Pierre-Louis Bossart (5): ASoC: max98090: reduce verbosity on PLL unlock ASoC: Intel: cht_bsw_max98090: Fix I2S config + unused code ASoC: Intel: cht_bsw_max98090: add support for Baytrail ASoC: Intel: atom: use cht_bsw_max98090 for Baytrail Chromebooks ASoC: Intel: cht_bsw_max98090: add gpio-based jack detection Thierry Escande (1): ASoc: Intel: cht_bsw_max98090_ti: Fix jack initialization sound/soc/codecs/max98090.c | 2 +- sound/soc/codecs/ts3a227e.c | 10 ++ sound/soc/intel/atom/sst/sst_acpi.c | 8 ++ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 185 ++++++++++++++++++++++++--- 4 files changed, 186 insertions(+), 19 deletions(-) -- 2.9.3

4 19

[alsa-devel] [PATCH 0/2] Add ACPI table for the ts3a227e driver
by Thierry Escande 19 Sep '17

19 Sep '17

Hi, This series adds ACPI match table for the ts3a227e driver. The ts3a227e is an Autonomous Audio Accessory Detection and Configuration Switch used to detect audio accessory features like jack plugging and unplugging, mic presence, and button pressed events. This series also fixes a null pointer dereference occurring in the TI max9890 driver when the ts3a227e hardware is present and its driver probed. The jack detection was enabled in the ts3a227e driver before the jack structure was allocated, causing the null pointer access. Regards, Thierry Fang, Yang A (1): ASoC: ts3a227e: add acpi table Thierry Escande (1): ASoc: cht_bsw_max98090_ti: Fix jack initialization sound/soc/codecs/ts3a227e.c | 10 ++++++ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 52 +++++++++++++++++----------- 2 files changed, 41 insertions(+), 21 deletions(-) -- 2.7.4

3 6

[alsa-devel] [PATCH v12 1/2] ASoC: rt5514: Add devicetree binding support for rt5514-spi
by Jeffy Chen 19 Sep '17

19 Sep '17

Add devicetree binding support for rt5514 spi dsp codec. Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- Changes in v12: None Changes in v11: Use same compatible for rt5514-i2c & rt5514-spi. Changes in v10: Put rt5514-i2c doc & rt5514-spi doc together. Changes in v9: Address comments from Brian. Documentation/devicetree/bindings/sound/rt5514.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt index 929ca6756b02..4f33b0d96afe 100644 --- a/Documentation/devicetree/bindings/sound/rt5514.txt +++ b/Documentation/devicetree/bindings/sound/rt5514.txt @@ -1,22 +1,27 @@ RT5514 audio CODEC -This device supports I2C only. +This device supports both I2C and SPI. Required properties: - compatible : "realtek,rt5514". -- reg : The I2C address of the device. +- reg : the I2C address of the device for I2C, the chip select + number for SPI. Optional properties: - clocks: The phandle of the master clock to the CODEC - clock-names: Should be "mclk" +- interrupt-parent: The phandle for the interrupt controller. +- interrupts: The interrupt number to the cpu. The interrupt specifier format + depends on the interrupt controller. + - realtek,dmic-init-delay-ms - Set the DMIC initial delay (ms) to wait it ready. + Set the DMIC initial delay (ms) to wait it ready for I2C. -Pins on the device (for linking into audio routes) for RT5514: +Pins on the device (for linking into audio routes) for I2C: * DMIC1L * DMIC1R -- 2.11.0

3 3

[alsa-devel] [RESEND PATCH v2 1/3] ASoC: rockchip: Add dapm route for HDMI
by Jeffy Chen 19 Sep '17

19 Sep '17

Add dapm route for DP codec. Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- Changes in v2: Separate HDMI/DMIC patches. sound/soc/rockchip/rk3399_gru_sound.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 0513fe480353..b050510be65f 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -47,6 +47,7 @@ static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { SND_SOC_DAPM_SPK("Speakers", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_LINE("HDMI", NULL), }; static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { @@ -59,6 +60,7 @@ static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { {"Headphones", NULL, "HPL"}, {"Headphones", NULL, "HPR"}, {"Speakers", NULL, "Speaker"}, + {"HDMI", NULL, "TX"}, }; static const struct snd_kcontrol_new rockchip_controls[] = { @@ -66,6 +68,7 @@ static const struct snd_kcontrol_new rockchip_controls[] = { SOC_DAPM_PIN_SWITCH("Speakers"), SOC_DAPM_PIN_SWITCH("Headset Mic"), SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("HDMI"), }; static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream, -- 2.11.0

3 6