August 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: ak5386: Add DAPM support
by Mark Brown 11 Aug '13

11 Aug '13

From: Mark Brown <broonie(a)linaro.org> This makes it possible to hook the device into a more complex board and ensures it will continue to work with non-DAPM support removed from the core. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ak5386.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c index 1f30398..fb01f35 100644 --- a/sound/soc/codecs/ak5386.c +++ b/sound/soc/codecs/ak5386.c @@ -22,7 +22,22 @@ struct ak5386_priv { int reset_gpio; }; -static struct snd_soc_codec_driver soc_codec_ak5386; +static const struct snd_soc_dapm_widget ak4554_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("AINL"), +SND_SOC_DAPM_INPUT("AINR"), +}; + +static const struct snd_soc_dapm_route ak4554_dapm_routes[] = { + { "Capture", NULL, "AINL" }, + { "Capture", NULL, "AINR" }, +}; + +static struct snd_soc_codec_driver soc_codec_ak5386 = { + .dapm_widgets = ak4554_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets), + .dapm_routes = ak4554_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes), +}; static int ak5386_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) -- 1.8.4.rc1

2 2

[alsa-devel] [PATCH] ASoC: cs4270: Add DAPM support
by Mark Brown 11 Aug '13

11 Aug '13

From: Mark Brown <broonie(a)linaro.org> This makes it possible to hook the device into a more complex board and ensures it will continue to work with non-DAPM support removed from the core. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/cs4270.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 8e47798..83c835d 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -139,6 +139,22 @@ struct cs4270_private { struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; +static const struct snd_soc_dapm_widget cs4270_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("AINL"), +SND_SOC_DAPM_INPUT("AINR"), + +SND_SOC_DAPM_OUTPUT("AOUTL"), +SND_SOC_DAPM_OUTPUT("AOUTR"), +}; + +static const struct snd_soc_dapm_route cs4270_dapm_routes[] = { + { "Capture", NULL, "AINA" }, + { "Capture", NULL, "AINB" }, + + { "AOUTA", NULL, "Playback" }, + { "AOUTB", NULL, "Playback" }, +}; + /** * struct cs4270_mode_ratios - clock ratio tables * @ratio: the ratio of MCLK to the sample rate @@ -612,6 +628,10 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = { .controls = cs4270_snd_controls, .num_controls = ARRAY_SIZE(cs4270_snd_controls), + .dapm_widgets = cs4270_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs4270_dapm_widgets), + .dapm_routes = cs4270_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(cs4270_dapm_routes), }; /* -- 1.8.4.rc1

1 0

[alsa-devel] [PATCH] ASoC: ak4554: Add DAPM support
by Mark Brown 11 Aug '13

11 Aug '13

From: Mark Brown <broonie(a)linaro.org> This makes it possible to hook the device into a more complex board and ensures it will continue to work with non-DAPM support removed from the core. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ak4554.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c index 6aed9c4..79e9555 100644 --- a/sound/soc/codecs/ak4554.c +++ b/sound/soc/codecs/ak4554.c @@ -29,6 +29,22 @@ * CPU-DAI2 (capture only fmt = LEFT_J) ---+ */ +static const struct snd_soc_dapm_widget ak4554_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("AINL"), +SND_SOC_DAPM_INPUT("AINR"), + +SND_SOC_DAPM_OUTPUT("AOUTL"), +SND_SOC_DAPM_OUTPUT("AOUTR"), +}; + +static const struct snd_soc_dapm_route ak4554_dapm_routes[] = { + { "Capture", NULL, "AINL" }, + { "Capture", NULL, "AINR" }, + + { "AOUTL", NULL, "Playback" }, + { "AOUTR", NULL, "Playback" }, +}; + static struct snd_soc_dai_driver ak4554_dai = { .name = "ak4554-hifi", .playback = { @@ -49,6 +65,10 @@ static struct snd_soc_dai_driver ak4554_dai = { }; static struct snd_soc_codec_driver soc_codec_dev_ak4554 = { + .dapm_widgets = ak4554_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets), + .dapm_routes = ak4554_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes), }; static int ak4554_soc_probe(struct platform_device *pdev) -- 1.8.4.rc1

1 0

[alsa-devel] [PATCH 1/3] ASoC: bt-sco: enable OF support
by Barry Song 11 Aug '13

11 Aug '13

From: Rongjun Ying <Rongjun.Ying(a)csr.com> this makes users be able to add a bt-sco node in dts instead of hardcoding a platform device in mach. Signed-off-by: Rongjun Ying <Rongjun.Ying(a)csr.com> Signed-off-by: Barry Song <Baohua.Song(a)csr.com> --- sound/soc/codecs/bt-sco.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c index a081d9f..39e7ebe 100644 --- a/sound/soc/codecs/bt-sco.c +++ b/sound/soc/codecs/bt-sco.c @@ -46,6 +46,14 @@ static int bt_sco_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id bt_sco_of_match[] = { + { .compatible = "bt-sco-codec", }, + {} +}; +MODULE_DEVICE_TABLE(of, bt_sco_of_match); +#endif + static struct platform_device_id bt_sco_driver_ids[] = { { .name = "dfbmcs320", @@ -58,6 +66,9 @@ static struct platform_driver bt_sco_driver = { .driver = { .name = "bt-sco", .owner = THIS_MODULE, +#ifdef CONFIG_OF + .of_match_table = bt_sco_of_match, +#endif }, .probe = bt_sco_probe, .remove = bt_sco_remove, -- 1.8.2.3 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog

5 15

[alsa-devel] [PATCH 1/2] ASoC: Remove unused snd_soc_info_volsw_ext()
by Lars-Peter Clausen 11 Aug '13

11 Aug '13

The SOC_SINGLE_EXT control has been using snd_soc_info_volsw() for its info callback since commit 1c433fb ("[ALSA] soc - 0.13 ASoC headers"). The snd_soc_info_volsw_ext() function has been unused ever since then, so remove it. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/soc.h | 2 -- sound/soc/soc-core.c | 26 -------------------------- 2 files changed, 28 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 13d388a..64eb60a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -499,8 +499,6 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); -int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo); #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fdddc45..47cb2c0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2594,32 +2594,6 @@ int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol, EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext); /** - * snd_soc_info_volsw_ext - external single mixer info callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information about a single external mixer control. - * - * Returns 0 for success. - */ -int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) -{ - int max = kcontrol->private_value; - - if (max == 1 && !strstr(kcontrol->id.name, " Volume")) - uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; - else - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - - uinfo->count = 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = max; - return 0; -} -EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext); - -/** * snd_soc_info_volsw - single mixer info callback * @kcontrol: mixer control * @uinfo: control element information -- 1.8.0

2 2

[alsa-devel] [PATCH v10 0/7] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 11 Aug '13

11 Aug '13

Hi, this series implements ac97-slave support for fsl-ssi and phycore ac97 DT support. Since v9 there were a lot of changes. I dropped the board specific ac97-link reset functions and added generic functions to soc-core. It uses devicetree parsed pinctrl and gpios. The audmux setup was removed from phycore-ac97-dt. The initial setup can now be defined in DT. Regards, Markus Markus Pargmann (7): ASoC: core: Generic ac97 link reset functions ASoC: codec: wm9712 simple DT bindings ASoC: imx-audmux: Read default configuration from devicetree ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ASoC: fsl-ssi: ac97-slave support ASoC: Add phycore-ac97-dt driver .../devicetree/bindings/sound/fsl,ssi.txt | 12 + .../devicetree/bindings/sound/imx-audmux.txt | 9 + .../bindings/sound/phytec,phycore-ac97.txt | 16 + .../devicetree/bindings/sound/soc-ac97link.txt | 28 ++ Documentation/devicetree/bindings/sound/wm9712.txt | 10 + include/sound/soc.h | 2 + sound/soc/codecs/wm9712.c | 9 + sound/soc/fsl/Kconfig | 15 +- sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_ssi.c | 431 +++++++++++++++++---- sound/soc/fsl/imx-audmux.c | 62 +++ sound/soc/fsl/phycore-ac97-dt.c | 124 ++++++ sound/soc/fsl/phycore-ac97.c | 13 +- sound/soc/soc-core.c | 153 ++++++++ 14 files changed, 789 insertions(+), 97 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt create mode 100644 Documentation/devicetree/bindings/sound/soc-ac97link.txt create mode 100644 Documentation/devicetree/bindings/sound/wm9712.txt create mode 100644 sound/soc/fsl/phycore-ac97-dt.c

2 19

[alsa-devel] [PATCH] usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525
by Maksim A. Boyko 10 Aug '13

10 Aug '13

Add the volume control quirk for avoiding the kernel warning for the Logitech HD Webcam C525 as in the similar commit 36691e1be6ec551eef4a5225f126a281f8c051c2 for the Logitech HD Webcam C310. Reported-by: Maksim Boyko <maksim.a.boyko(a)gmail.com> Tested-by: Maksim Boyko <maksim.a.boyko(a)gmail.com> Cc: <stable(a)vger.kernel.org> # 3.10.5+ Signed-off-by: Maksim Boyko <maksim.a.boyko(a)gmail.com> -- sound/usb/mixer.c | 1 + 1 file changed, 1 insertion(+) --- linux-3.10.5-orig/sound/usb/mixer.c 2013-08-04 12:51:49.000000000 +0400 +++ linux-3.10.5/sound/usb/mixer.c 2013-08-06 21:12:42.274197287 +0400 @@ -888,6 +888,7 @@ static void volume_control_quirks(struct case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ case USB_ID(0x046d, 0x081d): /* HD Webcam c510 */ case USB_ID(0x046d, 0x0825): /* HD Webcam c270 */ + case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */ case USB_ID(0x046d, 0x0991): /* Most audio usb devices lie about volume resolution. * Most Logitech webcams have res = 384. -- WBR, Maksim P.S. Please, use this patch due to it should have correct tab symbols.

3 2

[alsa-devel] [PATCH] ALSA: Add MAINTAINERS entry for compressed audio API
by Mark Brown 10 Aug '13

10 Aug '13

From: Mark Brown <broonie(a)linaro.org> Help ensure that Vinod gets included in review of compressed audio patches by adding a MAINTAINERS entry for it. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a367e52..427a930 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7694,6 +7694,15 @@ F: include/sound/ F: include/uapi/sound/ F: sound/ +SOUND - COMPRESSED AUDIO +M: Vinod Koul <vinod.koul(a)intel.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +S: Supported +F: include/sound/compress_driver.h +F: sound/core/compress_offload.c +F: sound/soc/soc-compress.c + SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) M: Liam Girdwood <lgirdwood(a)gmail.com> M: Mark Brown <broonie(a)kernel.org> -- 1.8.4.rc1

2 1

[alsa-devel] [PATCH] ASoC: Remove unused soc_pm_waitq
by Lars-Peter Clausen 10 Aug '13

10 Aug '13

The soc_pm_waitq waitqueue has been around as long as the ASoC framework existed, but has never been used so far, so remove it. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/soc-core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1d5e84a..fdddc45 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -47,8 +47,6 @@ #define NAME_SIZE 32 -static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); - #ifdef CONFIG_DEBUG_FS struct dentry *snd_soc_debugfs_root; EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); -- 1.8.0

2 1

[alsa-devel] [PATCH v4 1/1] ASoc: kirkwood: add DT support to the mvebu audio subsystem
by Jean-Francois Moine 10 Aug '13

10 Aug '13

This patch adds DT support to the audio subsystem of the mvebu family (Kirkwood, Dove, Armada 370). Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> --- .../devicetree/bindings/sound/mvebu-audio.txt | 29 ++++++++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 26 +++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt new file mode 100644 index 0000000..7e5fd37 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -0,0 +1,29 @@ +* mvebu (Kirkwood, Dove, Armada 370) audio controller + +Required properties: + +- compatible: "mrvl,mvebu-audio" + +- reg: physical base address of the controller and length of memory mapped + region. + +- interrupts: list of two irq numbers. + The first irq is used for data flow and the second one is used for errors. + +- clocks: one or two phandles. + The first one is mandatory and defines the internal clock. + The second one is optional and defines an external clock. + +- clock-names: names associated to the clocks: + "internal" for the internal clock + "extclk" for the external clock + +Example: + +i2s1: audio-controller@b4000 { + compatible = "mrvl,mvebu-audio"; + reg = <0xb4000 0x2210>; + interrupts = <21>, <22>; + clocks = <&gate_clk 13>; + clock-names = "internal"; +}; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c.next b/sound/soc/kirkwood/kirkwood-i2s.c index e5f3f7a..a4170b4 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c.next +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -22,6 +22,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/platform_data/asoc-kirkwood.h> +#include <linux/of.h> + #include "kirkwood.h" #define DRV_NAME "mvebu-audio" @@ -453,6 +455,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai; struct kirkwood_dma_data *priv; struct resource *mem; + struct device_node *np = pdev->dev.of_node; int err; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); @@ -473,14 +476,16 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - if (!data) { - dev_err(&pdev->dev, "no platform data ?!\n"); + if (np) { + priv->burst = 128; /* might be 32 or 128 */ + } else if (data) { + priv->burst = data->burst; + } else { + dev_err(&pdev->dev, "no DT nor platform data ?!\n"); return -EINVAL; } - priv->burst = data->burst; - - priv->clk = devm_clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, np ? "internal" : NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "no clock\n"); return PTR_ERR(priv->clk); @@ -507,7 +512,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24; /* Select the burst size */ - if (data->burst == 32) { + if (priv->burst == 32) { priv->ctl_play |= KIRKWOOD_PLAYCTL_BURST_32; priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_32; } else { @@ -552,12 +557,21 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id kirkwood_i2s_of_match[] = { + { .compatible = "mrvl,mvebu-audio" }, + { } +}; +MODULE_DEVICE_TABLE(of, kirkwood_i2s_of_match); +#endif + static struct platform_driver kirkwood_i2s_driver = { .probe = kirkwood_i2s_dev_probe, .remove = kirkwood_i2s_dev_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(kirkwood_i2s_of_match), }, }; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

6 20