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

[alsa-devel] ASoC: Device tree binding to dummy codec
by jonsmirl＠gmail.com 28 Jul '14

28 Jul '14

Allwinner CPUs have an on-chip codec that supports line out. This is a monolithic block that does not implement anything like standard I2S. We have implemented this by internally making a soc_card and then binding the DAI to a dummy NOP codec to make ASoC happy. But now someone wants to add a MAX9768 amplifier which needs a codec driver to implement volume control. So how should this be implemented? You want to use simple-audio-card when the MAX9768 is present. But what about the dummy-codec case? Using simple-audio-card to bind to a dummy-codec clutters things up a lot. Plus the dummy-codec is not currently exposed to device trees. And then there is the ordering problem, how do I know for sure MAX9768 is not going to be bound so that it is safe to bind to dummy-codec. Or should binding to MAX9768 simply override a binding to the dummy-codec? If my dummy-codec is exposed into the device trees then this generates a bunch of NOP clutter in the tree using simple-audio-card to bind it. Another idea, maybe one of those NOP SDPIF codecs could get an alias name like NOP or Dummy. -- Jon Smirl jonsmirl(a)gmail.com

3 13

[alsa-devel] [PATCH 1/2] ASoC: pcm1792a: Add 88200 frequency
by Michael Trimarchi 28 Jul '14

28 Jul '14

Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- sound/soc/codecs/pcm1792a.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/pcm1792a.h b/sound/soc/codecs/pcm1792a.h index 7a83d1f..51d5470 100644 --- a/sound/soc/codecs/pcm1792a.h +++ b/sound/soc/codecs/pcm1792a.h @@ -18,7 +18,8 @@ #define __PCM1792A_H__ #define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \ - SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000) + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_192000) #define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S16_LE) -- 1.8.1.2

2 2

[alsa-devel] [PATCH -next] ASoC: rockchip: remove redundant dev_err call in rockchip_i2s_probe()
by weiyj_lk＠163.com 28 Jul '14

28 Jul '14

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/rockchip/rockchip_i2s.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index af1d8eb..52ccced 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -427,10 +427,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(regs)) { - dev_err(&pdev->dev, "No memory resource\n"); + if (IS_ERR(regs)) return PTR_ERR(regs); - } i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &rockchip_i2s_regmap_config);

2 1

[alsa-devel] [PATCH v6 0/5] ASoC: core: Add support for DAI multicodec
by Benoit Cousson 28 Jul '14

28 Jul '14

Hi Lars, Mark and Liam, Here is the sixth, and hopefully the last, version of the multicodec series. I've just removed the broken test I forgot to remove last time. The series is based on asoc/for-next (v3.16-rc3). Test and comments are welcome. Thanks, Benoit v1: http://comments.gmane.org/gmane.linux.alsa.devel/120532 v2: http://comments.gmane.org/gmane.linux.alsa.devel/121024 - Split the first version in several patches. - Remove the TDM fixup v3: - Fixed all the places that were not iterating over all the codecs. - Change the structure and split it. v4: - Improve the TDM management - Split the orginal patch in smaller chunks - Ignore the CODEC to CODEC link case for the moment - Add iteration for multicodecs everywhere v5: - Remove multicodec support for soc-compress - Simplify the code a little thanks to Lars component series v6: - Remove a broken test in snd_soc_runtime_ignore_pmdown_time Benoit Cousson (5): ASoC: core: Add initial support for DAI multicodec ASoC: pcm: Add support for DAI multicodec ASoC: dapm: Add support for DAI multicodec ASoC: compress: Prevent multicodec for compressed stream ASoC: pcm: Add soc_dai_hw_params helper include/sound/soc-dai.h | 4 + include/sound/soc.h | 17 ++ sound/soc/soc-compress.c | 5 + sound/soc/soc-core.c | 293 +++++++++++++++++-------- sound/soc/soc-dapm.c | 95 ++++---- sound/soc/soc-pcm.c | 555 ++++++++++++++++++++++++++++++++--------------- 6 files changed, 665 insertions(+), 304 deletions(-) -- 1.9.1

3 14

[alsa-devel] [PATCH] ASoC: rt286: request IRQ in soc level
by bardliao＠realtek.com 28 Jul '14

28 Jul '14

From: Bard Liao <bardliao(a)realtek.com> We assign rt286->codec in rt286_probe. To prevent rt286->codec = NULL when rt286_irq is executed, it is better to request IRQ in rt286_probe instead of rt286_i2c_probe. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt286.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 218f86e..76b55cd 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -963,10 +963,28 @@ static irqreturn_t rt286_irq(int irq, void *data) static int rt286_probe(struct snd_soc_codec *codec) { struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec); + int ret; codec->dapm.bias_level = SND_SOC_BIAS_OFF; rt286->codec = codec; + if (rt286->i2c->irq) { + regmap_update_bits(rt286->regmap, + RT286_IRQ_CTRL, 0x2, 0x2); + + INIT_DELAYED_WORK(&rt286->jack_detect_work, + rt286_jack_detect_work); + schedule_delayed_work(&rt286->jack_detect_work, + msecs_to_jiffies(1250)); + + ret = request_threaded_irq(rt286->i2c->irq, NULL, rt286_irq, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "rt286", rt286); + if (ret != 0) { + dev_err(codec->dev, + "Failed to reguest IRQ: %d\n", ret); + return ret; + } + } return 0; } @@ -976,6 +994,9 @@ static int rt286_remove(struct snd_soc_codec *codec) cancel_delayed_work_sync(&rt286->jack_detect_work); + if (rt286->i2c->irq) + free_irq(rt286->i2c->irq, rt286); + return 0; } @@ -1170,24 +1191,6 @@ static int rt286_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt286->regmap, RT286_DEPOP_CTRL3, 0xf777, 0x4737); regmap_update_bits(rt286->regmap, RT286_DEPOP_CTRL4, 0x00ff, 0x003f); - if (rt286->i2c->irq) { - regmap_update_bits(rt286->regmap, - RT286_IRQ_CTRL, 0x2, 0x2); - - INIT_DELAYED_WORK(&rt286->jack_detect_work, - rt286_jack_detect_work); - schedule_delayed_work(&rt286->jack_detect_work, - msecs_to_jiffies(1250)); - - ret = request_threaded_irq(rt286->i2c->irq, NULL, rt286_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "rt286", rt286); - if (ret != 0) { - dev_err(&i2c->dev, - "Failed to reguest IRQ: %d\n", ret); - return ret; - } - } - ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt286, rt286_dai, ARRAY_SIZE(rt286_dai)); @@ -1196,12 +1199,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c, static int rt286_i2c_remove(struct i2c_client *i2c) { - struct rt286_priv *rt286 = i2c_get_clientdata(i2c); - - if (i2c->irq) - free_irq(i2c->irq, rt286); snd_soc_unregister_codec(&i2c->dev); - return 0; } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ASoC: wm8962: Let CODEC driver enable and disable its own MCLK
by Nicolin Chen 28 Jul '14

28 Jul '14

snd_soc_open() will trigger pm_runtime resume() which will then enable the regulator and initialization. So we should make sure the MCLK is enabled before this resume(). Previously we let the machine driver get the clock and enable it in its probe(). However, considering about power saving, it'll be better to enable it when it's going to be used and disable it after using. So this patch just simply adds clk_get() and clk_enable() to WM8962 driver. Meanwhile, it marks clock pointer to NULL if no clock assigned to it so it will not break any current function. Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- include/sound/wm8962.h | 1 + sound/soc/codecs/wm8962.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h index 79e6d42..0af7c16 100644 --- a/include/sound/wm8962.h +++ b/include/sound/wm8962.h @@ -37,6 +37,7 @@ #define WM8962_GPIO_FN_MICSCD 22 struct wm8962_pdata { + struct clk *mclk; int gpio_base; u32 gpio_init[WM8962_MAX_GPIO]; diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index ca2fda9..256ae51 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> +#include <linux/clk.h> #include <linux/delay.h> #include <linux/pm.h> #include <linux/gcd.h> @@ -3541,6 +3542,8 @@ static int wm8962_set_pdata_from_of(struct i2c_client *i2c, pdata->gpio_init[i] = 0x0; } + pdata->mclk = devm_clk_get(&i2c->dev, NULL); + return 0; } @@ -3572,6 +3575,10 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, return ret; } + /* Mark the mclk pointer to NULL if no mclk assigned */ + if (IS_ERR(pdata->mclk)) + pdata->mclk = NULL; + for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) wm8962->supplies[i].supply = wm8962_supply_names[i]; @@ -3780,6 +3787,8 @@ static int wm8962_runtime_resume(struct device *dev) struct wm8962_priv *wm8962 = dev_get_drvdata(dev); int ret; + clk_prepare_enable(wm8962->pdata.mclk); + ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); if (ret != 0) { @@ -3839,6 +3848,8 @@ static int wm8962_runtime_suspend(struct device *dev) regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); + clk_disable_unprepare(wm8962->pdata.mclk); + return 0; } #endif -- 1.8.4

2 1

[alsa-devel] [PATCH] ASoC: rsnd: Protect register accesses with a spinlock instead of a mutex
by Laurent Pinchart 28 Jul '14

28 Jul '14

The hardware registers are accessed from atomic contexts (the rsnd_soc_dai_trigger function, for instance, is called with the PCM substream spinlock held). They thus can't be protected by a mutex. Protect regmap register accesses with a spinlock instead of a mutex by setting the fast_io flag. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- sound/soc/sh/rcar/gen.c | 1 + 1 file changed, 1 insertion(+) An even better solution might be to use regmap-mmio instead of a custom bus. Morimoto-san, is there anything that would prevent the driver from switching to regmap-mmio ? diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 73ce4c9..ec9ac5e 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -66,6 +66,7 @@ static int rsnd_regmap_read32(void *context, } static struct regmap_bus rsnd_regmap_bus = { + .fast_io = true, .write = rsnd_regmap_write32, .read = rsnd_regmap_read32, .reg_format_endian_default = REGMAP_ENDIAN_NATIVE, -- Regards, Laurent Pinchart

5 7

[alsa-devel] [PATCH] ALSA: firewire: trivial typo fixes in Kconfig
by Stefan Richter 28 Jul '14

28 Jul '14

ESI Quotafire -> QuataFire TerraTec EWS Mic4 -> Mic8 Firewire -> FireWire Signed-off-by: Stefan Richter <stefanr(a)s5r6.in-berlin.de> --- sound/firewire/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index 775ef2efc296..46dff64908c8 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig @@ -83,8 +83,8 @@ config SND_BEBOB * Edirol FA-66/FA-101 * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * BridgeCo RDAudio1/Audio5 - * Mackie Onyx 1220/1620/1640 (Firewire I/O Card) - * Mackie d.2 (Firewire Option) + * Mackie Onyx 1220/1620/1640 (FireWire I/O Card) + * Mackie d.2 (FireWire Option) * Stanton FinalScratch 2 (ScratchAmp) * Tascam IF-FW/DM * Behringer XENIX UFX 1204/1604 @@ -92,7 +92,7 @@ config SND_BEBOB * Apogee Rosetta 200/400 (X-FireWire card) * Apogee DA/AD/DD-16X (X-FireWire card) * Apogee Ensemble - * ESI Quotafire610 + * ESI QuataFire 610 * AcousticReality eARMasterOne * CME MatrixKFW * Phonic Helix Board 12 MkII/18 MkII/24 MkII @@ -101,13 +101,13 @@ config SND_BEBOB * ICON FireXon * PrismSound Orpheus/ADA-8XR * TerraTec PHASE 24 FW/PHASE X24 FW/PHASE 88 Rack FW - * Terratec EWS MIC2/EWS MIC4 - * Terratec Aureon 7.1 Firewire + * TerraTec EWS MIC2/EWS MIC8 + * TerraTec Aureon 7.1 FireWire * Yamaha GO44/GO46 * Focusrite Saffire/Saffire LE/SaffirePro10 IO/SaffirePro26 IO - * M-Audio Firewire410/AudioPhile/Solo + * M-Audio FireWire410/AudioPhile/Solo * M-Audio Ozonic/NRV10/ProfireLightBridge - * M-Audio Firewire 1814/ProjectMix IO + * M-Audio FireWire 1814/ProjectMix IO To compile this driver as a module, choose M here: the module will be called snd-bebob. -- Stefan Richter -=====-====- -=== ==-=- http://arcgraph.de/sr/

3 2

[alsa-devel] [PATCH] ASoC: ak4642: Make of_device_id array const
by Kiran Padwal 26 Jul '14

26 Jul '14

Make of_device_id array const, because all OF functions handle it as const Signed-off-by: Kiran Padwal <kiran.padwal21(a)gmail.com> --- sound/soc/codecs/ak4642.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 3ba4c0f..4b2ae61 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -593,7 +593,7 @@ static int ak4642_i2c_remove(struct i2c_client *client) return 0; } -static struct of_device_id ak4642_of_match[] = { +static const struct of_device_id ak4642_of_match[] = { { .compatible = "asahi-kasei,ak4642", .data = &ak4642_drvdata}, { .compatible = "asahi-kasei,ak4643", .data = &ak4643_drvdata}, { .compatible = "asahi-kasei,ak4648", .data = &ak4648_drvdata}, -- 1.7.9.5

2 3

[alsa-devel] [PATCH] ASoC: tlv320aic31xx: Do not ignore errors in aic31xx_device_init()
by Peter Ujfalusi 25 Jul '14

25 Jul '14

We need to return the error codes from aic31xx_device_init() and return from the i2c_probe with the error code. We will have kernel panic (NULL pointer dereference) in regulator_register_notifier() in case the devm_regulator_bulk_get() fails (with -EPROBE_DEFER for example). Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Mark, Would it be possible to get this patch into 3.16? Thanks, Peter sound/soc/codecs/tlv320aic31xx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 539d1dd3c5e6..095f4556ab1b 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1179,7 +1179,7 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) } #endif /* CONFIG_OF */ -static void aic31xx_device_init(struct aic31xx_priv *aic31xx) +static int aic31xx_device_init(struct aic31xx_priv *aic31xx) { int ret, i; @@ -1198,7 +1198,7 @@ static void aic31xx_device_init(struct aic31xx_priv *aic31xx) "aic31xx-reset-pin"); if (ret < 0) { dev_err(aic31xx->dev, "not able to acquire gpio\n"); - return; + return ret; } } @@ -1211,6 +1211,7 @@ static void aic31xx_device_init(struct aic31xx_priv *aic31xx) if (ret != 0) dev_err(aic31xx->dev, "Failed to request supplies: %d\n", ret); + return ret; } static int aic31xx_i2c_probe(struct i2c_client *i2c, @@ -1240,7 +1241,9 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, aic31xx->pdata.codec_type = id->driver_data; - aic31xx_device_init(aic31xx); + ret = aic31xx_device_init(aic31xx); + if (ret) + return ret; return snd_soc_register_codec(&i2c->dev, &soc_codec_driver_aic31xx, aic31xx_dai_driver, -- 2.0.2

2 1