January 2020 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] how to use DPCM to alter audio path between headphones and speaker
by Tim Harvey 14 Jan '20

14 Jan '20

Greetings, I'm working with a board that has a TI TLV320AIC3105 codec connected to an IMX6 SSI with a headphone jack and a TS3A227E headphone detect chip (HPROUT/HPLOUT), mono speaker amp output (RIGHT_LOP/RIGHT_LOM), and mic in (MIC1L). It seems that Dynamic PCM allows for the automatic routing of audio to change between headphone out and speaker out depending on jack insertion/removal event but I'm not clear how to configure that. Can this be done via simple-audio-card bindings or does it require a modified machine driver? Any pointers or references are greatly appreciated! Best Regards, Tim

1 0

[alsa-devel] [PATCH 0/4] ASoC: msm8916-wcd-analog: MIC BIAS fixes/additions
by Stephan Gerhold 14 Jan '20

14 Jan '20

This patch series fixes some bugs in the MIC BIAS implementation in msm8916-wcd-analog. Finally, it adds support for MIC BIAS Internal3, which is needed for msm8916-longcheer-l8150. Stephan Gerhold (4): ASoC: msm8916-wcd-analog: Fix selected events for MIC BIAS External1 ASoC: msm8916-wcd-analog: Fix MIC BIAS Internal1 ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 sound/soc/codecs/msm8916-wcd-analog.c | 59 ++++++++++----------------- 1 file changed, 21 insertions(+), 38 deletions(-) -- 2.24.1

3 12

[alsa-devel] [PATCH] ASoC: sgtl5000: add multi endpoint support
by Marek Vasut 14 Jan '20

14 Jan '20

Support multiple endpoints on SGTL5000 codec port when used in of_graph context. This patch allows to share the codec port between two CPU DAIs. Example: Custom STM32MP157C board uses SGTL5000 audio codec. This codec is connected to two serial audio interfaces, which are configured either as rx or tx. >From AsoC point of view the topolgy is the following: // 2 CPU DAIs (SAI2A/B), 1 Codec (SGTL5000) Playback: CPU-A-DAI(slave) -> (master)CODEC-DAI/port0 Record: CPU-B-DAI(slave) <- (master)CODEC-DAI/port0 In the DT two endpoints have to be associated to the codec port: sgtl5000_port: port { sgtl5000_tx_endpoint: endpoint@0 { remote-endpoint = <&sai2a_endpoint>; }; sgtl5000_rx_endpoint: endpoint@1 { remote-endpoint = <&sai2b_endpoint>; }; }; However, when the audio graph card parses the codec nodes, it expects to find DAI interface indexes matching the endpoints indexes. The current patch forces the use of DAI id 0 for both endpoints, which allows to share the codec DAI between the two CPU DAIs for playback and capture streams respectively. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Mark Brown <broonie(a)kernel.org> --- NOTE: This is the same as commit ad6bb3067c4d ("ASoC: cs42l51: add multi endpoint support") --- sound/soc/codecs/sgtl5000.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index aa1f9637d8950..93da6b58c97df 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1513,6 +1513,13 @@ static int sgtl5000_probe(struct snd_soc_component *component) return ret; } +static int sgtl5000_of_xlate_dai_id(struct snd_soc_component *component, + struct device_node *endpoint) +{ + /* return dai id 0, whatever the endpoint index */ + return 0; +} + static const struct snd_soc_component_driver sgtl5000_driver = { .probe = sgtl5000_probe, .set_bias_level = sgtl5000_set_bias_level, @@ -1522,6 +1529,7 @@ static const struct snd_soc_component_driver sgtl5000_driver = { .num_dapm_widgets = ARRAY_SIZE(sgtl5000_dapm_widgets), .dapm_routes = sgtl5000_dapm_routes, .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes), + .of_xlate_dai_id = sgtl5000_of_xlate_dai_id, .suspend_bias_off = 1, .idle_bias_on = 1, .use_pmdown_time = 1, -- 2.24.1

2 1

[alsa-devel] [PATCH] soundwire: bus: fix device number leak on errors
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

If the programming of the dev_number fails due to an IO error, a new device_number will be assigned, resulting in a leak. Make sure we only assign a device_number once per Slave device. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- drivers/soundwire/bus.c | 37 ++++++++++++++++++++++------------- include/linux/soundwire/sdw.h | 4 +++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index be5d437058ed..8f973e70e6f7 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -456,26 +456,35 @@ static int sdw_get_device_num(struct sdw_slave *slave) static int sdw_assign_device_num(struct sdw_slave *slave) { int ret, dev_num; + bool new_device = false; /* check first if device number is assigned, if so reuse that */ if (!slave->dev_num) { - mutex_lock(&slave->bus->bus_lock); - dev_num = sdw_get_device_num(slave); - mutex_unlock(&slave->bus->bus_lock); - if (dev_num < 0) { - dev_err(slave->bus->dev, "Get dev_num failed: %d\n", - dev_num); - return dev_num; + if (!slave->dev_num_sticky) { + mutex_lock(&slave->bus->bus_lock); + dev_num = sdw_get_device_num(slave); + mutex_unlock(&slave->bus->bus_lock); + if (dev_num < 0) { + dev_err(slave->bus->dev, "Get dev_num failed: %d\n", + dev_num); + return dev_num; + } + slave->dev_num = dev_num; + slave->dev_num_sticky = dev_num; + new_device = true; + } else { + slave->dev_num = slave->dev_num_sticky; } - } else { + } + + if (!new_device) dev_info(slave->bus->dev, - "Slave already registered dev_num:%d\n", + "Slave already registered, reusing dev_num:%d\n", slave->dev_num); - /* Clear the slave->dev_num to transfer message on device 0 */ - dev_num = slave->dev_num; - slave->dev_num = 0; - } + /* Clear the slave->dev_num to transfer message on device 0 */ + dev_num = slave->dev_num; + slave->dev_num = 0; ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num); if (ret < 0) { @@ -485,7 +494,7 @@ static int sdw_assign_device_num(struct sdw_slave *slave) } /* After xfer of msg, restore dev_num */ - slave->dev_num = dev_num; + slave->dev_num = slave->dev_num_sticky; return 0; } diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index b7c9eca4332a..b451bb622335 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -546,7 +546,8 @@ struct sdw_slave_ops { * @debugfs: Slave debugfs * @node: node for bus list * @port_ready: Port ready completion flag for each Slave port - * @dev_num: Device Number assigned by Bus + * @dev_num: Current Device Number, values can be 0 or dev_num_sticky + * @dev_num_sticky: one-time static Device Number assigned by Bus * @probed: boolean tracking driver state * @probe_complete: completion utility to control potential races * on startup between driver probe/initialization and SoundWire @@ -575,6 +576,7 @@ struct sdw_slave { struct list_head node; struct completion *port_ready; u16 dev_num; + u16 dev_num_sticky; bool probed; struct completion probe_complete; struct completion enumeration_complete; -- 2.20.1

2 2

[alsa-devel] [PATCH -next] ASoC: rt700: remove unused including <linux/version.h>
by YueHaibing 14 Jan '20

14 Jan '20

Remove including <linux/version.h> that don't need it. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/rt700.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/rt700.c b/sound/soc/codecs/rt700.c index b1830c1ebf8a..ff68f0e4f629 100644 --- a/sound/soc/codecs/rt700.c +++ b/sound/soc/codecs/rt700.c @@ -8,7 +8,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h>

2 1

[alsa-devel] [PATCH] ASoC: rt715: use dev_to_sdw_dev() instead of to_sdw_slave_device()
by Kuninori Morimoto 14 Jan '20

14 Jan '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch fixup this error CC sound/soc/codecs/rt715-sdw.o linux/sound/soc/codecs/rt715-sdw.c: In function 'rt715_dev_resume': linux/sound/soc/codecs/rt715-sdw.c:568:28: error: implicit declaration\ of function 'to_sdw_slave_device'; did you mean 'sdw_slave_modalias'?\ [-Werror=implicit-function-declaration] struct sdw_slave *slave = to_sdw_slave_device(dev); ^~~~~~~~~~~~~~~~~~~ sdw_slave_modalias linux/sound/soc/codecs/rt715-sdw.c:568:28: warning: initialization of\ 'struct sdw_slave *' from 'int' makes pointer from integer without a\ cast [-Wint-conversion] cc1: some warnings being treated as errors Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/rt715-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c index c35591f..18868e4 100644 --- a/sound/soc/codecs/rt715-sdw.c +++ b/sound/soc/codecs/rt715-sdw.c @@ -565,7 +565,7 @@ static int rt715_dev_suspend(struct device *dev) static int rt715_dev_resume(struct device *dev) { - struct sdw_slave *slave = to_sdw_slave_device(dev); + struct sdw_slave *slave = dev_to_sdw_dev(dev); struct rt715_priv *rt715 = dev_get_drvdata(dev); unsigned long time; -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: rt715: remove warnings
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

make W=1 reports defined-but-not-used and kernel-doc formatting issues. No functionality change. Fixes: d1ede0641b05e4 ("ASoC: rt715: add RT715 codec driver") Cc: Jack Yu <jack.yu(a)realtek.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/rt715.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 5c6f05b8d8ab..4c746938a062 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -203,7 +203,6 @@ static int rt715_set_amp_gain_get(struct snd_kcontrol *kcontrol, return 0; } -static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -6525, 75, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0); @@ -366,7 +365,7 @@ static const char * const adc_22_23_mux_text[] = { "DMIC4", }; -/** +/* * Due to mux design for nid 24 (MUX_IN3)/25 (MUX_IN4), connection index 0 and * 1 will be connected to the same dmic source, therefore we skip index 1 to * avoid misunderstanding on usage of dapm routing. @@ -404,6 +403,7 @@ static SOC_ENUM_SINGLE_DECL( static SOC_VALUE_ENUM_SINGLE_DECL(rt715_adc24_enum, RT715_MUX_IN3, 0, 0xf, adc_24_mux_text, rt715_adc_24_25_values); + static SOC_VALUE_ENUM_SINGLE_DECL(rt715_adc25_enum, RT715_MUX_IN4, 0, 0xf, adc_25_mux_text, rt715_adc_24_25_values); -- 2.20.1

2 1

[alsa-devel] [PATCH 00/18] ASoC: Intel: remove compilation/static analysis warnings
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

More trivial fixes for Intel machine drivers in my quixotic quest for zero warnings. None of them are critical but they generate noise that prevents developers from using those tools to detect real issues. Pierre-Louis Bossart (18): ASoC: Intel: bxt_da7219_max98357a: rename shadowed variable ASoC: Intel: bxt_rt298: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: removed unused variables ASoC: Intel: kbl_da7219_max98357a: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: test return value on route add ASoC: Intel: kbl_da7219_max98927: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization ASoC: Intel: kbl_rt5660: rename shadowed variable ASoC: Intel: kbl_rt5663_max98927: rename shadowed variable ASoC: Intel: kbl_rt5663_rt5514_max98927: rename shadowed variable ASOC: Intel: kbl_rt5663_rt5514_max98927: remove useless initialization ASoC: Intel: skl_nau88l25_max98357a: rename shadowed variable ASoC: Intel: skl_nau88l25_ssm4567: rename shadowed variable ASoC: Intel: skl_rt286: rename shadowed variable ASoC: Intel: bytcht_es8316: removed unused variable ASoC: Intel: bytcr_rt5640: remove unused variable ASoC: Intel: bytcr_rt5651: remove unused variable sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 +++++----- sound/soc/intel/boards/bxt_rt298.c | 8 ++++---- sound/soc/intel/boards/bytcht_es8316.c | 8 -------- sound/soc/intel/boards/bytcr_rt5640.c | 8 -------- sound/soc/intel/boards/bytcr_rt5651.c | 8 -------- sound/soc/intel/boards/glk_rt5682_max98357a.c | 18 ++++-------------- sound/soc/intel/boards/kbl_da7219_max98357a.c | 10 +++++----- sound/soc/intel/boards/kbl_da7219_max98927.c | 19 +++++++++++-------- sound/soc/intel/boards/kbl_rt5660.c | 4 ++-- sound/soc/intel/boards/kbl_rt5663_max98927.c | 10 +++++----- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 10 +++++----- .../soc/intel/boards/skl_nau88l25_max98357a.c | 10 +++++----- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 10 +++++----- sound/soc/intel/boards/skl_rt286.c | 10 +++++----- 14 files changed, 56 insertions(+), 87 deletions(-) -- 2.20.1

2 36

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

Fix GCC warning with W=1, previous cleanup did not remove unnecessary variable. sound/soc/sof/intel/hda-dai.c: In function ‘hda_link_pcm_prepare’: sound/soc/sof/intel/hda-dai.c:265:31: warning: variable ‘hda_stream’ set but not used [-Wunused-but-set-variable] 265 | struct sof_intel_hda_stream *hda_stream; | ^~~~~~~~~~ Fixes: a3ebccb52efdf ("ASoC: SOF: Intel: hda: reset link DMA state in prepare") Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda-dai.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 313611dcb5e4..9c6e3f990ee3 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -262,14 +262,11 @@ static int hda_link_pcm_prepare(struct snd_pcm_substream *substream, { struct hdac_ext_stream *link_dev = snd_soc_dai_get_dma_data(dai, substream); - struct sof_intel_hda_stream *hda_stream; struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component); struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); int stream = substream->stream; - hda_stream = hstream_to_sof_hda_stream(link_dev); - if (link_dev->link_prepared) return 0; -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: bytcr_rt5651: switch to using devm_fwnode_gpiod_get()
by Dmitry Torokhov 14 Jan '20

14 Jan '20

devm_fwnode_get_index_gpiod_from_child() is going away as the name is too unwieldy, let's switch to using the new devm_fwnode_gpiod_get(). Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> --- sound/soc/intel/boards/bytcr_rt5651.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index c0d322a859f71..4495834e37653 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -998,10 +998,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) if (byt_rt5651_gpios) { devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios); - priv->ext_amp_gpio = devm_fwnode_get_index_gpiod_from_child( - &pdev->dev, "ext-amp-enable", 0, - codec_dev->fwnode, - GPIOD_OUT_LOW, "speaker-amp"); + priv->ext_amp_gpio = devm_fwnode_gpiod_get(&pdev->dev, + codec_dev->fwnode, + "ext-amp-enable", + GPIOD_OUT_LOW, + "speaker-amp"); if (IS_ERR(priv->ext_amp_gpio)) { ret_val = PTR_ERR(priv->ext_amp_gpio); switch (ret_val) { @@ -1017,10 +1018,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) return ret_val; } } - priv->hp_detect = devm_fwnode_get_index_gpiod_from_child( - &pdev->dev, "hp-detect", 0, - codec_dev->fwnode, - GPIOD_IN, "hp-detect"); + priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev, + codec_dev->fwnode, + "hp-detect", + GPIOD_IN, + "hp-detect"); if (IS_ERR(priv->hp_detect)) { ret_val = PTR_ERR(priv->hp_detect); switch (ret_val) { -- 2.24.1.735.g03f4e72817-goog -- Dmitry

2 1