May 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: snd-usb: fix stream info output in /proc
by Daniel Mack 21 May '12

21 May '12

Set some substream struct members to make the proc interface code work again. Signed-off-by: Daniel Mack <zonque(a)gmail.com> Reported-by: Felix Homann <linuxaudio(a)showlabor.de> --- sound/usb/pcm.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 2d3a04d..24839d9 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -474,6 +474,11 @@ unlock: mutex_unlock(&subs->stream->chip->shutdown_mutex); } + if (ret == 0) { + subs->interface = fmt->iface; + subs->altset_idx = fmt->altset_idx; + } + return ret; } @@ -1123,13 +1128,16 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: subs->data_endpoint->prepare_data_urb = prepare_playback_urb; subs->data_endpoint->retire_data_urb = retire_playback_urb; + subs->running = 1; return 0; case SNDRV_PCM_TRIGGER_STOP: stop_endpoints(subs, 0, 0, 0); + subs->running = 0; return 0; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: subs->data_endpoint->prepare_data_urb = NULL; subs->data_endpoint->retire_data_urb = NULL; + subs->running = 0; return 0; } @@ -1148,15 +1156,19 @@ int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, int c return err; subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running = 1; return 0; case SNDRV_PCM_TRIGGER_STOP: stop_endpoints(subs, 0, 0, 0); + subs->running = 0; return 0; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: subs->data_endpoint->retire_data_urb = NULL; + subs->running = 0; return 0; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running = 1; return 0; } -- 1.7.5.4

2 1

[alsa-devel] snd-usb-audio: Substream status not set with new streaming logic
by Felix Homann 21 May '12

21 May '12

With the new streaming logic subs->running will never be set to 1. So /proc/... will never show the streams as running. Formerly the status was set in endpoint.c. Daniel? Regards, Felix

2 1

[alsa-devel] [PATCH] sound: sh: Fix up namespace collision in sh_dac_audio.
by Paul Mundt 21 May '12

21 May '12

The module_platform_driver() conversion ended up tripping over the driver name, leading to confusion in the macro with regards to 'driver' being redefined. rename it to something slightly more suitable to avoid namespace collisions. sound/sh/sh_dac_audio.c:444:122: error: conflicting types for 'driver_init' include/linux/device.h:773:6: note: previous declaration of 'driver_init' was here make[3]: *** [sound/sh/sh_dac_audio.o] Error 1 Signed-off-by: Paul Mundt <lethal(a)linux-sh.org> --- sound/sh/sh_dac_audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c index b11f82b..f8b01c7 100644 --- a/sound/sh/sh_dac_audio.c +++ b/sound/sh/sh_dac_audio.c @@ -433,7 +433,7 @@ probe_error: /* * "driver" definition */ -static struct platform_driver driver = { +static struct platform_driver sh_dac_driver = { .probe = snd_sh_dac_probe, .remove = snd_sh_dac_remove, .driver = { @@ -441,4 +441,4 @@ static struct platform_driver driver = { }, }; -module_platform_driver(driver); +module_platform_driver(sh_dac_driver);

2 1

[alsa-devel] [PATCH 1/3] of: Add prefix parameter to of_modalias_node().
by David Daney 20 May '12

20 May '12

From: David Daney <david.daney(a)cavium.com> When generating MODALIASes, it is convenient to add things like "spi:" or "i2c:" to the front of the strings. This allows the standard modprobe to find the right driver when automatically populating bus children from the device tree structure. Add a prefix parameter, and adjust callers. For of_register_spi_devices() use the "spi:" prefix. Signed-off-by: David Daney <david.daney(a)cavium.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Timur Tabi <timur(a)freescale.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: linuxppc-dev(a)lists.ozlabs.org --- drivers/of/base.c | 22 ++++++++++++++++------ drivers/of/of_i2c.c | 2 +- drivers/of/of_spi.c | 2 +- include/linux/of.h | 3 ++- sound/soc/fsl/mpc8610_hpcd.c | 2 +- sound/soc/fsl/p1022_ds.c | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 5806449..f05a520 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -575,26 +575,36 @@ EXPORT_SYMBOL(of_find_matching_node); /** * of_modalias_node - Lookup appropriate modalias for a device node * @node: pointer to a device tree node + * @prefix: prefix to be added to the compatible property, may be NULL * @modalias: Pointer to buffer that modalias value will be copied into * @len: Length of modalias value * - * Based on the value of the compatible property, this routine will attempt - * to choose an appropriate modalias value for a particular device tree node. - * It does this by stripping the manufacturer prefix (as delimited by a ',') - * from the first entry in the compatible list property. + * Based on the value of the compatible property, this routine will + * attempt to choose an appropriate modalias value for a particular + * device tree node. It does this by stripping the manufacturer + * prefix (as delimited by a ',') from the first entry in the + * compatible list property, and appending it to the prefix. * * This routine returns 0 on success, <0 on failure. */ -int of_modalias_node(struct device_node *node, char *modalias, int len) +int of_modalias_node(struct device_node *node, const char *prefix, + char *modalias, int len) { const char *compatible, *p; int cplen; + if (len < 1) + return -EINVAL; + compatible = of_get_property(node, "compatible", &cplen); if (!compatible || strlen(compatible) > cplen) return -ENODEV; p = strchr(compatible, ','); - strlcpy(modalias, p ? p + 1 : compatible, len); + if (prefix) + strlcpy(modalias, prefix, len); + else + modalias[0] = 0; + strlcat(modalias, p ? p + 1 : compatible, len); return 0; } EXPORT_SYMBOL_GPL(of_modalias_node); diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index f37fbeb..23b05ee 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c @@ -37,7 +37,7 @@ void of_i2c_register_devices(struct i2c_adapter *adap) dev_dbg(&adap->dev, "of_i2c: register %s\n", node->full_name); - if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { + if (of_modalias_node(node, NULL, info.type, sizeof(info.type)) < 0) { dev_err(&adap->dev, "of_i2c: modalias failure on %s\n", node->full_name); continue; diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c index 6dbc074..c329c6d 100644 --- a/drivers/of/of_spi.c +++ b/drivers/of/of_spi.c @@ -42,7 +42,7 @@ void of_register_spi_devices(struct spi_master *master) } /* Select device driver */ - if (of_modalias_node(nc, spi->modalias, + if (of_modalias_node(nc, SPI_MODULE_PREFIX, spi->modalias, sizeof(spi->modalias)) < 0) { dev_err(&master->dev, "cannot find modalias for %s\n", nc->full_name); diff --git a/include/linux/of.h b/include/linux/of.h index fa7fb1d..ee34d76 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -233,7 +233,8 @@ extern int of_n_addr_cells(struct device_node *np); extern int of_n_size_cells(struct device_node *np); extern const struct of_device_id *of_match_node( const struct of_device_id *matches, const struct device_node *node); -extern int of_modalias_node(struct device_node *node, char *modalias, int len); +extern int of_modalias_node(struct device_node *node, + const char *prefix, char *modalias, int len); extern struct device_node *of_parse_phandle(struct device_node *np, const char *phandle_name, int index); diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 3fea5a1..1fa0682 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -254,7 +254,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) char temp[DAI_NAME_SIZE]; struct i2c_client *i2c; - of_modalias_node(np, temp, DAI_NAME_SIZE); + of_modalias_node(np, NULL, temp, DAI_NAME_SIZE); iprop = of_get_property(np, "reg", NULL); if (!iprop) diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 982a1c9..3ea51ec 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -257,7 +257,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) char temp[DAI_NAME_SIZE]; struct i2c_client *i2c; - of_modalias_node(np, temp, DAI_NAME_SIZE); + of_modalias_node(np, NULL, temp, DAI_NAME_SIZE); iprop = of_get_property(np, "reg", NULL); if (!iprop) -- 1.7.2.3

2 2

[alsa-devel] [PATCH 0/5] ASoC: sh: fsi: adds stream transfer mode
by Kuninori Morimoto 19 May '12

19 May '12

Hi Mark, Liam These patches add stream transfer mode to FSI2 Kuninori Morimoto (5): ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC ASoC: sh: fsi: add fsi_version() and removed meaningless version check ASoC: sh: fsi: use same format for IN/OUT ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger() ASoC: sh: fsi: enable chip specific data transfer mode This stream transfer mode is required to use HDMI sound on latest SuperH Best regards --- Kuninori Morimoto

3 6

[alsa-devel] [PATCH] ASoC: tegra: Add machine driver for WM8753 codec
by Stephen Warren 19 May '12

19 May '12

From: Stephen Warren <swarren(a)nvidia.com> One such machine is Whistler. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Note that I haven't been able to get capture working; enabling sidetone shows that the mic is working correctly (sound from mic shows up at headphones), but arecord always captures digital 0. I don't think this is due to wm8753.c using a MICBIAS widget rather than a supply widget, since I adjusted the audio-routing table to cater for that, based on neo1973_wm8753.c's routing. --- .../bindings/sound/tegra-audio-wm8753.txt | 54 +++++ sound/soc/tegra/Kconfig | 10 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_wm8753.c | 224 ++++++++++++++++++++ 4 files changed, 290 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt create mode 100644 sound/soc/tegra/tegra_wm8753.c diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt new file mode 100644 index 0000000..c4dd39c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt @@ -0,0 +1,54 @@ +NVIDIA Tegra audio complex + +Required properties: +- compatible : "nvidia,tegra-audio-wm8753" +- nvidia,model : The user-visible name of this sound complex. +- nvidia,audio-routing : A list of the connections between audio components. + Each entry is a pair of strings, the first being the connection's sink, + the second being the connection's source. Valid names for sources and + sinks are the WM8753's pins, and the jacks on the board: + + WM8753 pins: + + * LOUT1 + * LOUT2 + * ROUT1 + * ROUT2 + * MONO1 + * MONO2 + * OUT3 + * OUT4 + * LINE1 + * LINE2 + * RXP + * RXN + * ACIN + * ACOP + * MIC1N + * MIC1 + * MIC2N + * MIC2 + * Mic Bias + + Board connectors: + + * Headphone Jack + * Mic Jack + +- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller +- nvidia,audio-codec : The phandle of the WM8753 audio codec +Example: + +sound { + compatible = "nvidia,tegra-audio-wm8753-whistler", + "nvidia,tegra-audio-wm8753" + nvidia,model = "tegra-wm8753-harmony"; + + nvidia,audio-routing = + "Headphone Jack", "LOUT1", + "Headphone Jack", "ROUT1"; + + nvidia,i2s-controller = <&i2s1>; + nvidia,audio-codec = <&wm8753>; +}; + diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 5331c61..c1c8e95 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -48,6 +48,16 @@ config SND_SOC_TEGRA30_I2S Tegra30 I2S interface. You will also need to select the individual machine drivers to support below. +config SND_SOC_TEGRA_WM8753 + tristate "SoC Audio support for Tegra boards using a WM8753 codec" + depends on SND_SOC_TEGRA && I2C + select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC + select SND_SOC_WM8753 + help + Say Y or M here if you want to add support for SoC audio on Tegra + boards using the WM8753 codec, such as Whistler. + config MACH_HAS_SND_SOC_TEGRA_WM8903 bool help diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 98704b4..391e78a 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -16,10 +16,12 @@ obj-$(CONFIG_SND_SOC_TEGRA30_AHUB) += snd-soc-tegra30-ahub.o obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o # Tegra machine Support +snd-soc-tegra-wm8753-objs := tegra_wm8753.o snd-soc-tegra-wm8903-objs := tegra_wm8903.o snd-soc-tegra-trimslice-objs := trimslice.o snd-soc-tegra-alc5632-objs := tegra_alc5632.o +obj-$(CONFIG_SND_SOC_TEGRA_WM8753) += snd-soc-tegra-wm8753.o obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o obj-$(CONFIG_SND_SOC_TEGRA_ALC5632) += snd-soc-tegra-alc5632.o diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c new file mode 100644 index 0000000..4e77026 --- /dev/null +++ b/sound/soc/tegra/tegra_wm8753.c @@ -0,0 +1,224 @@ +/* + * tegra_wm8753.c - Tegra machine ASoC driver for boards using WM8753 codec. + * + * Author: Stephen Warren <swarren(a)nvidia.com> + * Copyright (C) 2010-2012 - NVIDIA, Inc. + * + * Based on code copyright/by: + * + * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd. + * + * Copyright 2007 Wolfson Microelectronics PLC. + * Author: Graeme Gregory + * graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <asm/mach-types.h> + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> + +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include "../codecs/wm8753.h" + +#include "tegra_asoc_utils.h" + +#define DRV_NAME "tegra-snd-wm8753" + +struct tegra_wm8753 { + struct tegra_asoc_utils_data util_data; +}; + +static int tegra_wm8753_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_card *card = codec->card; + struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card); + int srate, mclk; + int err; + + srate = params_rate(params); + switch (srate) { + case 11025: + case 22050: + case 44100: + case 88200: + mclk = 11289600; + break; + default: + mclk = 12288000; + break; + } + + err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk); + if (err < 0) { + dev_err(card->dev, "Can't configure clocks\n"); + return err; + } + + err = snd_soc_dai_set_sysclk(codec_dai, WM8753_MCLK, mclk, + SND_SOC_CLOCK_IN); + if (err < 0) { + dev_err(card->dev, "codec_dai clock not set\n"); + return err; + } + + return 0; +} + +static struct snd_soc_ops tegra_wm8753_ops = { + .hw_params = tegra_wm8753_hw_params, +}; + +static const struct snd_soc_dapm_widget tegra_wm8753_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), +}; + +static struct snd_soc_dai_link tegra_wm8753_dai = { + .name = "WM8753", + .stream_name = "WM8753 PCM", + .codec_dai_name = "wm8753-hifi", + .ops = &tegra_wm8753_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, +}; + +static struct snd_soc_card snd_soc_tegra_wm8753 = { + .name = "tegra-wm8753", + .owner = THIS_MODULE, + .dai_link = &tegra_wm8753_dai, + .num_links = 1, + + .dapm_widgets = tegra_wm8753_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tegra_wm8753_dapm_widgets), + .fully_routed = true, +}; + +static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_tegra_wm8753; + struct tegra_wm8753 *machine; + int ret; + + machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm8753), + GFP_KERNEL); + if (!machine) { + dev_err(&pdev->dev, "Can't allocate tegra_wm8753 struct\n"); + ret = -ENOMEM; + goto err; + } + + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + snd_soc_card_set_drvdata(card, machine); + + ret = snd_soc_of_parse_card_name(card, "nvidia,model"); + if (ret) + goto err; + + ret = snd_soc_of_parse_audio_routing(card, "nvidia,audio-routing"); + if (ret) + goto err; + + tegra_wm8753_dai.codec_of_node = of_parse_phandle( + pdev->dev.of_node, "nvidia,audio-codec", 0); + if (!tegra_wm8753_dai.codec_of_node) { + dev_err(&pdev->dev, + "Property 'nvidia,audio-codec' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + tegra_wm8753_dai.cpu_dai_of_node = of_parse_phandle( + pdev->dev.of_node, "nvidia,i2s-controller", 0); + if (!tegra_wm8753_dai.cpu_dai_of_node) { + dev_err(&pdev->dev, + "Property 'nvidia,i2s-controller' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + tegra_wm8753_dai.platform_of_node = + tegra_wm8753_dai.cpu_dai_of_node; + + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + if (ret) + goto err; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", + ret); + goto err_fini_utils; + } + + return 0; + +err_fini_utils: + tegra_asoc_utils_fini(&machine->util_data); +err: + return ret; +} + +static int __devexit tegra_wm8753_driver_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card); + + snd_soc_unregister_card(card); + + tegra_asoc_utils_fini(&machine->util_data); + + return 0; +} + +static const struct of_device_id tegra_wm8753_of_match[] __devinitconst = { + { .compatible = "nvidia,tegra-audio-wm8753", }, + {}, +}; + +static struct platform_driver tegra_wm8753_driver = { + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = tegra_wm8753_of_match, + }, + .probe = tegra_wm8753_driver_probe, + .remove = __devexit_p(tegra_wm8753_driver_remove), +}; +module_platform_driver(tegra_wm8753_driver); + +MODULE_AUTHOR("Stephen Warren <swarren(a)nvidia.com>"); +MODULE_DESCRIPTION("Tegra+WM8753 machine ASoC driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRV_NAME); +MODULE_DEVICE_TABLE(of, tegra_wm8753_of_match); -- 1.7.0.4

2 1

[alsa-devel] ASoC updates for 3.5
by Mark Brown 19 May '12

19 May '12

The following changes since commit fe33d4c5e2b27a4b82aa479a58f2621eec103d1b: ASoC: don't flip master of DT-instantiated DAI links (2012-05-16 09:44:18 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.5 for you to fetch changes up to 5fb86e5d4a951ddb0474cdfd809380c8e2a8d101: ARM: mx31_3ds: Add sound support (2012-05-18 16:42:44 +0100) ---------------------------------------------------------------- ASoC: mc13783 audio support A few extra patches adding a new driver and some machines using it. ---------------------------------------------------------------- Philippe Rétornaz (7): mfd: mc13xxx: add codec platform data ASoC: Add mc13783 codec ASoC: add imx-mc13783 sound support ASoC: mc13783 codec cleanups mx31moboard: Add sound support ASoC: imx-mc13783 cleanup ARM: mx31_3ds: Add sound support arch/arm/mach-imx/Kconfig | 2 + arch/arm/mach-imx/mach-mx31_3ds.c | 22 +- arch/arm/mach-imx/mach-mx31moboard.c | 20 +- drivers/mfd/mc13xxx-core.c | 3 +- include/linux/mfd/mc13xxx.h | 11 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/mc13783.c | 786 ++++++++++++++++++++++++++++++++++ sound/soc/codecs/mc13783.h | 28 ++ sound/soc/fsl/Kconfig | 8 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/imx-mc13783.c | 156 +++++++ 12 files changed, 1041 insertions(+), 3 deletions(-) create mode 100644 sound/soc/codecs/mc13783.c create mode 100644 sound/soc/codecs/mc13783.h create mode 100644 sound/soc/fsl/imx-mc13783.c

2 1

[alsa-devel] [PATCH 00/11] ASoC: OMAP: HDMI: Use DSS audio interface and prepare for OMAP5
by Ricardo Neri 18 May '12

18 May '12

Hello, The ASoC HDMI codec used to be embedded in the DSS HDMI driver. In order to give the OMAP HDMI code a more logical arrangement and to remove some dependency breaks[1][2], such ASoC HDMI codec was removed[3]. Instead, the DSS HDMI audio functionality[4] is now provided through the new DSS device driver audio interface [5]. Hence, the ASoC HDMI support for OMAP needs to be changed to use this new DSS device driver audio interface. Under this new approach: * The HDMI audio functionality provided by the OMAP is now regarded as a CPU DAI rather than a codec. Hence, the CPU DAI will perform the operations that were performed previously by the codec (using the DSS dev driver audio interface). * A new ASoC HDMI OMAP codec is introduced as a dummy component. In the future, this component will examine the features supported by the sink and limit the number of channels, sample rates and formats that are exposed to the user. Also, this set of patches paves the way to the introduction of the HDMI audio functionality for OMAP5. The goal is to use the same set of ASoC drivers for OMAP4 and OMAP5 (DSS will be in charge of selecting the correct set of functions at run time). For this, several patches are submitted for: * Generalizing the build files to encompass not only OMAP4. * In the HDMI sound card driver, renaming the the functions and structures from omap4_ to omap_. This set includes the suggestions and improvements that Mark Brown kindly provided some time ago [6][7]. Please note that this set of patches will not build unless the patches from [4], [5] and [8] are present. All these patches have been accepted and should be upstream for K3.5. This implementation was validated on top of: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git v3.4-rc7 and Liam Girdwood's: git://gitorious.org/omap-audio/linux-audio.git lrg/topic/3.5-dev Thanks, Ricardo [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg67295.html [2] http://www.spinics.net/lists/linux-omap/msg66178.html [3] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg67809.html [4] http://www.spinics.net/lists/linux-omap/msg69466.html [5] http://www.spinics.net/lists/linux-omap/msg69451.html [6] http://mailman.alsa-project.org/pipermail/alsa-devel/2012-February/049064.h… [7] http://mailman.alsa-project.org/pipermail/alsa-devel/2012-February/049065.h… [8] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg66600.html Ricardo Neri (11): ASoC: OMAP: HDMI: Introduce codec ASoC: OMAP: HDMI: Update the platform device names ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI ASoC: OMAP: HDMI: Use the DSS audio interface ASoC: OMAP: HDMI: Expand configuration of hw_params ASoC: OMAP: HDMI: Improve how the display state is verified ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI ASoC: OMAP: HDMI: Make build config options more generic ASoC: OMAP: HDMI: Make sound card naming more generic ASoC: OMAP: HDMI: Rename sound card driver sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/omap-hdmi.c | 69 +++++++++++ sound/soc/omap/Kconfig | 8 +- sound/soc/omap/Makefile | 4 +- sound/soc/omap/omap-hdmi-card.c | 87 ++++++++++++++ sound/soc/omap/omap-hdmi.c | 238 +++++++++++++++++++++++++++++++++++--- sound/soc/omap/omap-hdmi.h | 4 +- sound/soc/omap/omap4-hdmi-card.c | 121 ------------------- 9 files changed, 395 insertions(+), 142 deletions(-) create mode 100644 sound/soc/codecs/omap-hdmi.c create mode 100644 sound/soc/omap/omap-hdmi-card.c delete mode 100644 sound/soc/omap/omap4-hdmi-card.c -- 1.7.5.4

4 16

[alsa-devel] [PATCH 0/4] MC13783 sound support
by Philippe Rétornaz 18 May '12

18 May '12

Hello This patchset enables sound support on boards with mc13783 codec. The first patch adds the necessary modification to the MFD driver. The second patch adds the codec driver. It's Sascha's code ported to the current kernel with DAPM. The third patch adds a generic SoC platform driver for imx boards with mc13783 codecs. The last patch enable the sound on mx31moboard boards. I will post a similar patch for mx31pdk_3ds as soon as I figure out why it hangs early at boot with the latest kernel (unrelated to this patchset). It is based on 3.4-rc4 with asoc-3.5 and the sdma channel 0 mutex to spinlock fix. Philippe Rétornaz (4): mc13xxx: add codec platform data ASoC: Add mc13783 codec ASoC: add imx-mc13783 sound support mx31moboard: Add sound support arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/mach-mx31moboard.c | 20 +- drivers/mfd/mc13xxx-core.c | 3 +- include/linux/mfd/mc13xxx.h | 11 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/mc13783.c | 800 ++++++++++++++++++++++++++++++++++ sound/soc/codecs/mc13783.h | 28 ++ sound/soc/fsl/Kconfig | 8 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/imx-mc13783.c | 163 +++++++ 11 files changed, 1040 insertions(+), 2 deletions(-) create mode 100644 sound/soc/codecs/mc13783.c create mode 100644 sound/soc/codecs/mc13783.h create mode 100644 sound/soc/fsl/imx-mc13783.c

2 10

[alsa-devel] Question on Dynamic PCM
by Sebastien LEDUC 18 May '12

18 May '12

In commit "ASoC: dapm: Add API call to query valid DAPM paths<http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git;a=commit;h=ec2e…>" , the signature of the functions is_connected_input_ep / is_connected_output_ep has been modified so that the 2 functions now fill list of connected DAPM widgets. What I don't understand is why the way widgets are added is not symmetric between the two: In function is_connected_output_ep: ----------------------------------------------- list_for_each_entry(path, &widget->sinks, list_source) { ... err = dapm_list_add_widget(list, path->sink); ... } In function is_connected_input_ep: --------------------------------------------- list_for_each_entry(path, &widget->sources, list_sink) { ... err = dapm_list_add_widget(list, path->sink); } I would have expected to have for the latter: err = dapm_list_add_widget(list, path->source); regards, Sebastien Le Duc

1 0