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

[alsa-devel] [PATCH 0/4] ASoC: twl6040: Fixes and updates
by Peter Ujfalusi 27 Jun '13

27 Jun '13

Hi, Updates for the twl6040 codec: - Fix soc probe when the machine driver is removed and loaded again without removing the codec driver (was failing since the IRQ has been already requested) - Playback pop noise reduction on stream start and stop with implementing the digital_mute callback and related tracking of the mute for different paths. Regards, Peter --- Peter Ujfalusi (4): ASoC: twl6040: Drop using devm_request_threaded_irq() MFD: twl6040: Update register bit definitions ASoC: twl6040: Assign id for each DAI ASoC: twl6040: Add digital mute support include/linux/mfd/twl6040.h | 7 +++ sound/soc/codecs/twl6040.c | 109 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 2 deletions(-) -- 1.8.2.1

3 8

[alsa-devel] [PATCH] ASoC: ac97: Support multi-platform AC'97
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Currently we can only have a single platform built in with AC'97 support due to the use of a global variable to provide the bus operations. Fix this by making that variable a pointer and having the bus drivers set the operations prior to registering. This is not a particularly good or nice approach but it avoids blocking multiplatform and a real fix involves fixing the fairly deep problems with AC'97 support - we should be converting it to a real bus. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- include/sound/soc.h | 4 +++- sound/soc/au1x/ac97c.c | 7 +++++-- sound/soc/au1x/psc-ac97.c | 7 +++++-- sound/soc/blackfin/bf5xx-ac97.c | 11 +++++++++-- sound/soc/cirrus/ep93xx-ac97.c | 10 ++++++++-- sound/soc/codecs/ac97.c | 7 ++++--- sound/soc/codecs/ad1980.c | 12 ++++++------ sound/soc/codecs/stac9766.c | 22 +++++++++++----------- sound/soc/codecs/wm9705.c | 14 +++++++------- sound/soc/codecs/wm9712.c | 18 +++++++++--------- sound/soc/codecs/wm9713.c | 18 +++++++++--------- sound/soc/fsl/imx-ssi.c | 11 +++++++++-- sound/soc/fsl/mpc5200_psc_ac97.c | 10 ++++++++-- sound/soc/nuc900/nuc900-ac97.c | 11 ++++++++--- sound/soc/pxa/pxa2xx-ac97.c | 8 ++++++-- sound/soc/samsung/ac97.c | 12 +++++++++--- sound/soc/sh/hac.c | 8 ++++++-- sound/soc/soc-core.c | 16 ++++++++++++++++ sound/soc/tegra/tegra20_ac97.c | 12 ++++++++++-- sound/soc/txx9/txx9aclc-ac97.c | 8 ++++++-- 20 files changed, 154 insertions(+), 72 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 85c1522..6eabee7 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -340,7 +340,7 @@ struct snd_soc_jack_gpio; typedef int (*hw_write_t)(void *,const char* ,int); -extern struct snd_ac97_bus_ops soc_ac97_ops; +extern struct snd_ac97_bus_ops *soc_ac97_ops; enum snd_soc_control_type { SND_SOC_I2C = 1, @@ -467,6 +467,8 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, struct snd_ac97_bus_ops *ops, int num); void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); +int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops); + /* *Controls */ diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index a51dabe..d6f7694 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -179,13 +179,12 @@ static void au1xac97c_ac97_cold_reset(struct snd_ac97 *ac97) } /* AC97 controller operations */ -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops ac97c_bus_ops = { .read = au1xac97c_ac97_read, .write = au1xac97c_ac97_write, .reset = au1xac97c_ac97_cold_reset, .warm_reset = au1xac97c_ac97_warm_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); /* globals be gone! */ static int alchemy_ac97c_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) @@ -272,6 +271,10 @@ static int au1xac97c_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); + ret = snd_soc_set_ac97_ops(&ac97c_bus_ops); + if (ret) + return ret; + ret = snd_soc_register_component(&pdev->dev, &au1xac97c_component, &au1xac97c_dai_driver, 1); if (ret) diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index a97ba13..a822ab8 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -201,13 +201,12 @@ static void au1xpsc_ac97_cold_reset(struct snd_ac97 *ac97) } /* AC97 controller operations */ -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops psc_ac97_ops = { .read = au1xpsc_ac97_read, .write = au1xpsc_ac97_write, .reset = au1xpsc_ac97_cold_reset, .warm_reset = au1xpsc_ac97_warm_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, @@ -417,6 +416,10 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, wd); + ret = snd_soc_set_ac97_ops(&psc_ac97_ops); + if (ret) + return ret; + ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component, &wd->dai_drv, 1); if (ret) diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 8010f32..efb1dae 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -198,13 +198,12 @@ static void bf5xx_ac97_cold_reset(struct snd_ac97 *ac97) #endif } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops bf5xx_ac97_ops = { .read = bf5xx_ac97_read, .write = bf5xx_ac97_write, .warm_reset = bf5xx_ac97_warm_reset, .reset = bf5xx_ac97_cold_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); #ifdef CONFIG_PM static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) @@ -336,6 +335,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) goto sport_config_err; } + ret = snd_soc_set_ac97_ops(&bf5xx_ac97_ops); + if (ret != 0) { + dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret); + goto sport_config_err; + } + ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component, &bfin_ac97_dai, 1); if (ret) { @@ -350,6 +355,7 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) sport_config_err: sport_done(sport_handle); sport_err: + snd_soc_set_ac97_ops(NULL); return ret; } @@ -360,6 +366,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index f193701..ac73c60 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -237,13 +237,12 @@ static irqreturn_t ep93xx_ac97_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops ep93xx_ac97_ops = { .read = ep93xx_ac97_read, .write = ep93xx_ac97_write, .reset = ep93xx_ac97_cold_reset, .warm_reset = ep93xx_ac97_warm_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int ep93xx_ac97_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) @@ -389,6 +388,10 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) ep93xx_ac97_info = info; platform_set_drvdata(pdev, info); + ret = snd_soc_set_ac97_ops(&ep93xx_ac97_ops); + if (ret) + goto fail; + ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, &ep93xx_ac97_dai, 1); if (ret) @@ -398,6 +401,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) fail: ep93xx_ac97_info = NULL; + snd_soc_set_ac97_ops(NULL); return ret; } @@ -412,6 +416,8 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) ep93xx_ac97_info = NULL; + snd_soc_set_ac97_ops(NULL); + return 0; } diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index ef2ae32..ec73518 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -62,13 +62,13 @@ static struct snd_soc_dai_driver ac97_dai = { static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) { - return soc_ac97_ops.read(codec->ac97, reg); + return soc_ac97_ops->read(codec->ac97, reg); } static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int val) { - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); return 0; } @@ -79,7 +79,8 @@ static int ac97_soc_probe(struct snd_soc_codec *codec) int ret; /* add codec as bus device for standard ac97 */ - ret = snd_ac97_bus(codec->card->snd_card, 0, &soc_ac97_ops, NULL, &ac97_bus); + ret = snd_ac97_bus(codec->card->snd_card, 0, soc_ac97_ops, NULL, + &ac97_bus); if (ret < 0) return ret; diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index f385342..89fcf7d 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -108,7 +108,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, case AC97_EXTENDED_STATUS: case AC97_VENDOR_ID1: case AC97_VENDOR_ID2: - return soc_ac97_ops.read(codec->ac97, reg); + return soc_ac97_ops->read(codec->ac97, reg); default: reg = reg >> 1; @@ -124,7 +124,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, { u16 *cache = codec->reg_cache; - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); reg = reg >> 1; if (reg < ARRAY_SIZE(ad1980_reg)) cache[reg] = val; @@ -154,13 +154,13 @@ static int ad1980_reset(struct snd_soc_codec *codec, int try_warm) u16 retry_cnt = 0; retry: - if (try_warm && soc_ac97_ops.warm_reset) { - soc_ac97_ops.warm_reset(codec->ac97); + if (try_warm && soc_ac97_ops->warm_reset) { + soc_ac97_ops->warm_reset(codec->ac97); if (ac97_read(codec, AC97_RESET) == 0x0090) return 1; } - soc_ac97_ops.reset(codec->ac97); + soc_ac97_ops->reset(codec->ac97); /* Set bit 16slot in register 74h, then every slot will has only 16 * bits. This command is sent out in 20bit mode, in which case the * first nibble of data is eaten by the addr. (Tag is always 16 bit)*/ @@ -186,7 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) printk(KERN_INFO "AD1980 SoC Audio Codec\n"); - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "ad1980: failed to register AC97 codec\n"); return ret; diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index cbc7ae3..a5455c1 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -143,14 +143,14 @@ static int stac9766_ac97_write(struct snd_soc_codec *codec, unsigned int reg, if (reg > AC97_STAC_PAGE0) { stac9766_ac97_write(codec, AC97_INT_PAGING, 0); - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); stac9766_ac97_write(codec, AC97_INT_PAGING, 1); return 0; } if (reg / 2 >= ARRAY_SIZE(stac9766_reg)) return -EIO; - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); cache[reg / 2] = val; return 0; } @@ -162,7 +162,7 @@ static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec, if (reg > AC97_STAC_PAGE0) { stac9766_ac97_write(codec, AC97_INT_PAGING, 0); - val = soc_ac97_ops.read(codec->ac97, reg - AC97_STAC_PAGE0); + val = soc_ac97_ops->read(codec->ac97, reg - AC97_STAC_PAGE0); stac9766_ac97_write(codec, AC97_INT_PAGING, 1); return val; } @@ -173,7 +173,7 @@ static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec, reg == AC97_INT_PAGING || reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2) { - val = soc_ac97_ops.read(codec->ac97, reg); + val = soc_ac97_ops->read(codec->ac97, reg); return val; } return cache[reg / 2]; @@ -240,15 +240,15 @@ static int stac9766_set_bias_level(struct snd_soc_codec *codec, static int stac9766_reset(struct snd_soc_codec *codec, int try_warm) { - if (try_warm && soc_ac97_ops.warm_reset) { - soc_ac97_ops.warm_reset(codec->ac97); + if (try_warm && soc_ac97_ops->warm_reset) { + soc_ac97_ops->warm_reset(codec->ac97); if (stac9766_ac97_read(codec, 0) == stac9766_reg[0]) return 1; } - soc_ac97_ops.reset(codec->ac97); - if (soc_ac97_ops.warm_reset) - soc_ac97_ops.warm_reset(codec->ac97); + soc_ac97_ops->reset(codec->ac97); + if (soc_ac97_ops->warm_reset) + soc_ac97_ops->warm_reset(codec->ac97); if (stac9766_ac97_read(codec, 0) != stac9766_reg[0]) return -EIO; return 0; @@ -272,7 +272,7 @@ reset: return -EIO; } codec->ac97->bus->ops->warm_reset(codec->ac97); - id = soc_ac97_ops.read(codec->ac97, AC97_VENDOR_ID2); + id = soc_ac97_ops->read(codec->ac97, AC97_VENDOR_ID2); if (id != 0x4c13) { stac9766_reset(codec, 0); reset++; @@ -336,7 +336,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec) { int ret = 0; - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0); if (ret < 0) goto codec_err; diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index a5fc61d..70ce6793 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -209,7 +209,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) case AC97_RESET: case AC97_VENDOR_ID1: case AC97_VENDOR_ID2: - return soc_ac97_ops.read(codec->ac97, reg); + return soc_ac97_ops->read(codec->ac97, reg); default: reg = reg >> 1; @@ -225,7 +225,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, { u16 *cache = codec->reg_cache; - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); reg = reg >> 1; if (reg < (ARRAY_SIZE(wm9705_reg))) cache[reg] = val; @@ -294,8 +294,8 @@ static struct snd_soc_dai_driver wm9705_dai[] = { static int wm9705_reset(struct snd_soc_codec *codec) { - if (soc_ac97_ops.reset) { - soc_ac97_ops.reset(codec->ac97); + if (soc_ac97_ops->reset) { + soc_ac97_ops->reset(codec->ac97); if (ac97_read(codec, 0) == wm9705_reg[0]) return 0; /* Success */ } @@ -306,7 +306,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) #ifdef CONFIG_PM static int wm9705_soc_suspend(struct snd_soc_codec *codec) { - soc_ac97_ops.write(codec->ac97, AC97_POWERDOWN, 0xffff); + soc_ac97_ops->write(codec->ac97, AC97_POWERDOWN, 0xffff); return 0; } @@ -323,7 +323,7 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec) } for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) { - soc_ac97_ops.write(codec->ac97, i, cache[i>>1]); + soc_ac97_ops->write(codec->ac97, i, cache[i>>1]); } return 0; @@ -337,7 +337,7 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) { int ret = 0; - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "wm9705: failed to register AC97 codec\n"); return ret; diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 8e9a6a3..c5eb746 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -455,7 +455,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || reg == AC97_REC_GAIN) - return soc_ac97_ops.read(codec->ac97, reg); + return soc_ac97_ops->read(codec->ac97, reg); else { reg = reg >> 1; @@ -472,7 +472,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, u16 *cache = codec->reg_cache; if (reg < 0x7c) - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); reg = reg >> 1; if (reg < (ARRAY_SIZE(wm9712_reg))) cache[reg] = val; @@ -581,15 +581,15 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec, static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) { - if (try_warm && soc_ac97_ops.warm_reset) { - soc_ac97_ops.warm_reset(codec->ac97); + if (try_warm && soc_ac97_ops->warm_reset) { + soc_ac97_ops->warm_reset(codec->ac97); if (ac97_read(codec, 0) == wm9712_reg[0]) return 1; } - soc_ac97_ops.reset(codec->ac97); - if (soc_ac97_ops.warm_reset) - soc_ac97_ops.warm_reset(codec->ac97); + soc_ac97_ops->reset(codec->ac97); + if (soc_ac97_ops->warm_reset) + soc_ac97_ops->warm_reset(codec->ac97); if (ac97_read(codec, 0) != wm9712_reg[0]) goto err; return 0; @@ -624,7 +624,7 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec) if (i == AC97_INT_PAGING || i == AC97_POWERDOWN || (i > 0x58 && i != 0x5c)) continue; - soc_ac97_ops.write(codec->ac97, i, cache[i>>1]); + soc_ac97_ops->write(codec->ac97, i, cache[i>>1]); } } @@ -635,7 +635,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) { int ret = 0; - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "wm9712: failed to register AC97 codec\n"); return ret; diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index f7afa68..a53e175 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -652,7 +652,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || reg == AC97_CD) - return soc_ac97_ops.read(codec->ac97, reg); + return soc_ac97_ops->read(codec->ac97, reg); else { reg = reg >> 1; @@ -668,7 +668,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, { u16 *cache = codec->reg_cache; if (reg < 0x7c) - soc_ac97_ops.write(codec->ac97, reg, val); + soc_ac97_ops->write(codec->ac97, reg, val); reg = reg >> 1; if (reg < (ARRAY_SIZE(wm9713_reg))) cache[reg] = val; @@ -1095,15 +1095,15 @@ static struct snd_soc_dai_driver wm9713_dai[] = { int wm9713_reset(struct snd_soc_codec *codec, int try_warm) { - if (try_warm && soc_ac97_ops.warm_reset) { - soc_ac97_ops.warm_reset(codec->ac97); + if (try_warm && soc_ac97_ops->warm_reset) { + soc_ac97_ops->warm_reset(codec->ac97); if (ac97_read(codec, 0) == wm9713_reg[0]) return 1; } - soc_ac97_ops.reset(codec->ac97); - if (soc_ac97_ops.warm_reset) - soc_ac97_ops.warm_reset(codec->ac97); + soc_ac97_ops->reset(codec->ac97); + if (soc_ac97_ops->warm_reset) + soc_ac97_ops->warm_reset(codec->ac97); if (ac97_read(codec, 0) != wm9713_reg[0]) return -EIO; return 0; @@ -1180,7 +1180,7 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) if (i == AC97_POWERDOWN || i == AC97_EXTENDED_MID || i == AC97_EXTENDED_MSTATUS || i > 0x66) continue; - soc_ac97_ops.write(codec->ac97, i, cache[i>>1]); + soc_ac97_ops->write(codec->ac97, i, cache[i>>1]); } } @@ -1197,7 +1197,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) return -ENOMEM; snd_soc_codec_set_drvdata(codec, wm9713); - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0); if (ret < 0) goto codec_err; diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index a8362be..51be377 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -501,13 +501,12 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) imx_ssi_ac97_read(ac97, 0); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops imx_ssi_ac97_ops = { .read = imx_ssi_ac97_read, .write = imx_ssi_ac97_write, .reset = imx_ssi_ac97_reset, .warm_reset = imx_ssi_ac97_warm_reset }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int imx_ssi_probe(struct platform_device *pdev) { @@ -583,6 +582,12 @@ static int imx_ssi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ssi); + ret = snd_soc_set_ac97_ops(&imx_ssi_ac97_ops); + if (ret != 0) { + dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret); + goto failed_register; + } + ret = snd_soc_register_component(&pdev->dev, &imx_component, dai, 1); if (ret) { @@ -608,6 +613,7 @@ failed_register: release_mem_region(res->start, resource_size(res)); clk_disable_unprepare(ssi->clk); failed_clk: + snd_soc_set_ac97_ops(NULL); return ret; } @@ -627,6 +633,7 @@ static int imx_ssi_remove(struct platform_device *pdev) release_mem_region(res->start, resource_size(res)); clk_disable_unprepare(ssi->clk); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 4141b35..3ef7a0c 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -131,13 +131,12 @@ static void psc_ac97_cold_reset(struct snd_ac97 *ac97) psc_ac97_warm_reset(ac97); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops psc_ac97_ops = { .read = psc_ac97_read, .write = psc_ac97_write, .reset = psc_ac97_cold_reset, .warm_reset = psc_ac97_warm_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int psc_ac97_hw_analog_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, @@ -290,6 +289,12 @@ static int psc_ac97_of_probe(struct platform_device *op) if (rc != 0) return rc; + rc = snd_soc_set_ac97_ops(&psc_ac97_ops); + if (rc != 0) { + dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", ret); + return rc; + } + rc = snd_soc_register_component(&op->dev, &psc_ac97_component, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); if (rc != 0) { @@ -318,6 +323,7 @@ static int psc_ac97_of_remove(struct platform_device *op) { mpc5200_audio_dma_destroy(op); snd_soc_unregister_component(&op->dev); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 8dea4c1..f4c2417 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -197,13 +197,12 @@ static void nuc900_ac97_cold_reset(struct snd_ac97 *ac97) } /* AC97 controller operations */ -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops nuc900_ac97_ops = { .read = nuc900_ac97_read, .write = nuc900_ac97_write, .reset = nuc900_ac97_cold_reset, .warm_reset = nuc900_ac97_warm_reset, -} -EXPORT_SYMBOL_GPL(soc_ac97_ops); +}; static int nuc900_ac97_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) @@ -356,6 +355,10 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) nuc900_ac97_data = nuc900_audio; + ret = snd_soc_set_ac97_ops(&nuc900_ac97_ops); + if (ret) + goto out; + ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component, &nuc900_ac97_dai, 1); if (ret) @@ -367,6 +370,7 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) return 0; out: + snd_soc_set_ac97_ops(NULL); return ret; } @@ -375,6 +379,7 @@ static int nuc900_ac97_drvremove(struct platform_device *pdev) snd_soc_unregister_component(&pdev->dev); nuc900_ac97_data = NULL; + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 57ea8e6..a3c22ba 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -41,13 +41,12 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97) pxa2xx_ac97_finish_reset(ac97); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { .read = pxa2xx_ac97_read, .write = pxa2xx_ac97_write, .warm_reset = pxa2xx_ac97_warm_reset, .reset = pxa2xx_ac97_cold_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = { .name = "AC97 PCM Stereo out", @@ -244,6 +243,10 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) return -ENXIO; } + ret = snd_soc_set_ac97_ops(&pxa2xx_ac97_ops); + if (ret != 0) + return ret; + /* Punt most of the init to the SoC probe; we may need the machine * driver to do interesting things with the clocking to get us up * and running. @@ -255,6 +258,7 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { snd_soc_unregister_component(&pdev->dev); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 04d7fd4..2dd623f 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -214,13 +214,12 @@ static irqreturn_t s3c_ac97_irq(int irq, void *dev_id) return IRQ_HANDLED; } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops s3c_ac97_ops = { .read = s3c_ac97_read, .write = s3c_ac97_write, .warm_reset = s3c_ac97_warm_reset, .reset = s3c_ac97_cold_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int s3c_ac97_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, @@ -452,6 +451,12 @@ static int s3c_ac97_probe(struct platform_device *pdev) goto err4; } + ret = snd_soc_set_ac97_ops(&s3c_ac97_ops); + if (ret != 0) { + dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret); + goto err4; + } + ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component, s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai)); if (ret) @@ -472,7 +477,7 @@ err4: err3: clk_disable_unprepare(s3c_ac97.ac97_clk); err2: - + snd_soc_set_ac97_ops(NULL); return ret; } @@ -488,6 +493,7 @@ static int s3c_ac97_remove(struct platform_device *pdev) free_irq(irq_res->start, NULL); clk_disable_unprepare(s3c_ac97.ac97_clk); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index af19f77..0af2e4d 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -227,13 +227,12 @@ static void hac_ac97_coldrst(struct snd_ac97 *ac97) hac_ac97_warmrst(ac97); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops hac_ac97_ops = { .read = hac_ac97_read, .write = hac_ac97_write, .reset = hac_ac97_coldrst, .warm_reset = hac_ac97_warmrst, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static int hac_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, @@ -316,6 +315,10 @@ static const struct snd_soc_component_driver sh4_hac_component = { static int hac_soc_platform_probe(struct platform_device *pdev) { + ret = snd_soc_set_ac97_ops(&hac_ac97_ops); + if (ret != 0) + return ret; + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); } @@ -323,6 +326,7 @@ static int hac_soc_platform_probe(struct platform_device *pdev) static int hac_soc_platform_remove(struct platform_device *pdev) { snd_soc_unregister_component(&pdev->dev); + snd_soc_set_ac97_ops(NULL); return 0; } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4489c5b..309e5c9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2080,6 +2080,22 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, } EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec); +struct snd_ac97_bus_ops *soc_ac97_ops; + +int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops) +{ + if (ops == soc_ac97_ops) + return 0; + + if (soc_ac97_ops && ops) + return -EBUSY; + + soc_ac97_ops = ops; + + return 0; +} +EXPORT_SYMBOL_GPL(snd_soc_set_ac97_ops); + /** * snd_soc_free_ac97_codec - free AC97 codec device * @codec: audio codec diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 48037f7..f52eab6 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -142,13 +142,12 @@ static void tegra20_ac97_codec_write(struct snd_ac97 *ac97_snd, } while (!time_after(jiffies, timeout)); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops tegra20_ac97_ops = { .read = tegra20_ac97_codec_read, .write = tegra20_ac97_codec_write, .reset = tegra20_ac97_codec_reset, .warm_reset = tegra20_ac97_codec_warm_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static inline void tegra20_ac97_start_playback(struct tegra20_ac97 *ac97) { @@ -409,6 +408,12 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) goto err_asoc_utils_fini; } + ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops); + if (ret) { + dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret); + goto err_asoc_utils_fini; + } + ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, &tegra20_ac97_dai, 1); if (ret) { @@ -436,6 +441,7 @@ err_asoc_utils_fini: tegra_asoc_utils_fini(&ac97->util_data); err_clk_put: err: + snd_soc_set_ac97_ops(NULL); return ret; } @@ -450,6 +456,8 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev) clk_disable_unprepare(ac97->clk_ac97); + snd_soc_set_ac97_ops(NULL); + return 0; } diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 8ee8d42..4bcce8a 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -119,12 +119,11 @@ static void txx9aclc_ac97_cold_reset(struct snd_ac97 *ac97) } /* AC97 controller operations */ -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops txx9aclc_ac97_ops = { .read = txx9aclc_ac97_read, .write = txx9aclc_ac97_write, .reset = txx9aclc_ac97_cold_reset, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); static irqreturn_t txx9aclc_ac97_irq(int irq, void *dev_id) { @@ -206,6 +205,10 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (err < 0) return err; + err = snd_soc_set_ac97_ops(&txx9aclc_ac97_ops); + if (err < 0) + return err; + return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component, &txx9aclc_ac97_dai, 1); } @@ -213,6 +216,7 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) static int txx9aclc_ac97_dev_remove(struct platform_device *pdev) { snd_soc_unregister_component(&pdev->dev); + snd_soc_set_ac97_ops(NULL); return 0; } -- 1.8.3.1

3 3

[alsa-devel] [PATCH 1/2] ASoC: tegra20-ac97: Convert to devm_clk_get()
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/tegra/tegra20_ac97.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 2f70ea7..d8c142d 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -327,7 +327,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, ac97); - ac97->clk_ac97 = clk_get(&pdev->dev, NULL); + ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(ac97->clk_ac97)) { dev_err(&pdev->dev, "Can't retrieve ac97 clock\n"); ret = PTR_ERR(ac97->clk_ac97); @@ -443,7 +443,6 @@ err_unregister_pcm: err_unregister_component: snd_soc_unregister_component(&pdev->dev); err_clk_put: - clk_put(ac97->clk_ac97); err: return ret; } @@ -458,7 +457,6 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev) tegra_asoc_utils_fini(&ac97->util_data); clk_disable_unprepare(ac97->clk_ac97); - clk_put(ac97->clk_ac97); return 0; } -- 1.8.3.1

2 2

[alsa-devel] [PATCH] ASoC: tegra-ac97: Do common and clock init prior to component registration
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Otherwise we may instantiate and hence have something try to access the device while it is still completing initialisation. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/tegra/tegra20_ac97.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 9043626d..48037f7 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -395,23 +395,9 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ac97->capture_dma_data.maxburst = 4; ac97->capture_dma_data.slave_id = of_dma[0]; - ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, - &tegra20_ac97_dai, 1); - if (ret) { - dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); - ret = -ENOMEM; - goto err_clk_put; - } - - ret = tegra_pcm_platform_register(&pdev->dev); - if (ret) { - dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_component; - } - ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); if (ret) - goto err_unregister_pcm; + goto err_clk_put; ret = tegra_asoc_utils_set_ac97_rate(&ac97->util_data); if (ret) @@ -423,17 +409,31 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) goto err_asoc_utils_fini; } + ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, + &tegra20_ac97_dai, 1); + if (ret) { + dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); + ret = -ENOMEM; + goto err_asoc_utils_fini; + } + + ret = tegra_pcm_platform_register(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); + goto err_unregister_component; + } + /* XXX: crufty ASoC AC97 API - only one AC97 codec allowed */ workdata = ac97; return 0; -err_asoc_utils_fini: - tegra_asoc_utils_fini(&ac97->util_data); err_unregister_pcm: tegra_pcm_platform_unregister(&pdev->dev); err_unregister_component: snd_soc_unregister_component(&pdev->dev); +err_asoc_utils_fini: + tegra_asoc_utils_fini(&ac97->util_data); err_clk_put: err: return ret; -- 1.8.3.1

2 1

Re: [alsa-devel] [PATCH -next] ASoC: mid-x86: Convert to use devm_* APIs
by Mark Brown 26 Jun '13

26 Jun '13

On Tue, Jun 25, 2013 at 10:16:56AM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > devm_* APIs are device managed and make code simpler. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH] ASoC: Add PCM1681 codec driver.
by Daniel Mack 26 Jun '13

26 Jun '13

On 26.06.2013 15:46, Marek Belisko wrote: > Hi Daniel, > On 06/26/2013 03:16 PM, Daniel Mack wrote: >> Hi Marek, >> >> On 26.06.2013 15:05, Marek Belisko wrote: >>> PCM1681 can be controlled via I2C, SPI or in bootstrap mode. This code add >>> support only for I2C mode. >>> >>> Signed-off-by: Marek Belisko <marek.belisko(a)streamunlimited.com> >>> --- >>> .../devicetree/bindings/sound/ti,pcm1681.txt | 15 + >>> sound/soc/codecs/Kconfig | 4 + >>> sound/soc/codecs/Makefile | 2 + >>> sound/soc/codecs/pcm1681.c | 328 ++++++++++++++++++++ >>> 4 files changed, 349 insertions(+) >>> create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt >>> create mode 100644 sound/soc/codecs/pcm1681.c >>> >>> diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt >>> new file mode 100644 >>> index 0000000..4df1718 >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt >>> @@ -0,0 +1,15 @@ >>> +Texas Instruments PCM1681 8-channel PWM Processor >>> + >>> +Required properties: >>> + >>> + - compatible: Should contain "ti,pcm1681". >>> + - reg: The i2c address. Should contain <0x4c>. >>> + >>> +Examples: >>> + >>> + i2c_bus { >>> + pcm1681@4c { >>> + compatible = "ti,pcm1681"; >>> + reg = <0x4c>; >>> + }; >>> + }; >>> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig >>> index badb6fb..e2daf82 100644 >>> --- a/sound/soc/codecs/Kconfig >>> +++ b/sound/soc/codecs/Kconfig >>> @@ -54,6 +54,7 @@ config SND_SOC_ALL_CODECS >>> select SND_SOC_MC13783 if MFD_MC13XXX >>> select SND_SOC_ML26124 if I2C >>> select SND_SOC_HDMI_CODEC >>> + select SND_SOC_PCM1681 if I2C >>> select SND_SOC_PCM3008 >>> select SND_SOC_RT5631 if I2C >>> select SND_SOC_RT5640 if I2C >>> @@ -292,6 +293,9 @@ config SND_SOC_MAX9850 >>> config SND_SOC_HDMI_CODEC >>> tristate >>> >>> +config SND_SOC_PCM1681 >>> + tristate >>> + >>> config SND_SOC_PCM3008 >>> tristate >>> >>> diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile >>> index 70fd806..4a068d2 100644 >>> --- a/sound/soc/codecs/Makefile >>> +++ b/sound/soc/codecs/Makefile >>> @@ -42,6 +42,7 @@ snd-soc-max9850-objs := max9850.o >>> snd-soc-mc13783-objs := mc13783.o >>> snd-soc-ml26124-objs := ml26124.o >>> snd-soc-hdmi-codec-objs := hdmi.o >>> +snd-soc-pcm1681-objs := pcm1681.o >>> snd-soc-pcm3008-objs := pcm3008.o >>> snd-soc-rt5631-objs := rt5631.o >>> snd-soc-rt5640-objs := rt5640.o >>> @@ -171,6 +172,7 @@ obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o >>> obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o >>> obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o >>> obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o >>> +obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o >>> obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o >>> obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o >>> obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o >>> diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c >>> new file mode 100644 >>> index 0000000..6122fd1 >>> --- /dev/null >>> +++ b/sound/soc/codecs/pcm1681.c >>> @@ -0,0 +1,328 @@ >>> +/* >>> + * PCM1681 ASoC codec driver >>> + * >>> + * Copyright (c) StreamUnlimited GmbH 2013 >>> + * Marek Belisko <marek.belisko(a)streamunlimited.com> >>> + * >>> + * This program is free software; you can redistribute it and/or >>> + * modify it under the terms of the GNU General Public License >>> + * as published by the Free Software Foundation; either version 2 >>> + * of the License, or (at your option) any later version. >>> + * >>> + * 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. >>> + */ >>> + >>> +#include <linux/module.h> >>> +#include <linux/slab.h> >>> +#include <linux/delay.h> >>> +#include <linux/gpio.h> >>> +#include <linux/i2c.h> >>> +#include <linux/regmap.h> >>> +#include <linux/of_device.h> >>> +#include <linux/of_gpio.h> >>> +#include <sound/pcm.h> >>> +#include <sound/pcm_params.h> >>> +#include <sound/soc.h> >>> +#include <sound/tlv.h> >>> + >>> +#define PCM1681_PCM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ >>> + SNDRV_PCM_FMTBIT_S24_LE) >>> + >>> +#define PCM1681_PCM_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | \ >>> + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ >>> + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | \ >>> + SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000) >>> + >>> +#define PCM1681_SOFT_MUTE_ALL 0xff >>> +#define PCM1681_DEEMPH_RATE_MASK 0x18 >>> +#define PCM1681_DEEMPH_MASK 0x01 >>> + >>> +#define PCM1681_ATT_CONTROL(X) (X <= 6 ? X : X + 9) /* Attenuation level */ >>> +#define PCM1681_SOFT_MUTE 0x07 /* Soft mute control register */ >>> +#define PCM1681_DAC_CONTROL 0x08 /* DAC operation control */ >>> +#define PCM1681_FMT_CONTROL 0x09 /* Audio interface data format */ >>> +#define PCM1681_DEEMPH_CONTROL 0x0a /* De-emphasis control */ >>> +#define PCM1681_ZERO_DETECT_STATUS 0x0e /* Zero detect status reg */ >>> + >>> +static const struct reg_default pcm1681_reg_defaults[] = { >>> + { 0x01, 0xff }, >>> + { 0x02, 0xff }, >>> + { 0x03, 0xff }, >>> + { 0x04, 0xff }, >>> + { 0x05, 0xff }, >>> + { 0x06, 0xff }, >>> + { 0x07, 0x00 }, >>> + { 0x08, 0x00 }, >>> + { 0x09, 0x06 }, >>> + { 0x0A, 0x00 }, >>> + { 0x0B, 0xff }, >>> + { 0x0C, 0x0f }, >>> + { 0x0D, 0x00 }, >>> + { 0x10, 0xff }, >>> + { 0x11, 0xff }, >>> + { 0x12, 0x00 }, >>> + { 0x13, 0x00 }, >>> +}; >>> + >>> +static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg) >>> +{ >>> + return !((reg == 0x00) || (reg == 0x0f)); >>> +} >>> + >>> +static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg) >>> +{ >>> + return pcm1681_accessible_reg(dev, reg) && >>> + (reg != PCM1681_ZERO_DETECT_STATUS); >>> +} >>> + >>> +struct pcm1681_private { >>> + struct regmap *regmap; >>> + unsigned int format; >>> + /* Current deemphasis status */ >>> + unsigned int deemph; >>> + /* Current rate for deemphasis control */ >>> + unsigned int rate; >>> +}; >>> + >>> +static int pcm1681_deemph[] = { 44100, 48000, 32000 }; >>> + >>> +static int pcm1681_set_deemph(struct snd_soc_codec *codec) >>> +{ >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + int i = 0, val = -1, ret; >>> + >>> + if (priv->deemph) >>> + for (i = 0; i < ARRAY_SIZE(pcm1681_deemph); i++) >>> + if (pcm1681_deemph[i] == priv->rate) >>> + val = i; >>> + >>> + /* enable choosen frequency */ >>> + if (val != -1) >>> + regmap_update_bits(priv->regmap, PCM1681_DEEMPH_CONTROL, >>> + PCM1681_DEEMPH_RATE_MASK, val); >>> + >>> + /* enable/disable deemphasis functionality */ >>> + ret = regmap_update_bits(priv->regmap, PCM1681_DEEMPH_CONTROL, >>> + PCM1681_DEEMPH_MASK, priv->deemph); >>> + >>> + return ret; >>> +} >>> + >>> +static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol, >>> + struct snd_ctl_elem_value *ucontrol) >>> +{ >>> + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + >>> + ucontrol->value.enumerated.item[0] = priv->deemph; >>> + >>> + return 0; >>> +} >>> + >>> +static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol, >>> + struct snd_ctl_elem_value *ucontrol) >>> +{ >>> + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + >>> + priv->deemph = ucontrol->value.enumerated.item[0]; >>> + >>> + return pcm1681_set_deemph(codec); >>> +} >>> + >>> +static int pcm1681_set_dai_fmt(struct snd_soc_dai *codec_dai, >>> + unsigned int format) >>> +{ >>> + struct snd_soc_codec *codec = codec_dai->codec; >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + >>> + /* The PCM1681 can only be slave to all clocks */ >>> + if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { >>> + dev_err(codec->dev, "Invalid clocking mode\n"); >>> + return -EINVAL; >>> + } >>> + >>> + priv->format = format; >>> + >>> + return 0; >>> +} >>> + >>> +static int pcm1681_digital_mute(struct snd_soc_dai *dai, int mute) >>> +{ >>> + struct snd_soc_codec *codec = dai->codec; >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + int ret, val = 0; >>> + >>> + if (mute) >>> + val = PCM1681_SOFT_MUTE_ALL; >>> + >>> + ret = regmap_write(priv->regmap, PCM1681_SOFT_MUTE, val); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return 0; >>> +} >>> + >>> +static int pcm1681_hw_params(struct snd_pcm_substream *substream, >>> + struct snd_pcm_hw_params *params, >>> + struct snd_soc_dai *dai) >>> +{ >>> + struct snd_soc_codec *codec = dai->codec; >>> + struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); >>> + int val = 0; >>> + int pcm_format = params_format(params); >>> + >>> + priv->rate = params_rate(params); >>> + >>> + switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) { >>> + case SND_SOC_DAIFMT_RIGHT_J: >>> + if (pcm_format == SNDRV_PCM_FORMAT_S24_LE) >>> + val = 0x00; >>> + else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE) >>> + val = 0x03; >>> + break; >>> + case SND_SOC_DAIFMT_I2S: >>> + val = 0x04; >>> + break; >>> + case SND_SOC_DAIFMT_LEFT_J: >>> + val = 0x05; >>> + break; >>> + default: >>> + dev_err(codec->dev, "Invalid DAI format\n"); >>> + return -EINVAL; >>> + } >>> + >>> + regmap_update_bits(priv->regmap, PCM1681_FMT_CONTROL, 0x0f, val); >>> + >>> + return 0; >>> +} >>> + >>> +static const struct snd_soc_dai_ops pcm1681_dai_ops = { >>> + .set_fmt = pcm1681_set_dai_fmt, >>> + .hw_params = pcm1681_hw_params, >>> + .digital_mute = pcm1681_digital_mute, >>> +}; >>> + >>> +static const DECLARE_TLV_DB_SCALE(pcm1681_dac_tlv, -6350, 50, 1); >>> + >>> +static const struct snd_kcontrol_new pcm1681_controls[] = { >>> + SOC_DOUBLE_R_TLV("PCM1681 Channel 1/2 Playback Volume", >>> + PCM1681_ATT_CONTROL(1), PCM1681_ATT_CONTROL(2), 0, >>> + 0x7f, 0, pcm1681_dac_tlv), >>> + SOC_DOUBLE_R_TLV("PCM1681 Channel 3/4 Playback Volume", >>> + PCM1681_ATT_CONTROL(3), PCM1681_ATT_CONTROL(4), 0, >>> + 0x7f, 0, pcm1681_dac_tlv), >>> + SOC_DOUBLE_R_TLV("PCM1681 Channel 5/6 Playback Volume", >>> + PCM1681_ATT_CONTROL(5), PCM1681_ATT_CONTROL(6), 0, >>> + 0x7f, 0, pcm1681_dac_tlv), >>> + SOC_DOUBLE_R_TLV("PCM1681 Channel 7/8 Playback Volume", >>> + PCM1681_ATT_CONTROL(7), PCM1681_ATT_CONTROL(8), 0, >>> + 0x7f, 0, pcm1681_dac_tlv), >>> + SOC_SINGLE_BOOL_EXT("PCM1681 De-emphasis Switch", 0, >>> + pcm1681_get_deemph, pcm1681_put_deemph), >>> +}; >>> + >>> +struct snd_soc_dai_driver pcm1681_dai = { >>> + .name = "pcm1681-hifi", >>> + .playback = { >>> + .stream_name = "Playback", >>> + .channels_min = 2, >>> + .channels_max = 8, >>> + .rates = PCM1681_PCM_RATES, >>> + .formats = PCM1681_PCM_FORMATS, >>> + }, >>> + .ops = &pcm1681_dai_ops, >>> +}; >>> + >>> +#ifdef CONFIG_OF >>> +static const struct of_device_id pcm1681_dt_ids[] = { >>> + { .compatible = "ti,pcm1681", }, >>> + { } >>> +}; >>> +MODULE_DEVICE_TABLE(of, pcm1681_dt_ids); >>> +#endif >>> + >>> +static const struct regmap_config pcm1681_regmap = { >>> + .reg_bits = 8, >>> + .val_bits = 8, >>> + .max_register = ARRAY_SIZE(pcm1681_reg_defaults), >>> + .reg_defaults = pcm1681_reg_defaults, >>> + .num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults), >>> + .writeable_reg = pcm1681_writeable_reg, >>> + .readable_reg = pcm1681_accessible_reg, >>> +}; >>> + >>> +static int pcm1681_probe(struct snd_soc_codec *codec) >>> +{ >>> + return 0; >> >> Is there really nothing the driver has to do in order to bring the codec >> into full operation mode? > This codec have only POWER-ON-RESET function. It means codec need system > clock (normally MCLK) for some amount of time to get out of reset and > then you can communicate with it. >> >>> +} >>> + >>> +static int pcm1681_remove(struct snd_soc_codec *codec) >>> +{ >>> + return 0; >>> +} >>> + >>> +static struct snd_soc_codec_driver soc_codec_dev_pcm1681 = { >>> + .probe = pcm1681_probe, >>> + .remove = pcm1681_remove, >>> + .controls = pcm1681_controls, >>> + .num_controls = ARRAY_SIZE(pcm1681_controls), >>> +}; >>> + >>> +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) >>> +static const struct i2c_device_id pcm1681_i2c_id[] = { >>> + {"pcm1681", 0}, >>> + {} >>> +}; >>> +MODULE_DEVICE_TABLE(i2c, pcm1681_i2c_id); >>> + >>> +static int pcm1681_i2c_probe(struct i2c_client *client, >>> + const struct i2c_device_id *id) >>> +{ >>> + int ret; >>> + struct pcm1681_private *priv; >>> + >>> + priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL); >>> + if (!priv) >>> + return -ENOMEM; >>> + >>> + priv->regmap = devm_regmap_init_i2c(client, &pcm1681_regmap); >>> + if (IS_ERR(priv->regmap)) { >>> + ret = PTR_ERR(priv->regmap); >>> + dev_err(&client->dev, "Failed to create regmap: %d\n", ret); >>> + return ret; >>> + } >>> + >>> + i2c_set_clientdata(client, priv); >>> + >> >> Is there any way to probe the device is there at all? I'd like to bail >> early in case the bus or i2c address doesn't match for example. > Probing is done here because we assume that codec is out of reset. Yes, I know. I wondered whether there is any register that the driver can read back in order to check the presence of the device. But I quickly checked the datasheet, and there does in fact not seem to be such a register. >> Also, I wonder whether there are any reset lines that might be connected >> to GPIOs of the MCU. If so, it would be good idea to add support for >> that in this driver. But that can be done at some later point as well. > No other pins which can be handled. I see. Well ok then, I have no further remarks :) Daniel

1 0

[alsa-devel] [PATCH] ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/txx9/txx9aclc-ac97.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 8a28403..8ee8d42 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -188,9 +188,9 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (!r) return -EBUSY; - if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r), - dev_name(&pdev->dev))) - return -EBUSY; + drvdata->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(drvdata->base)) + return PTR_ERR(drvdata->base); drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) @@ -201,9 +201,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) r->start >= TXX9_DIRECTMAP_BASE && r->start < TXX9_DIRECTMAP_BASE + 0x400000) drvdata->physbase |= 0xf00000000ull; - drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r)); - if (!drvdata->base) - return -EBUSY; err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, 0, dev_name(&pdev->dev), drvdata); if (err < 0) -- 1.8.3.1

1 0

[alsa-devel] [PATCH] ASoC: nuc900-ac97: Convert to use devm_ APIs
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/nuc900/nuc900-ac97.c | 43 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index fe3285c..08e4c6b 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -326,32 +326,23 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) if (nuc900_ac97_data) return -EBUSY; - nuc900_audio = kzalloc(sizeof(struct nuc900_audio), GFP_KERNEL); + nuc900_audio = devm_kzalloc(&pdev->dev, sizeof(struct nuc900_audio), + GFP_KERNEL); if (!nuc900_audio) return -ENOMEM; spin_lock_init(&nuc900_audio->lock); nuc900_audio->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!nuc900_audio->res) { - ret = -ENODEV; - goto out0; - } + if (!nuc900_audio->res) + return ret; - if (!request_mem_region(nuc900_audio->res->start, - resource_size(nuc900_audio->res), pdev->name)) { - ret = -EBUSY; - goto out0; - } + nuc900_audio->mmio = devm_ioremap_resource(&pdev->dev, + nuc900_audio->res); + if (IS_ERR(nuc900_audio->mmio)) + return PTR_ERR(nuc900_audio->mmio); - nuc900_audio->mmio = ioremap(nuc900_audio->res->start, - resource_size(nuc900_audio->res)); - if (!nuc900_audio->mmio) { - ret = -ENOMEM; - goto out1; - } - - nuc900_audio->clk = clk_get(&pdev->dev, NULL); + nuc900_audio->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(nuc900_audio->clk)) { ret = PTR_ERR(nuc900_audio->clk); goto out2; @@ -375,15 +366,7 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) return 0; -out3: - clk_put(nuc900_audio->clk); -out2: - iounmap(nuc900_audio->mmio); -out1: - release_mem_region(nuc900_audio->res->start, - resource_size(nuc900_audio->res)); -out0: - kfree(nuc900_audio); +out: return ret; } @@ -391,12 +374,6 @@ static int nuc900_ac97_drvremove(struct platform_device *pdev) { snd_soc_unregister_component(&pdev->dev); - clk_put(nuc900_ac97_data->clk); - iounmap(nuc900_ac97_data->mmio); - release_mem_region(nuc900_ac97_data->res->start, - resource_size(nuc900_ac97_data->res)); - - kfree(nuc900_ac97_data); nuc900_ac97_data = NULL; return 0; -- 1.8.3.1

1 0

[alsa-devel] [PATCH] ASoC: ep93xx: Remove redundant dev_set_drvdata() calls
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> The driver core does this and it's never legal to rely on the value of drvdata if not set in probe() anyway. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/cirrus/ep93xx-ac97.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 3f4f888..f193701 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -398,7 +398,6 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) fail: ep93xx_ac97_info = NULL; - dev_set_drvdata(&pdev->dev, NULL); return ret; } @@ -412,7 +411,6 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) ep93xx_ac97_write_reg(info, AC97GCR, 0); ep93xx_ac97_info = NULL; - dev_set_drvdata(&pdev->dev, NULL); return 0; } -- 1.8.3.1

1 0

[alsa-devel] [PATCH] ASoC: bf5xx-ac97: Convert to devm_gpio_request_one()
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Also clean up the error reporting from failed requests while we're at it. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/blackfin/bf5xx-ac97.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index c66bef8..8010f32 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -293,13 +293,14 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET /* Request PB3 as reset pin */ - if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, "SND_AD198x RESET")) { - pr_err("Failed to request GPIO_%d for reset\n", - CONFIG_SND_BF5XX_RESET_GPIO_NUM); - ret = -1; + ret = devm_gpio_request_one(&pdev->dev, + CONFIG_SND_BF5XX_RESET_GPIO_NUM, + GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") { + dev_err(&pdev->dev, + "Failed to request GPIO_%d for reset: %d\n", + CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret); goto gpio_err; } - gpio_direction_output(CONFIG_SND_BF5XX_RESET_GPIO_NUM, 1); #endif sport_handle = sport_init(pdev, 2, sizeof(struct ac97_frame), @@ -349,10 +350,6 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) sport_config_err: sport_done(sport_handle); sport_err: -#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET - gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); -gpio_err: -#endif return ret; } @@ -363,9 +360,6 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); -#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET - gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); -#endif return 0; } -- 1.8.3.1

1 0