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

[alsa-devel] [PATCH] ASoC: ttc_dkb: add .owner to struct snd_soc_card
by Wei Yongjun 02 Jul '13

02 Jul '13

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Add missing .owner of struct snd_soc_card. This prevents the module from being removed from underneath its users. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/pxa/ttc-dkb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index f4ea4f6..13c9ee0 100644 --- a/sound/soc/pxa/ttc-dkb.c +++ b/sound/soc/pxa/ttc-dkb.c @@ -122,6 +122,7 @@ static struct snd_soc_dai_link ttc_pm860x_hifi_dai[] = { /* ttc/td audio machine driver */ static struct snd_soc_card ttc_dkb_card = { .name = "ttc-dkb-hifi", + .owner = THIS_MODULE, .dai_link = ttc_pm860x_hifi_dai, .num_links = ARRAY_SIZE(ttc_pm860x_hifi_dai),

2 1

[alsa-devel] [PATCH] ASoC: brownstone: add .owner to struct snd_soc_card
by Wei Yongjun 02 Jul '13

02 Jul '13

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Add missing .owner of struct snd_soc_card. This prevents the module from being removed from underneath its users. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/pxa/brownstone.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 4ad7609..e582c05 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -129,6 +129,7 @@ static struct snd_soc_dai_link brownstone_wm8994_dai[] = { /* audio machine driver */ static struct snd_soc_card brownstone = { .name = "brownstone", + .owner = THIS_MODULE, .dai_link = brownstone_wm8994_dai, .num_links = ARRAY_SIZE(brownstone_wm8994_dai),

2 1

[alsa-devel] [PATCH 1/2] mfd: arizona: Add GPIO control register bit definitions
by Charles Keepax 02 Jul '13

02 Jul '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- include/linux/mfd/arizona/registers.h | 35 +++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index 715b6ba..522798d 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h @@ -4131,6 +4131,41 @@ #define ARIZONA_SLIMTX1_PORT_STS_WIDTH 1 /* SLIMTX1_PORT_STS */ /* + * R3072 - R3076 (0xC00 - 0xC04) ARIZONA_GPIO1_CTRL - ARIZONA_GPIO5_CTRL + */ +#define ARIZONA_GPN_DIR 0x8000 /* GPN_DIR */ +#define ARIZONA_GPN_DIR_MASK 0x8000 /* GPN_DIR */ +#define ARIZONA_GPN_DIR_SHIFT 15 /* GPN_DIR */ +#define ARIZONA_GPN_DIR_WIDTH 1 /* GPN_DIR */ +#define ARIZONA_GPN_PU 0x4000 /* GPN_PU */ +#define ARIZONA_GPN_PU_MASK 0x4000 /* GPN_PU */ +#define ARIZONA_GPN_PU_SHIFT 14 /* GPN_PU */ +#define ARIZONA_GPN_PU_WIDTH 1 /* GPN_PU */ +#define ARIZONA_GPN_PD 0x2000 /* GPN_PD */ +#define ARIZONA_GPN_PD_MASK 0x2000 /* GPN_PD */ +#define ARIZONA_GPN_PD_SHIFT 13 /* GPN_PD */ +#define ARIZONA_GPN_PD_WIDTH 1 /* GPN_PD */ +#define ARIZONA_GPN_LVL 0x0800 /* GPN_LVL */ +#define ARIZONA_GPN_LVL_MASK 0x0800 /* GPN_LVL */ +#define ARIZONA_GPN_LVL_SHIFT 11 /* GPN_LVL */ +#define ARIZONA_GPN_LVL_WIDTH 1 /* GPN_LVL */ +#define ARIZONA_GPN_POL 0x0400 /* GPN_POL */ +#define ARIZONA_GPN_POL_MASK 0x0400 /* GPN_POL */ +#define ARIZONA_GPN_POL_SHIFT 10 /* GPN_POL */ +#define ARIZONA_GPN_POL_WIDTH 1 /* GPN_POL */ +#define ARIZONA_GPN_OP_CFG 0x0200 /* GPN_OP_CFG */ +#define ARIZONA_GPN_OP_CFG_MASK 0x0200 /* GPN_OP_CFG */ +#define ARIZONA_GPN_OP_CFG_SHIFT 9 /* GPN_OP_CFG */ +#define ARIZONA_GPN_OP_CFG_WIDTH 1 /* GPN_OP_CFG */ +#define ARIZONA_GPN_DB 0x0100 /* GPN_DB */ +#define ARIZONA_GPN_DB_MASK 0x0100 /* GPN_DB */ +#define ARIZONA_GPN_DB_SHIFT 8 /* GPN_DB */ +#define ARIZONA_GPN_DB_WIDTH 1 /* GPN_DB */ +#define ARIZONA_GPN_FN_MASK 0x007F /* GPN_DB */ +#define ARIZONA_GPN_FN_SHIFT 0 /* GPN_DB */ +#define ARIZONA_GPN_FN_WIDTH 7 /* GPN_DB */ + +/* * R3087 (0xC0F) - IRQ CTRL 1 */ #define ARIZONA_IRQ_POL 0x0400 /* IRQ_POL */ -- 1.7.2.5

2 4

[alsa-devel] [PATCH] ASoC: samsung: Remove obsolete GPIO based DT pinmuxing
by Mark Brown 02 Jul '13

02 Jul '13

From: Mark Brown <broonie(a)linaro.org> Since the Samsung platforms have moved to pinctrl for pin muxing and that is handled in the core the old GPIO based muxing code can just be removed. Something similar had been submitted by Thomas Abraham back in March but a resubmission following review never happened. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/samsung/i2s.c | 66 +++---------------------------------------------- 1 file changed, 4 insertions(+), 62 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 82ebb1a..7a17346 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1016,52 +1016,6 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) return i2s; } -#ifdef CONFIG_OF -static int samsung_i2s_parse_dt_gpio(struct i2s_dai *i2s) -{ - struct device *dev = &i2s->pdev->dev; - int index, gpio, ret; - - for (index = 0; index < 7; index++) { - gpio = of_get_gpio(dev->of_node, index); - if (!gpio_is_valid(gpio)) { - dev_err(dev, "invalid gpio[%d]: %d\n", index, gpio); - goto free_gpio; - } - - ret = gpio_request(gpio, dev_name(dev)); - if (ret) { - dev_err(dev, "gpio [%d] request failed\n", gpio); - goto free_gpio; - } - i2s->gpios[index] = gpio; - } - return 0; - -free_gpio: - while (--index >= 0) - gpio_free(i2s->gpios[index]); - return -EINVAL; -} - -static void samsung_i2s_dt_gpio_free(struct i2s_dai *i2s) -{ - unsigned int index; - for (index = 0; index < 7; index++) - gpio_free(i2s->gpios[index]); -} -#else -static int samsung_i2s_parse_dt_gpio(struct i2s_dai *dai) -{ - return -EINVAL; -} - -static void samsung_i2s_dt_gpio_free(struct i2s_dai *dai) -{ -} - -#endif - static const struct of_device_id exynos_i2s_match[]; static inline int samsung_i2s_get_driver_data(struct platform_device *pdev) @@ -1235,18 +1189,10 @@ static int samsung_i2s_probe(struct platform_device *pdev) pri_dai->sec_dai = sec_dai; } - if (np) { - if (samsung_i2s_parse_dt_gpio(pri_dai)) { - dev_err(&pdev->dev, "Unable to configure gpio\n"); - ret = -EINVAL; - goto err; - } - } else { - if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { - dev_err(&pdev->dev, "Unable to configure gpio\n"); - ret = -EINVAL; - goto err; - } + if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { + dev_err(&pdev->dev, "Unable to configure gpio\n"); + ret = -EINVAL; + goto err; } snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component, @@ -1267,14 +1213,10 @@ static int samsung_i2s_remove(struct platform_device *pdev) { struct i2s_dai *i2s, *other; struct resource *res; - struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data; i2s = dev_get_drvdata(&pdev->dev); other = i2s->pri_dai ? : i2s->sec_dai; - if (!i2s_pdata->cfg_gpio && pdev->dev.of_node) - samsung_i2s_dt_gpio_free(i2s->pri_dai); - if (other) { other->pri_dai = NULL; other->sec_dai = NULL; -- 1.8.3.1

1 0

[alsa-devel] Multiple DA9055 chips
by Mark Brown 02 Jul '13

02 Jul '13

It seems we have two drivers in mainline for da9055 on I2C. We've got one in sound/soc/codecs/da9055.c and one in drivers/mfd/da9055-i2c.c, both registering themselves identically. What's going on here? Is this a combined CODEC and PMIC, has someone decided to release two chips with the same name or is one of the drivers misnamed?

2 5

[alsa-devel] [PATCH] ASoC: adav80x: Add module device table for adav801
by Axel Lin 02 Jul '13

02 Jul '13

This driver can be built as module, thus add module device table for adav801 to support module auto loading. To make the naming consistent, also rename adav80x_id to adav80x_i2c_id. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/adav80x.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 3c839cc..15b012d0 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -868,6 +868,12 @@ static int adav80x_bus_remove(struct device *dev) } #if defined(CONFIG_SPI_MASTER) +static const struct spi_device_id adav80x_spi_id[] = { + { "adav801", 0 }, + { } +}; +MODULE_DEVICE_TABLE(spi, adav80x_spi_id); + static int adav80x_spi_probe(struct spi_device *spi) { return adav80x_bus_probe(&spi->dev, SND_SOC_SPI); @@ -885,15 +891,16 @@ static struct spi_driver adav80x_spi_driver = { }, .probe = adav80x_spi_probe, .remove = adav80x_spi_remove, + .id_table = adav80x_spi_id, }; #endif #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) -static const struct i2c_device_id adav80x_id[] = { +static const struct i2c_device_id adav80x_i2c_id[] = { { "adav803", 0 }, { } }; -MODULE_DEVICE_TABLE(i2c, adav80x_id); +MODULE_DEVICE_TABLE(i2c, adav80x_i2c_id); static int adav80x_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) @@ -913,7 +920,7 @@ static struct i2c_driver adav80x_i2c_driver = { }, .probe = adav80x_i2c_probe, .remove = adav80x_i2c_remove, - .id_table = adav80x_id, + .id_table = adav80x_i2c_id, }; #endif -- 1.8.1.2

3 2

[alsa-devel] [PATCH] ASOC: pcm: support fe dapm widget derived from codec_dai
by Nenghua Cao 02 Jul '13

02 Jul '13

From: nhcao <nhcao(a)marvell.com> In some chips, the codec_dai in cpu is abstracted as one dapm widget. Enhance the framework to use codec_dai as fe widget. Change-Id: I1b545bd1e2f24288f4508a7c6d4efbcfe1e03c5b Signed-off-by: nhcao <nhcao(a)marvell.com> --- sound/soc/soc-pcm.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 73bb8ee..6ca23d7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -856,17 +856,37 @@ static int widget_in_list(struct snd_soc_dapm_widget_list *list, static int dpcm_path_get(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dapm_widget_list **list_) { - struct snd_soc_dai *cpu_dai = fe->cpu_dai; + struct snd_soc_dai *dai = fe->cpu_dai ; struct snd_soc_dapm_widget_list *list; int paths; + if (stream == SNDRV_PCM_STREAM_PLAYBACK) { + if (fe->cpu_dai->playback_widget) { + dai = fe->cpu_dai; + } else if (fe->codec_dai->playback_widget) { + dai = fe->codec_dai; + } else { + dev_err(fe->dev, "ASoC: can't find the correspond playback_widget for the dai\n"); + return -EINVAL; + } + } else if (stream == SNDRV_PCM_STREAM_CAPTURE) { + if (fe->cpu_dai->capture_widget) { + dai = fe->cpu_dai; + } else if (fe->codec_dai->capture_widget) { + dai = fe->codec_dai; + } else { + dev_err(fe->dev, "ASoC: can't find the correspond capture_widget for the dai\n"); + return -EINVAL; + } + } + list = kzalloc(sizeof(struct snd_soc_dapm_widget_list) + sizeof(struct snd_soc_dapm_widget *), GFP_KERNEL); if (list == NULL) return -ENOMEM; /* get number of valid DAI paths and their widgets */ - paths = snd_soc_dapm_dai_get_connected_widgets(cpu_dai, stream, &list); + paths = snd_soc_dapm_dai_get_connected_widgets(dai, stream, &list); dev_dbg(fe->dev, "ASoC: found %d audio %s paths\n", paths, stream ? "capture" : "playback"); -- 1.7.0.4

1 0

[alsa-devel] [PATCH 0/2] ASoC: atmel-pcm: use generic dmaengine framework
by Bo Shen 02 Jul '13

02 Jul '13

this patch series is based on next-20130701 Bo Shen (2): ASoC: atmel_ssc_dai: move set dma data to startup callback ASoC: atmel-pcm: use generic dmaengine framework sound/soc/atmel/atmel-pcm-dma.c | 118 ++++++--------------------------------- sound/soc/atmel/atmel_ssc_dai.c | 33 ++++++----- 2 files changed, 32 insertions(+), 119 deletions(-) -- 1.7.9.5

1 2

[alsa-devel] [PATCH] ASoC: wm8994: Move runtime PM init to platform device init
by Mark Brown 01 Jul '13

01 Jul '13

From: Mark Brown <broonie(a)linaro.org> As well as being better style this allows the device to idle when there is no audio card instantaited which is probably what we want. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/wm8994.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1d4b1ec..02c320f 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -4014,9 +4014,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) wm8994->micdet_irq = control->pdata.micdet_irq; - pm_runtime_enable(codec->dev); - pm_runtime_idle(codec->dev); - /* By default use idle_bias_off, will override for WM8994 */ codec->dapm.idle_bias_off = 1; @@ -4389,8 +4386,6 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) wm8994_set_bias_level(codec, SND_SOC_BIAS_OFF); - pm_runtime_disable(codec->dev); - for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++) wm8994_free_irq(wm8994->wm8994, WM8994_IRQ_FLL1_LOCK + i, &wm8994->fll_locked[i]); @@ -4449,6 +4444,9 @@ static int wm8994_probe(struct platform_device *pdev) wm8994->wm8994 = dev_get_drvdata(pdev->dev.parent); + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8994, wm8994_dai, ARRAY_SIZE(wm8994_dai)); } @@ -4456,6 +4454,8 @@ static int wm8994_probe(struct platform_device *pdev) static int wm8994_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); + pm_runtime_disable(&pdev->dev); + return 0; } -- 1.8.3.1

1 0

[alsa-devel] [PATCH 0/4] Fix mxs audio regressions
by Shawn Guo 01 Jul '13

01 Jul '13

The mxs audio got terribly broken during 3.11 development cycle due to the following two commits. af8ee11 ASoC: sgtl5000: Fix driver probe after reset 9e13f34 ASoC: sgtl5000: Let the codec acquire its clock The series fixes the regressions and bring mxs audio back to work. Mark, Please consider to take the whole series as fixes through your tree during 3.11-rc, so that we do not get a regression in the final v3.11 release. Shawn Shawn Guo (4): ASoC: sgtl5000: give it a ramping time before writting ASoC: sgtl5000: defer the probe if clock is not found ASoC: mxs: register saif mclk to clock framework ARM: mxs: saif0 is the clock provider to sgtl5000 arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +- arch/arm/boot/dts/imx28-evk.dts | 2 +- arch/arm/boot/dts/imx28-m28evk.dts | 2 +- arch/arm/boot/dts/imx28.dtsi | 1 + sound/soc/codecs/sgtl5000.c | 10 ++++++++- sound/soc/mxs/mxs-saif.c | 35 ++++++++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 4 deletions(-) -- 1.7.9.5

7 24