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

[alsa-devel] [PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig
by Stephen Warren 14 Jan '11

14 Jan '11

That config variable doesn't exist in the mainline kernel, and hence the dependency shouldn't either. In linux-tegra-2.6.36, the dependency did exist to avoid a conflict with the old non-ALSA Tegra I2S driver. However, this isn't and won't be upstreamed. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/Kconfig | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 5514f1c..66b504f 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -8,7 +8,6 @@ config SND_TEGRA_SOC config SND_TEGRA_SOC_I2S tristate depends on SND_TEGRA_SOC - depends on !TEGRA_I2S_AUDIO default m help Say Y or M if you want to add support for codecs attached to the -- 1.7.0.4

3 2

[alsa-devel] [PATCH] ASoC: tegra: Add DAPM widgets/routes for Harmony
by Stephen Warren 14 Jan '11

14 Jan '11

With this change, I can capture from a microphone plugged into the mic jack on Harmony (after unmuting Left Input PGA, and maybe turning up the gain there too). Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Question: Harmony has a mono mic attached to the left input channel. However, the I2S controller only supports stereo. Is it possible to duplicate the mic input to both channels in ALSA? I know the WM8903 can do it via the WM8903_AUDIO_INTERFACE_0 register, but I'm not sure how to request that in ALSA-speak. It looks like this same setup applies to many other platforms, but I couldn't see how the issue was solved, if at all. sound/soc/tegra/harmony.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c index bf0dbaf..b160b71 100644 --- a/sound/soc/tegra/harmony.c +++ b/sound/soc/tegra/harmony.c @@ -107,6 +107,36 @@ static struct snd_soc_ops harmony_asoc_ops = { .hw_params = harmony_asoc_hw_params, }; +static const struct snd_soc_dapm_widget harmony_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), +}; + +static const struct snd_soc_dapm_route harmony_audio_map[] = { + {"Headphone Jack", NULL, "HPOUTR"}, + {"Headphone Jack", NULL, "HPOUTL"}, + {"Mic Bias", NULL, "Mic Jack"}, + {"IN1L", NULL, "Mic Bias"}, +}; + +static int harmony_asoc_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_dapm_context *dapm = &codec->dapm; + + snd_soc_dapm_new_controls(dapm, harmony_dapm_widgets, + ARRAY_SIZE(harmony_dapm_widgets)); + + snd_soc_dapm_add_routes(dapm, harmony_audio_map, + ARRAY_SIZE(harmony_audio_map)); + + snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); + snd_soc_dapm_enable_pin(dapm, "Mic Jack"); + snd_soc_dapm_sync(dapm); + + return 0; +} + static struct snd_soc_dai_link harmony_wm8903_dai = { .name = "WM8903", .stream_name = "WM8903 PCM", @@ -114,6 +144,7 @@ static struct snd_soc_dai_link harmony_wm8903_dai = { .platform_name = "tegra-pcm-audio", .cpu_dai_name = "tegra-i2s.0", .codec_dai_name = "wm8903-hifi", + .init = harmony_asoc_init, .ops = &harmony_asoc_ops, }; -- 1.7.0.4

3 3

[alsa-devel] question on snd_soc_jack_report
by Harsha, Priya 14 Jan '11

14 Jan '11

Hi, I am using snd_soc_jack_report and I send the parameter as follows to report headphones. struct snd_soc_jack *soc_jack; snd_soc_jack_report (soc_jack, SND_JACK_HEADPHONE, SND_JACK_HEADPHONE); I don't find the reporting to be happening. When I looked at the snd_jack_report code, I found that jack->type needs to be set and that was not being set. So when I added the following line in my code, it started reporting. soc_jack->jack->type = SND_JACK_HEADPHONE; Is it expected that the driver sets the 'type' of the instance of 'snd_jack' inside snd_soc_jack structure. I was actually thinking that snd_soc_jack_report would need to do this. I did not find any other drivers doing that. Is there something that I am missing? Also, to report button press events, I had to add the following line of code soc_jack->jack->key[0] = BTN_0; Is this also an expected thing to be set. -Harsha

2 1

[alsa-devel] [PATCH] ALSA: hda: Disable odd numbered channels on HDMI controllers.
by Nitin Daga 14 Jan '11

14 Jan '11

Added code in hda_intel.c to disable odd numbered channels not supported by HDMI controllers. Signed-off-by: Nitin Daga <ndaga(a)nvidia.com> Acked-By: Stephen Warren <swarren(a)nvidia.com> --- pci/hda/hda_intel.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/pci/hda/hda_intel.c b/pci/hda/hda_intel.c index a78ea34..293c685 100644 --- a/pci/hda/hda_intel.c +++ b/pci/hda/hda_intel.c @@ -1539,6 +1539,16 @@ struct azx_pcm { struct hda_pcm_stream *hinfo[2]; }; +static unsigned int channels_2_4_6_8[] = { + 2, 4, 6, 8 +}; + +static struct snd_pcm_hw_constraint_list hw_constraints_2_4_6_8_channels = { + .count = ARRAY_SIZE(channels_2_4_6_8), + .list = channels_2_4_6_8, + .mask = 0, +}; + static int azx_pcm_open(struct snd_pcm_substream *substream) { struct azx_pcm *apcm = snd_pcm_substream_chip(substream); @@ -1566,6 +1576,9 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) 128); snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 128); + snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &hw_constraints_2_4_6_8_channels); snd_hda_power_up(apcm->codec); err = hinfo->ops.open(hinfo, apcm->codec, substream); if (err < 0) { -- 1.7.0.4 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

3 4

[alsa-devel] Changes on Realtek fix-up handling
by Takashi Iwai 14 Jan '11

14 Jan '11

Hi, there were slight changes in the handling of fix-up's in HD-audio patch_realtek.c. Now, the fixup struct is like: struct alc_fixup { int type; bool chained; int chain_id; union { unsigned int sku; const struct alc_pincfg *pins; const struct hda_verb *verbs; void (*func)(struct hda_codec *codec, const struct alc_fixup *fix, int action); } v; }; and each fixup entry has only one type, either sku, pins, verbs or func specified by the type field. If chained is set, the entry corresponding to chain_id is evaluated at next, so fixup entries can be reused if an additional change is required to the existing one. The callback function can take "action" instead of "pre_init" flag. This can be either ALC_FIXUP_ACT_PRE_PROBE, ALC_FIXUP_ACT_PROBE or AL_FIXUP_ACT_INIT. The first two are the cases pre_init=1 and pre_init=0, i.e. the fix-up is handled during probing only once. The last one means that the fix-up is called in the init callback, i.e. at initialization during the first loading and PM resume. My plan is to move from the quirk entries to fixup entries with auto-parse mode in more cases, and the above changes are of help for that. thanks, Takashi

1 0

[alsa-devel] [PATCH 1/4] ASoC: soc core move card cleanup from soc_remove()
by Koul, Vinod 14 Jan '11

14 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> In soc_remove() the card resources are cleaned up. This can also be done in card_unregister() This patch move this cleanup into a new function and calls it from card_unregister. This paves way for further work to allow card registartion from machine. Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <priya.harsha(a)intel.com> --- sound/soc/soc-core.c | 51 ++++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 30d76e8..318c3a7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1890,37 +1890,42 @@ static int soc_probe(struct platform_device *pdev) return 0; } -/* removes a socdev */ -static int soc_remove(struct platform_device *pdev) +static int soc_cleanup_card_resources(struct snd_soc_card *card) { - struct snd_soc_card *card = platform_get_drvdata(pdev); + struct platform_device *pdev = to_platform_device(card->dev); int i; - if (card->instantiated) { + /* make sure any delayed work runs */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + flush_delayed_work_sync(&rtd->delayed_work); + } - /* make sure any delayed work runs */ - for (i = 0; i < card->num_rtd; i++) { - struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; - flush_delayed_work_sync(&rtd->delayed_work); - } + /* remove auxiliary devices */ + for (i = 0; i < card->num_aux_devs; i++) + soc_remove_aux_dev(card, i); - /* remove auxiliary devices */ - for (i = 0; i < card->num_aux_devs; i++) - soc_remove_aux_dev(card, i); + /* remove and free each DAI */ + for (i = 0; i < card->num_rtd; i++) + soc_remove_dai_link(card, i); - /* remove and free each DAI */ - for (i = 0; i < card->num_rtd; i++) - soc_remove_dai_link(card, i); + soc_cleanup_card_debugfs(card); - soc_cleanup_card_debugfs(card); + /* remove the card */ + if (card->remove) + card->remove(pdev); - /* remove the card */ - if (card->remove) - card->remove(pdev); + kfree(card->rtd); + snd_card_free(card->snd_card); + return 0; + +} + +/* removes a socdev */ +static int soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); - kfree(card->rtd); - snd_card_free(card->snd_card); - } snd_soc_unregister_card(card); return 0; } @@ -3153,6 +3158,8 @@ static int snd_soc_register_card(struct snd_soc_card *card) */ static int snd_soc_unregister_card(struct snd_soc_card *card) { + if (card->instantiated) + soc_cleanup_card_resources(card); mutex_lock(&client_mutex); list_del(&card->list); mutex_unlock(&client_mutex); -- 1.7.2.3

3 2

[alsa-devel] [PATCH 3/4] ASoC: soc core add inline to handle card list initialzation
by Koul, Vinod 13 Jan '11

13 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> Currently the soc_probe initializes the card hence it does the card list initialzation. But if machines directly register the card they would need to do these steps, so putting them as inline would save lot of code This patch adds an inline to do list initialzation Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <harsha.priya(a)intel.com> --- include/sound/soc.h | 10 ++++++++++ sound/soc/soc-core.c | 7 +------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index accb8a1..541ddfa 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -779,6 +779,16 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd) return dev_get_drvdata(&rtd->dev); } +static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) +{ + INIT_LIST_HEAD(&card->dai_dev_list); + INIT_LIST_HEAD(&card->codec_dev_list); + INIT_LIST_HEAD(&card->platform_dev_list); + INIT_LIST_HEAD(&card->widgets); + INIT_LIST_HEAD(&card->paths); + INIT_LIST_HEAD(&card->dapm_list); +} + #include <sound/soc-dai.h> #ifdef CONFIG_DEBUG_FS diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9c5e7cf..8305712 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1872,12 +1872,7 @@ static int soc_probe(struct platform_device *pdev) /* Bodge while we unpick instantiation */ card->dev = &pdev->dev; - INIT_LIST_HEAD(&card->dai_dev_list); - INIT_LIST_HEAD(&card->codec_dev_list); - INIT_LIST_HEAD(&card->platform_dev_list); - INIT_LIST_HEAD(&card->widgets); - INIT_LIST_HEAD(&card->paths); - INIT_LIST_HEAD(&card->dapm_list); + snd_soc_initialize_card_lists(card); ret = snd_soc_register_card(card); if (ret != 0) { -- 1.7.2.3

1 0

[alsa-devel] [PATCH 2/4] ASoC: soc core move the card debugfs initialization
by Koul, Vinod 13 Jan '11

13 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> The card debugfs initialization is done in soc_probe but would be better if it is done when the card in registered This patch moves the debugfs initialization to register_card() Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <harsha.priya(a)intel.com> --- sound/soc/soc-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 318c3a7..9c5e7cf 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1879,8 +1879,6 @@ static int soc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->dapm_list); - soc_init_card_debugfs(card); - ret = snd_soc_register_card(card); if (ret != 0) { dev_err(&pdev->dev, "Failed to register card\n"); @@ -3123,6 +3121,8 @@ static int snd_soc_register_card(struct snd_soc_card *card) if (!card->name || !card->dev) return -EINVAL; + soc_init_card_debugfs(card); + card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * (card->num_links + card->num_aux_devs), GFP_KERNEL); -- 1.7.2.3

1 0

[alsa-devel] [PATCH] ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update
by Mike Frysinger 13 Jan '11

13 Jan '11

One spot was missed in this driver when converting from snd_soc_dai.private_data to snd_soc_dai_get_drvdata. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- sound/soc/blackfin/bf5xx-tdm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index 1251239..b2cf239 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c @@ -210,7 +210,7 @@ static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai, #ifdef CONFIG_PM static int bf5xx_tdm_suspend(struct snd_soc_dai *dai) { - struct sport_device *sport = dai->private_data; + struct sport_device *sport = snd_soc_dai_get_drvdata(dai); if (!dai->active) return 0; -- 1.7.4.rc1

4 7

[alsa-devel] [PATCH] ASoC: Make register_card API available to drivers
by Koul, Vinod 13 Jan '11

13 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> The register_card is an internal API which soc_probe uses to register the card. In order to create multiple cards we need to create multiple instances of soc-audio device. If we exposes the register card API for drivers to use, then machine driver can register their cards directly This patch makes register_card and unregister_card API available to machine drivers. This also maintains compatibility with older method of registration which can be marked depreciated and removed eventually. Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <priya.harsha(a)intel.com> --- include/sound/soc.h | 2 + sound/soc/soc-core.c | 90 +++++++++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index d609232..b515eb6 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -258,6 +258,8 @@ enum snd_soc_compress_type { SND_SOC_RBTREE_COMPRESSION }; +int snd_soc_register_card(struct snd_soc_card *card); +int snd_soc_unregister_card(struct snd_soc_card *card); int snd_soc_register_platform(struct device *dev, struct snd_soc_platform_driver *platform_drv); void snd_soc_unregister_platform(struct device *dev); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cbac50b..0bd07f6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -58,8 +58,6 @@ static LIST_HEAD(dai_list); static LIST_HEAD(platform_list); static LIST_HEAD(codec_list); -static int snd_soc_register_card(struct snd_soc_card *card); -static int snd_soc_unregister_card(struct snd_soc_card *card); static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); /* @@ -1870,16 +1868,12 @@ static int soc_probe(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); int ret = 0; + /* no card, so machine driver will register explictly */ + if (!card) + return 0; + /* Bodge while we unpick instantiation */ card->dev = &pdev->dev; - INIT_LIST_HEAD(&card->dai_dev_list); - INIT_LIST_HEAD(&card->codec_dev_list); - INIT_LIST_HEAD(&card->platform_dev_list); - INIT_LIST_HEAD(&card->widgets); - INIT_LIST_HEAD(&card->paths); - INIT_LIST_HEAD(&card->dapm_list); - - soc_init_card_debugfs(card); ret = snd_soc_register_card(card); if (ret != 0) { @@ -1890,37 +1884,46 @@ static int soc_probe(struct platform_device *pdev) return 0; } -/* removes a socdev */ -static int soc_remove(struct platform_device *pdev) +static int soc_cleanup_card_resources(struct snd_soc_card *card) { - struct snd_soc_card *card = platform_get_drvdata(pdev); + struct platform_device *pdev = to_platform_device(card->dev); int i; - if (card->instantiated) { + /* make sure any delayed work runs */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + flush_delayed_work_sync(&rtd->delayed_work); + } - /* make sure any delayed work runs */ - for (i = 0; i < card->num_rtd; i++) { - struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; - flush_delayed_work_sync(&rtd->delayed_work); - } + /* remove auxiliary devices */ + for (i = 0; i < card->num_aux_devs; i++) + soc_remove_aux_dev(card, i); - /* remove auxiliary devices */ - for (i = 0; i < card->num_aux_devs; i++) - soc_remove_aux_dev(card, i); + /* remove and free each DAI */ + for (i = 0; i < card->num_rtd; i++) + soc_remove_dai_link(card, i); - /* remove and free each DAI */ - for (i = 0; i < card->num_rtd; i++) - soc_remove_dai_link(card, i); + soc_cleanup_card_debugfs(card); - soc_cleanup_card_debugfs(card); + /* remove the card */ + if (card->remove) + card->remove(pdev); + + kfree(card->rtd); + snd_card_free(card->snd_card); + return 0; - /* remove the card */ - if (card->remove) - card->remove(pdev); +} + +/* removes a socdev */ +int soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + + if (!card) + return 0; - kfree(card->rtd); - snd_card_free(card->snd_card); - } snd_soc_unregister_card(card); return 0; } @@ -3107,17 +3110,23 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute); * * @card: Card to register * - * Note that currently this is an internal only function: it will be - * exposed to machine drivers after further backporting of ASoC v2 - * registration APIs. */ -static int snd_soc_register_card(struct snd_soc_card *card) +int snd_soc_register_card(struct snd_soc_card *card) { int i; if (!card->name || !card->dev) return -EINVAL; + INIT_LIST_HEAD(&card->dai_dev_list); + INIT_LIST_HEAD(&card->codec_dev_list); + INIT_LIST_HEAD(&card->platform_dev_list); + INIT_LIST_HEAD(&card->widgets); + INIT_LIST_HEAD(&card->paths); + INIT_LIST_HEAD(&card->dapm_list); + + soc_init_card_debugfs(card); + card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * (card->num_links + card->num_aux_devs), GFP_KERNEL); @@ -3141,25 +3150,26 @@ static int snd_soc_register_card(struct snd_soc_card *card) return 0; } +EXPORT_SYMBOL_GPL(snd_soc_register_card); /** * snd_soc_unregister_card - Unregister a card with the ASoC core * * @card: Card to unregister * - * Note that currently this is an internal only function: it will be - * exposed to machine drivers after further backporting of ASoC v2 - * registration APIs. */ -static int snd_soc_unregister_card(struct snd_soc_card *card) +int snd_soc_unregister_card(struct snd_soc_card *card) { mutex_lock(&client_mutex); list_del(&card->list); mutex_unlock(&client_mutex); + if (card->instantiated) + soc_cleanup_card_resources(card); dev_dbg(card->dev, "Unregistered card '%s'\n", card->name); return 0; } +EXPORT_SYMBOL_GPL(snd_soc_unregister_card); /* * Simplify DAI link configuration by removing ".-1" from device names -- 1.7.2.3

2 8