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

[alsa-devel] [PATCH] ASoC: omap-dmic: Use devm_clk_get
by Himangi Saraogi 14 Jul '14

14 Jul '14

This patch introduces the use of managed interfaces like devm_clk_get and does away with the clk_puts in the probe and remove functions. A label is also done away with. Signed-off-by: Himangi Saraogi <himangi774(a)gmail.com> --- This is a follow up to ASoC: omap-dmic: use managed interfaces which failed to apply as the other devm_ functions were introduced by a patch ASoC: omap-dmic: Use devm_snd_soc_register_component. sound/soc/omap/omap-dmic.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index f125eb9..0f34e28 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -466,7 +466,7 @@ static int asoc_dmic_probe(struct platform_device *pdev) mutex_init(&dmic->mutex); - dmic->fclk = clk_get(dmic->dev, "fck"); + dmic->fclk = devm_clk_get(dmic->dev, "fck"); if (IS_ERR(dmic->fclk)) { dev_err(dmic->dev, "cant get fck\n"); return -ENODEV; @@ -475,8 +475,7 @@ static int asoc_dmic_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma"); if (!res) { dev_err(dmic->dev, "invalid dma memory resource\n"); - ret = -ENODEV; - goto err_put_clk; + return -ENODEV; } dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG; @@ -484,34 +483,19 @@ static int asoc_dmic_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); dmic->io_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(dmic->io_base)) { - ret = PTR_ERR(dmic->io_base); - goto err_put_clk; - } + if (IS_ERR(dmic->io_base)) + return PTR_ERR(dmic->io_base); ret = devm_snd_soc_register_component(&pdev->dev, &omap_dmic_component, &omap_dmic_dai, 1); if (ret) - goto err_put_clk; + return ret; ret = omap_pcm_platform_register(&pdev->dev); if (ret) - goto err_put_clk; - - return 0; - -err_put_clk: - clk_put(dmic->fclk); - return ret; -} - -static int asoc_dmic_remove(struct platform_device *pdev) -{ - struct omap_dmic *dmic = platform_get_drvdata(pdev); - - clk_put(dmic->fclk); + return ret; return 0; } @@ -529,7 +513,6 @@ static struct platform_driver asoc_dmic_driver = { .of_match_table = omap_dmic_of_match, }, .probe = asoc_dmic_probe, - .remove = asoc_dmic_remove, }; module_platform_driver(asoc_dmic_driver); -- 1.9.1

3 2

[alsa-devel] [PATCH v2] ASoC: samsung/smartq: use dynamic registration
by Arnd Bergmann 14 Jul '14

14 Jul '14

As a prerequisite for moving s3c64xx into multiplatform configurations, we need to change the smartq audio driver to stop using hardcoded gpio numbers from the header file, and instead pass the gpio data through platform_data. In order to do that, we also move the code to use module_platform_driver and register the platform device using platform_device_register_simple and register the gpios through the gpiod API. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index b3d13537a7f0..deed4dd2d0e4 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c @@ -12,6 +12,7 @@ #include <linux/delay.h> #include <linux/fb.h> #include <linux/gpio.h> +#include <linux/gpio/driver.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/pwm_backlight.h> @@ -379,6 +380,15 @@ void __init smartq_map_io(void) smartq_lcd_mode_set(); } +static struct gpiod_lookup_table smartq_audio_gpios = { + .dev_id = "smartq-audio", + .table = { + GPIO_LOOKUP("GPL", 12, "headphone detect", 0), + GPIO_LOOKUP("GPK", 12, "amplifiers shutdown", GPIO_ACTIVE_HIGH), + { }, + }, +}; + void __init smartq_machine_init(void) { s3c_i2c0_set_platdata(NULL); @@ -397,4 +407,7 @@ void __init smartq_machine_init(void) WARN_ON(smartq_wifi_init()); platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices)); + + gpiod_add_lookup_table(&smartq_audio_gpios); + platform_device_register_simple("smartq-audio", -1, NULL, 0); } diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 9b0ffacab790..b13f60e402ae 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -13,15 +13,12 @@ * */ -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <sound/soc.h> #include <sound/jack.h> -#include <mach/gpio-samsung.h> -#include <asm/mach-types.h> - #include "i2s.h" #include "../codecs/wm8750.h" @@ -110,7 +107,7 @@ static struct snd_soc_jack_pin smartq_jack_pins[] = { static struct snd_soc_jack_gpio smartq_jack_gpios[] = { { - .gpio = S3C64XX_GPL(12), + .gpio = -1, .name = "headphone detect", .report = SND_JACK_HEADPHONE, .debounce_time = 200, @@ -127,7 +124,9 @@ static int smartq_speaker_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value(S3C64XX_GPK(12), SND_SOC_DAPM_EVENT_OFF(event)); + struct gpio_desc *gpio = snd_soc_card_get_drvdata(&snd_soc_smartq); + + gpiod_set_value(gpio, SND_SOC_DAPM_EVENT_OFF(event)); return 0; } @@ -218,62 +217,39 @@ static struct snd_soc_card snd_soc_smartq = { .num_controls = ARRAY_SIZE(wm8987_smartq_controls), }; -static struct platform_device *smartq_snd_device; - -static int __init smartq_init(void) +static int smartq_probe(struct platform_device *pdev) { + struct gpio_desc *gpio; int ret; - if (!machine_is_smartq7() && !machine_is_smartq5()) { - pr_info("Only SmartQ is supported by this ASoC driver\n"); - return -ENODEV; - } - - smartq_snd_device = platform_device_alloc("soc-audio", -1); - if (!smartq_snd_device) - return -ENOMEM; - - platform_set_drvdata(smartq_snd_device, &snd_soc_smartq); - - ret = platform_device_add(smartq_snd_device); - if (ret) { - platform_device_put(smartq_snd_device); - return ret; - } + platform_set_drvdata(pdev, &snd_soc_smartq); /* Initialise GPIOs used by amplifiers */ - ret = gpio_request(S3C64XX_GPK(12), "amplifiers shutdown"); - if (ret) { - dev_err(&smartq_snd_device->dev, "Failed to register GPK12\n"); - goto err_unregister_device; + gpio = devm_gpiod_get(&pdev->dev, "amplifiers shutdown"); + if (IS_ERR(gpio)) { + dev_err(&pdev->dev, "Failed to register GPK12\n"); + ret = PTR_ERR(gpio); + goto out; } + snd_soc_card_set_drvdata(&snd_soc_smartq, gpio); - /* Disable amplifiers */ - ret = gpio_direction_output(S3C64XX_GPK(12), 1); - if (ret) { - dev_err(&smartq_snd_device->dev, "Failed to configure GPK12\n"); - goto err_free_gpio_amp_shut; - } - - return 0; - -err_free_gpio_amp_shut: - gpio_free(S3C64XX_GPK(12)); -err_unregister_device: - platform_device_unregister(smartq_snd_device); + ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_smartq); + if (ret) + dev_err(&pdev->dev, "Failed to register card\n"); +out: return ret; } -static void __exit smartq_exit(void) -{ - gpio_free(S3C64XX_GPK(12)); - - platform_device_unregister(smartq_snd_device); -} +static struct platform_driver smartq_driver = { + .driver = { + .name = "smartq-audio", + .owner = THIS_MODULE, + }, + .probe = smartq_probe, +}; -module_init(smartq_init); -module_exit(smartq_exit); +module_platform_driver(smartq_driver); /* Module information */ MODULE_AUTHOR("Maurus Cuelenaere <mcuelenaere(a)gmail.com>");

1 0

[alsa-devel] [PATCH] pcm: rate: fix hw_ptr exceed the boundary
by Shengjiu Wang 14 Jul '14

14 Jul '14

For long time test case, the hw_ptr will exceed the boundary, then cause the avail size wrong. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)freescale.com> --- src/pcm/pcm_rate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 7f667d4..2563d82 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -574,6 +574,8 @@ static inline void snd_pcm_rate_sync_hwptr(snd_pcm_t *pcm) rate->hw_ptr = (slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size + rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size); + + rate->hw_ptr %= pcm->boundary; } static int snd_pcm_rate_hwsync(snd_pcm_t *pcm) -- 1.7.9.5

2 1

[alsa-devel] [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings
by Sylwester Nawrocki 14 Jul '14

14 Jul '14

Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- Changes since v2: - none. --- .../bindings/sound/samsung,odroidx2-max98090.txt | 35 ++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt diff --git a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt new file mode 100644 index 0000000..9148f72 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt @@ -0,0 +1,35 @@ +Samsung Exynos Odroid X2/U3 audio complex with MAX98090 codec + +Required properties: + - compatible : "samsung,odroidx2-audio" - for Odroid X2 board, + "samsung,odroidu3-audio" - for Odroid U3 board + - samsung,model : the user-visible name of this sound complex + - samsung,i2s-controller : the phandle of the I2S controller + - samsung,audio-codec : the phandle of the MAX98090 audio codec + - samsung,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 MAX98090's pins (as + documented in its binding), and the jacks on the board + For Odroid X2: + * Headphone Jack + * Mic Jack + * DMIC + + For Odroid U3: + * Headphone Jack + * Speakers + +Example: + +sound { + compatible = "samsung,odroidu3-audio"; + samsung,i2s-controller = <&i2s0>; + samsung,audio-codec = <&max98090>; + samsung,model = "Odroid-X2"; + samsung,audio-routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; +}; -- 1.7.9.5

3 6

[alsa-devel] No speaker output with kernel 3.15 and later
by Steven Newbury 14 Jul '14

14 Jul '14

I sent Takashi an email mentioning this regression a month ago, and it's taken me this long to send this email... :-$ Since updating to kernel versions >=3.15 I've had no audio from my laptop speakers. Earlier versions worked fine. It's a CLEVO W270EUQ laptop. The output mixer device is showing up, but no sound comes out at any volume level. As requested I've attached compressed alsa-info.sh output for both the working and non-working cases. I'm perfectly willing to test patches etc.

3 10

[alsa-devel] [PATCH V2 0/2] Sound support for Exynos4412 Odroid X2, U3 board
by Sylwester Nawrocki 14 Jul '14

14 Jul '14

This series adds basic sound support for the Odroid X2/U3 boards. It relies on specific Exynos Audio Subsystem clock parent and frequencies being pre-configured. My full testing git branch has been pushed to: git://linuxtv.org/snawrocki/samsung.git v3.16-rc1-odroid-sound-clk It can be browsed at: http://git.linuxtv.org/cgit.cgi/snawrocki/samsung.git/log/?h=v3.16-rc1-odro… I didn't use the simple-card since there is going to be added one more CPU interface using the secondary I2S and IDMA. Sylwester Nawrocki (2): ASoC: samsung: Add machine driver for Odroid X2/U3 doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings .../bindings/sound/samsung,odroidx2-max98090.txt | 35 ++++ sound/soc/samsung/Kconfig | 8 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/odroidx2_max98090.c | 191 ++++++++++++++++++++ 4 files changed, 236 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt create mode 100644 sound/soc/samsung/odroidx2_max98090.c -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

5 12

[alsa-devel] [PATCH 1/1] ice1712: check if snd card loaded, if not do not proceed
by Konstantinos Tsimpoukas 14 Jul '14

14 Jul '14

Just adding a simple if statement, which verifies if actually card is loaded, if not does not continue with the execution of the snd_card_free. Signed-off-by: Konstantinos Tsimpoukas <kostaslinuxxx(a)gmail.com> --- sound/pci/ice1712/ice1712.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index d9b9e45..431096b 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2819,7 +2819,8 @@ static void snd_ice1712_remove(struct pci_dev *pci) if (ice->card_info && ice->card_info->chip_exit) ice->card_info->chip_exit(ice); - snd_card_free(card); + if (card) + snd_card_free(card); } #ifdef CONFIG_PM_SLEEP -- 1.9.1

2 3

[alsa-devel] [PATCH 0/5] ASoC: Intel: Enable BDW/HSW SRAM power gating
by Jie Yang 14 Jul '14

14 Jul '14

Hi Mark, Here is the patch series for enable Intel Broadwell/Haswell ADSP SRAM power gating feature. Patches 0001~0003 implement FW module persistent area allocate during FW parse; Patch 0004 add dummy read to workaround SRAM write missing bytes issue; Patch 0005 will make SRAM start with all memory banks disabled, and enabled required banks during boot procedure. thanks, Keyon Jie Yang (5): ASoC: Intel: Add persistent area alloc ASoC: Intel: Merge wild cat point ADSP DRAM regions ASoC: Intel: Use a table for ADSP SRAM shift ASoC: Intel: Add dummy read for SRAM block enable ASoC: Intel: Start with all memory banks disabled sound/soc/intel/sst-dsp-priv.h | 2 ++ sound/soc/intel/sst-firmware.c | 52 ++++++++++++++++++++++++++++++ sound/soc/intel/sst-haswell-dsp.c | 68 ++++++++++++++++++++++++++++++--------- 3 files changed, 106 insertions(+), 16 deletions(-) -- 1.8.3.2

1 5

[alsa-devel] C-Media USB Audio Device (0d8c:000c) volume scale
by Alexander Schlarb 13 Jul '14

13 Jul '14

Hi everybody! I've just opened what I think is a bug at GitHub[1] and have been told to send it to this list instead. System configuration: - http://www.alsa-project.org/db/?f=fb914e7a6b8d91993b00d61c94c885e8d2ede527 - https://github.com/opensrc/alsa/issues/4 (some additional PulseAudio stuff) My problem: I have a DeLock USB audio device with an C-Media audio chip. When changing the volume in alsamixer there is no problem, but when changing the volume through any PulseAudio frontend (in my case either pavucontrol or veromix-plasmoid), all volumes below 30% in the GUI are shown as 0% in alsamixer and no sound is played. The PulseAudio wiki[2] blames this on ALSA for exporting incorrect dB information. However there is a StackExchange answer[3] which suggests adding the parameter ignore_dB=1 in /etc/pulse/default.pa which fixed the issue, so I'm not sure if this is indeed ALSAs fault? Please tell me if this can be fixed in ALSA or if this might be a PulseAudio bug... With best regards, Alexander Schlarb [1] https://github.com/opensrc/alsa/issues/4 [2] http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Puls… [3] http://askubuntu.com/questions/15069/how-do-i-change-the-way-ubuntu-adjusts…

2 1

[alsa-devel] [PATCH] ASoC: rockchips: fix build error
by Arnd Bergmann 12 Jul '14

12 Jul '14

The newly added rockchip_i2s driver is lacking an include of linux/module.h, causing a build error in some cases: ../sound/soc/rockchip/rockchip_i2s.c:526:20: error: expected declaration specifiers or '...' before string constant MODULE_DESCRIPTION("ROCKCHIP IIS ASoC Interface"); Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Jianqun Xu <xjq(a)rock-chips.com> --- sound/soc/rockchip/rockchip_i2s.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index af1d8eb94f04..c3e53feba5b9 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -13,6 +13,7 @@ #include <linux/delay.h> #include <linux/of_gpio.h> #include <linux/clk.h> +#include <linux/module.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <sound/pcm_params.h> -- 1.8.3.2

3 2