March 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH RFC 0/2] Fix simple-card *-master DT parameter handling
by Jyri Sarha 10 Mar '14

10 Mar '14

The schematics of bitclock-master and frame-master DT parameters should depend on whether they are found from a cpu-dai or codec sub-node. - bitclock-master in cpu-dai node means Codec-Bitclock-Slave - frame-master in cpu-dai node means Codec-Frame-Slave - bitclock-master in codec node means Codec-Bitclock-Master - frame-master in codec node means Codec-Frame-Master For example in a cpu-dai mode bitclock-master parameter should produce SND_SOC_DAIFMT_CBS_* daifmt flags and a codec node SND_SOC_DAIFMT_CBM_* flags. Best regards, Jyri Jyri Sarha (2): ASoC: core: Add is_cpu_dai_node-parameter to snd_soc_of_parse_daifmt() ASoC: simple-card: Take snd_soc_of_parse_daifmt() change in to account sound/soc/generic/simple-card.c | 13 ++++++++----- sound/soc/soc-core.c | 8 +++++++- 2 files changed, 15 insertions(+), 6 deletions(-) -- 1.7.9.5

1 2

[alsa-devel] [PATCH] ASoC: si476x: Fix IO setup
by Lars-Peter Clausen 10 Mar '14

10 Mar '14

The si476x is a MFD device and the CODEC driver is using the regmap struct of the parent device, hence automatic IO setup will not work and we need to manually call snd_soc_codec_set_cache_io(). The issue was introduced commit d6173df35f ("ASoC: si476x: Remove custom register I/O implementation") Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/codecs/si476x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index 52e7cb0..fa2b8e0 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -210,7 +210,7 @@ out: static int si476x_codec_probe(struct snd_soc_codec *codec) { codec->control_data = dev_get_regmap(codec->dev->parent, NULL); - return 0; + return snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); } static struct snd_soc_dai_ops si476x_dai_ops = { -- 1.8.0

2 1

[alsa-devel] [PATCH] ASoC: sam9g20_wm8731: Convert to table based DAPM setup
by Lars-Peter Clausen 10 Mar '14

10 Mar '14

Use table based setup to register the DAPM widgets and routes. This on one hand makes the code a bit shorter and cleaner and on the other hand the board level DAPM elements get registered in the card's DAPM context rather than in the CODEC's DAPM context. While we are at it also remove the snd_soc_dapm_enable_pin() in the init callback. Pins are enabled by default. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/atmel/sam9g20_wm8731.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index f15bff1..174bd54 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -155,25 +155,14 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* Add specific widgets */ - snd_soc_dapm_new_controls(dapm, at91sam9g20ek_dapm_widgets, - ARRAY_SIZE(at91sam9g20ek_dapm_widgets)); - /* Set up specific audio path interconnects */ - snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); - /* not connected */ snd_soc_dapm_nc_pin(dapm, "RLINEIN"); snd_soc_dapm_nc_pin(dapm, "LLINEIN"); -#ifdef ENABLE_MIC_INPUT - snd_soc_dapm_enable_pin(dapm, "Int Mic"); -#else - snd_soc_dapm_nc_pin(dapm, "Int Mic"); +#ifndef ENABLE_MIC_INPUT + snd_soc_dapm_nc_pin(&rtd->card->dapm, "Int Mic"); #endif - /* always connected */ - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); - return 0; } @@ -194,6 +183,11 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = { .dai_link = &at91sam9g20ek_dai, .num_links = 1, .set_bias_level = at91sam9g20ek_set_bias_level, + + .dapm_widgets = at91sam9g20ek_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(at91sam9g20ek_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), }; static int at91sam9g20ek_audio_probe(struct platform_device *pdev) -- 1.8.0

3 2

[alsa-devel] [PATCH] ASoC: simple-card: Fix property name for simple-audio-card, format
by Peter Ujfalusi 10 Mar '14

10 Mar '14

The "format" part of the property name is missing from the code. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/generic/simple-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 7cabcc5c8703..064b404ed252 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -165,7 +165,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name"); /* get CPU/CODEC common format via simple-audio-card,format */ - priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") & + priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,format") & (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); /* off-codec widgets */ -- 1.9.0

3 4

[alsa-devel] [PATCH v4] AM43xx-ePOS-EVM audio support with TLV320AIC31XX driver
by Jyri Sarha 10 Mar '14

10 Mar '14

Since the v3 version of the patches: - Dropped "ASoC: tlv320aic32x4: Sort Makefile in alphabetic order" out - Changed DAMP widget "Mic Bias" to "MICBIAS" Best regards, Jyri Jyri Sarha (1): ASoC: tlv320aic31xx: Add basic codec driver implementation .../devicetree/bindings/sound/tlv320aic31xx.txt | 61 + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tlv320aic31xx.c | 1343 ++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 258 ++++ 6 files changed, 1677 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic31xx.txt create mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h create mode 100644 sound/soc/codecs/tlv320aic31xx.c create mode 100644 sound/soc/codecs/tlv320aic31xx.h -- 1.7.9.5

4 14

[alsa-devel] 5.1 sound system works as 2.0 on all kernels newer than 3.2.21
by giperon＠land.ru 10 Mar '14

10 Mar '14

Hi, my 5.1 sound system works as 2.0 on all kernels newer than 3.2.21. Control "Channel Mode" is missing in "Alsamixer". I use the option "3stack-6ch" (module snd-hda-intel, Realtetsk codec ALC882) for kernel 3.2.21. "Alsa-info" for kernels 3.2.21 and 3.13.6 attached.

2 1

[alsa-devel] About ALSA SoC cpu/codec asymmetry
by Kuninori Morimoto 10 Mar '14

10 Mar '14

Hi Mark, Stephen, Lars Now, ALSA SoC is using "component" style, and its image is like this. ALSA SoC - platform - component (as CPU) - codec - component It is still not symmetry, and confusable. I guess this is understandable. ALSA SoC - platform - cpu - component - codec - component If we add "cpu", it needs "cpu name", same as current "codec name" on soc_bind_dai_link(). I guess it can keep compatible if it allows "NULL" name on "cpu name" at this point. (but print warning ?) What do you think ? Best regards --- Kuninori Morimoto

2 5

[alsa-devel] [PATCH] ASoC: simple-card: card name can be option
by Kuninori Morimoto 10 Mar '14

10 Mar '14

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_card.name is now option on DT case. non-DT case can follow same style, and it is understandable from platform point of view. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/simple-card.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 7cabcc5..5dd4769 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) } if (!cinfo->name || - !cinfo->card || !cinfo->codec_dai.name || !cinfo->codec || !cinfo->platform || @@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) return -EINVAL; } - priv->snd_card.name = cinfo->card; + priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; dai_link->platform_name = cinfo->platform; -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/3] ASoC: Consolidate snd_soc_register_dai() and snd_soc_register_dais()
by Lars-Peter Clausen 09 Mar '14

09 Mar '14

snd_soc_register_dais() has basically the same code as snd_soc_register_dai(), but running in a loop. The only difference is that snd_soc_register_dai() calls fmt_single_name() to generate the DAIs name and snd_soc_register_dais() calls fmt_multiple_name(). This patch pushes the check in __snd_soc_register_component() which decides whether to call snd_soc_register_dai() or snd_soc_register_dais() to snd_soc_register_dais() to decide which naming scheme to use. This allows us to remove snd_soc_register_dai(). The patch also updates snd_soc_register_dais() to unregister every DAI it finds for the component rather than trying to unregister one DAI for each DAI that was registered. Both have the same result since there won't be more DAIs than what have been registered, but the former is easier to implement. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- Should go on top of topic/pcm --- sound/soc/soc-core.c | 153 ++++++++++++++------------------------------------- 1 file changed, 41 insertions(+), 112 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8ddb15c..2fe0338 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3897,100 +3897,46 @@ static inline char *fmt_multiple_name(struct device *dev, } /** - * snd_soc_register_dai - Register a DAI with the ASoC core + * snd_soc_unregister_dai - Unregister DAIs from the ASoC core * - * @component: The component the DAIs are registered for - * @dai_drv: DAI driver to use for the DAIs + * @component: The component for which the DAIs should be unregistered */ -static int snd_soc_register_dai(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv) +static void snd_soc_unregister_dais(struct snd_soc_component *component) { - struct device *dev = component->dev; - struct snd_soc_codec *codec; - struct snd_soc_dai *dai; - - dev_dbg(dev, "ASoC: dai register %s\n", dev_name(dev)); - - dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL); - if (dai == NULL) - return -ENOMEM; - - /* create DAI component name */ - dai->name = fmt_single_name(dev, &dai->id); - if (dai->name == NULL) { - kfree(dai); - return -ENOMEM; - } - - dai->component = component; - dai->dev = dev; - dai->driver = dai_drv; - dai->dapm.dev = dev; - if (!dai->driver->ops) - dai->driver->ops = &null_dai_ops; + struct snd_soc_dai *dai, *_dai; mutex_lock(&client_mutex); + list_for_each_entry_safe(dai, _dai, &dai_list, list) { + if (dai->dev != component->dev) + continue; - list_for_each_entry(codec, &codec_list, list) { - if (codec->dev == dev) { - dev_dbg(dev, "ASoC: Mapped DAI %s to CODEC %s\n", - dai->name, codec->name); - dai->codec = codec; - break; - } - } - - if (!dai->codec) - dai->dapm.idle_bias_off = 1; - - list_add(&dai->list, &dai_list); - - mutex_unlock(&client_mutex); - - dev_dbg(dev, "ASoC: Registered DAI '%s'\n", dai->name); - - return 0; -} - -/** - * snd_soc_unregister_dai - Unregister a DAI from the ASoC core - * - * @dai: DAI to unregister - */ -static void snd_soc_unregister_dai(struct device *dev) -{ - struct snd_soc_dai *dai; + list_del(&dai->list); - list_for_each_entry(dai, &dai_list, list) { - if (dev == dai->dev) - goto found; + dev_dbg(dev, "ASoC: Unregistered DAI '%s'\n", dai->name); + kfree(dai->name); + kfree(dai); } - return; - -found: - mutex_lock(&client_mutex); - list_del(&dai->list); mutex_unlock(&client_mutex); - - dev_dbg(dev, "ASoC: Unregistered DAI '%s'\n", dai->name); - kfree(dai->name); - kfree(dai); } /** - * snd_soc_register_dais - Register multiple DAIs with the ASoC core + * snd_soc_register_dais - Register a DAI with the ASoC core * * @component: The component the DAIs are registered for * @dai_drv: DAI driver to use for the DAIs * @count: Number of DAIs + * @legacy_dai_naming: Use the legacy naming scheme and let the DAI inherit the + * parent's name. */ static int snd_soc_register_dais(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, size_t count) + struct snd_soc_dai_driver *dai_drv, size_t count, + bool legacy_dai_naming) { struct device *dev = component->dev; struct snd_soc_codec *codec; struct snd_soc_dai *dai; - int i, ret = 0; + unsigned int i; + int ret; dev_dbg(dev, "ASoC: dai register %s #%Zu\n", dev_name(dev), count); @@ -4002,21 +3948,32 @@ static int snd_soc_register_dais(struct snd_soc_component *component, goto err; } - /* create DAI component name */ - dai->name = fmt_multiple_name(dev, &dai_drv[i]); + /* + * Back in the old days when we still had component-less DAIs, + * instead of having a static name, component-less DAIs would + * inherit the name of the parent device so it is possible to + * register multiple instances of the DAI. We still need to keep + * the same naming style even though those DAIs are not + * component-less anymore. + */ + if (count == 1 && legacy_dai_naming) { + dai->name = fmt_single_name(dev, &dai->id); + } else { + dai->name = fmt_multiple_name(dev, &dai_drv[i]); + if (dai_drv[i].id) + dai->id = dai_drv[i].id; + else + dai->id = i; + } if (dai->name == NULL) { kfree(dai); - ret = -EINVAL; + ret = -ENOMEM; goto err; } dai->component = component; dai->dev = dev; dai->driver = &dai_drv[i]; - if (dai->driver->id) - dai->id = dai->driver->id; - else - dai->id = i; dai->dapm.dev = dev; if (!dai->driver->ops) dai->driver->ops = &null_dai_ops; @@ -4025,8 +3982,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component, list_for_each_entry(codec, &codec_list, list) { if (codec->dev == dev) { - dev_dbg(dev, - "ASoC: Mapped DAI %s to CODEC %s\n", + dev_dbg(dev, "ASoC: Mapped DAI %s to CODEC %s\n", dai->name, codec->name); dai->codec = codec; break; @@ -4040,33 +3996,18 @@ static int snd_soc_register_dais(struct snd_soc_component *component, mutex_unlock(&client_mutex); - dev_dbg(dai->dev, "ASoC: Registered DAI '%s'\n", dai->name); + dev_dbg(dev, "ASoC: Registered DAI '%s'\n", dai->name); } return 0; err: - for (i--; i >= 0; i--) - snd_soc_unregister_dai(dev); + snd_soc_unregister_dais(component); return ret; } /** - * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core - * - * @dai: Array of DAIs to unregister - * @count: Number of DAIs - */ -static void snd_soc_unregister_dais(struct device *dev, size_t count) -{ - int i; - - for (i = 0; i < count; i++) - snd_soc_unregister_dai(dev); -} - -/** * snd_soc_register_component - Register a component with the ASoC core * */ @@ -4097,19 +4038,7 @@ __snd_soc_register_component(struct device *dev, cmpnt->dai_drv = dai_drv; cmpnt->num_dai = num_dai; - /* - * snd_soc_register_dai() uses fmt_single_name(), and - * snd_soc_register_dais() uses fmt_multiple_name() - * for dai->name which is used for name based matching - * - * this function is used from cpu/codec. - * allow_single_dai flag can ignore "codec" driver reworking - * since it had been used snd_soc_register_dais(), - */ - if ((1 == num_dai) && allow_single_dai) - ret = snd_soc_register_dai(cmpnt, dai_drv); - else - ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai); + ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, allow_single_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); goto error_component_name; @@ -4164,7 +4093,7 @@ void snd_soc_unregister_component(struct device *dev) return; found: - snd_soc_unregister_dais(dev, cmpnt->num_dai); + snd_soc_unregister_dais(cmpnt); mutex_lock(&client_mutex); list_del(&cmpnt->list); -- 1.8.0

1 2

[alsa-devel] [PATCH v3 0/2] AM43xx-ePOS-EVM audio support with TLV320AIC31XX driver
by Jyri Sarha 09 Mar '14

09 Mar '14

Since the v2 version of the patches [1] I have dropped davinci-evm related patches since I plan to start using simple-card for machine driver. I have also addressed Mark Brown's comments [2] as I described in my mail here [3]. Best regards, Jyri [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2014-March/073809.html [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2014-March/073814.html [3] http://mailman.alsa-project.org/pipermail/alsa-devel/2014-March/073992.html Jyri Sarha (2): ASoC: tlv320aic32x4: Sort Makefile in alphabetic order ASoC: tlv320aic31xx: Add basic codec driver implementation .../devicetree/bindings/sound/tlv320aic31xx.txt | 61 + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 6 +- sound/soc/codecs/tlv320aic31xx.c | 1343 ++++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 258 ++++ 6 files changed, 1679 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic31xx.txt create mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h create mode 100644 sound/soc/codecs/tlv320aic31xx.c create mode 100644 sound/soc/codecs/tlv320aic31xx.h -- 1.7.9.5

2 4