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

Re: [alsa-devel] [PATCH 2/4] mfd: wm5102: Map in additional FLL control registers
by Mark Brown 11 Apr '13

11 Apr '13

On Mon, Apr 08, 2013 at 06:22:23PM +0200, Samuel Ortiz wrote: > Hi Mark, > > On Wed, Mar 06, 2013 at 02:28:14PM +0800, Mark Brown wrote: > > Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> > > --- > > drivers/mfd/wm5102-tables.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > Did you merge this patchset through the ASoC tree ? Yes, let me know if that's a problem and I can back stuff out but it seemed sensible.

1 0

[alsa-devel] [PATCH 22/30] ASoC: samsung/idma: export idma_reg_addr_init
by Arnd Bergmann 11 Apr '13

11 Apr '13

The idma_reg_addr_init function is used by the samsung i2s driver, which can be a loadable module, so we have to export this function. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> --- sound/soc/samsung/idma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index f36a541..6e5fed3 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -411,6 +411,7 @@ void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr) idma.regs = regs; idma.lp_tx_addr = addr; } +EXPORT_SYMBOL_GPL(idma_reg_addr_init); static struct snd_soc_platform_driver asoc_idma_platform = { .ops = &idma_ops, -- 1.8.1.2

2 1

[alsa-devel] [PATCH 21/30] ASoC: samsung/i2s: fix module_device_table
by Arnd Bergmann 11 Apr '13

11 Apr '13

The second argument to the module_device_table macro must be the name of the device id array. In the samsung i2s driver, there was a small typo, resulting in a build error when building it as a loadable module. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> --- sound/soc/samsung/i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 61f2622..f7c6816 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1289,7 +1289,7 @@ static struct platform_device_id samsung_i2s_driver_ids[] = { }, {}, }; -MODULE_DEVICE_TABLE(platform, samsung-i2s-driver-ids); +MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids); #ifdef CONFIG_OF static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = { -- 1.8.1.2

2 1

[alsa-devel] [PATCH 19/30] ASoC: samsung: use irq resource for idma
by Arnd Bergmann 11 Apr '13

11 Apr '13

With multiplatform kernels, we cannot use hardwired IRQ numbers in device drivers. This changes the idma driver to use a proper resource, like all other drivers do. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> --- arch/arm/plat-samsung/devs.c | 6 ++++++ sound/soc/samsung/idma.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 78be9c0..b441908 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -145,14 +145,20 @@ struct platform_device s3c_device_camif = { /* ASOC DMA */ +#ifdef CONFIG_PLAT_S5P +static struct resource samsung_asoc_idma_resource = DEFINE_RES_IRQ(IRQ_I2S0); + struct platform_device samsung_asoc_idma = { .name = "samsung-idma", .id = -1, + .num_resources = 1, + .resource = &samsung_asoc_idma_resource, .dev = { .dma_mask = &samsung_device_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), } }; +#endif /* FB */ diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index a07950b..f36a541 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -68,6 +68,8 @@ static struct idma_info { dma_addr_t lp_tx_addr; } idma; +static int idma_irq; + static void idma_getpos(dma_addr_t *src) { *src = idma.lp_tx_addr + @@ -305,7 +307,7 @@ static int idma_open(struct snd_pcm_substream *substream) if (prtd == NULL) return -ENOMEM; - ret = request_irq(IRQ_I2S0, iis_irq, 0, "i2s", prtd); + ret = request_irq(idma_irq, iis_irq, 0, "i2s", prtd); if (ret < 0) { pr_err("fail to claim i2s irq , ret = %d\n", ret); kfree(prtd); @@ -324,7 +326,7 @@ static int idma_close(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct idma_ctrl *prtd = runtime->private_data; - free_irq(IRQ_I2S0, prtd); + free_irq(idma_irq, prtd); if (!prtd) pr_err("idma_close called with prtd == NULL\n"); @@ -418,6 +420,10 @@ static struct snd_soc_platform_driver asoc_idma_platform = { static int asoc_idma_platform_probe(struct platform_device *pdev) { + idma_irq = platform_get_irq(pdev, 0); + if (idma_irq < 0) + return idma_irq; + return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform); } -- 1.8.1.2

2 1

[alsa-devel] [PATCH resend] sound: at73c213: Use dev_pm_ops
by Lars-Peter Clausen 11 Apr '13

11 Apr '13

Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/spi/at73c213.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index 4dd60d8..a1a24b9 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c @@ -1075,10 +1075,11 @@ out: return 0; } -#ifdef CONFIG_PM -static int snd_at73c213_suspend(struct spi_device *spi, pm_message_t msg) +#ifdef CONFIG_PM_SLEEP + +static int snd_at73c213_suspend(struct device *dev) { - struct snd_card *card = dev_get_drvdata(&spi->dev); + struct snd_card *card = dev_get_drvdata(dev); struct snd_at73c213 *chip = card->private_data; ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS)); @@ -1087,9 +1088,9 @@ static int snd_at73c213_suspend(struct spi_device *spi, pm_message_t msg) return 0; } -static int snd_at73c213_resume(struct spi_device *spi) +static int snd_at73c213_resume(struct device *dev) { - struct snd_card *card = dev_get_drvdata(&spi->dev); + struct snd_card *card = dev_get_drvdata(dev); struct snd_at73c213 *chip = card->private_data; clk_enable(chip->board->dac_clk); @@ -1097,18 +1098,21 @@ static int snd_at73c213_resume(struct spi_device *spi) return 0; } + +static SIMPLE_DEV_PM_OPS(at73c213_pm_ops, snd_at73c213_suspend, + snd_at73c213_resume); +#define AT73C213_PM_OPS (&at73c213_pm_ops) + #else -#define snd_at73c213_suspend NULL -#define snd_at73c213_resume NULL +#define AT73C213_PM_OPS NULL #endif static struct spi_driver at73c213_driver = { .driver = { .name = "at73c213", + .pm = AT73C213_PM_OPS, }, .probe = snd_at73c213_probe, - .suspend = snd_at73c213_suspend, - .resume = snd_at73c213_resume, .remove = snd_at73c213_remove, }; -- 1.8.0

2 1

[alsa-devel] [PATCH 0/3] Headphone Mic patches
by David Henningsson 11 Apr '13

11 Apr '13

I'm preparing upstreaming of some new hardware, which has headphone mic support, i e, you can use the headphone jack to plug in a TRS/TS mic instead of plugging in a headphone in that jack. For this hardware, the existing hp_mic functionality won't work as the headphone and mic are on different pins. David Henningsson (3): ALSA: hda - allow "Headphone Mic" parser flag ALSA: hda - add some small convenience functions to auto parser ALSA: hda - Handle Headphone Mic jack more generic sound/pci/hda/hda_auto_parser.c | 68 ++++++++++++++++++++++++++++++++------- sound/pci/hda/hda_auto_parser.h | 29 +++++++++++++++-- sound/pci/hda/hda_generic.c | 12 +------ sound/pci/hda/hda_jack.c | 43 +++++++++++++++++-------- 4 files changed, 113 insertions(+), 39 deletions(-) -- 1.7.9.5

2 4

[alsa-devel] what is the difference between SNDRV_PCM_FMTBIT_S24_LE and SNDRV_PCM_FMTBIT_S24_3LE
by Zhang wei 11 Apr '13

11 Apr '13

There are two definitions In the file include/sound/asound.h SNDRV_PCM_FORMAT_S24_3LE and SNDRV_PCM_FORMAT_S24_LE. What is the difference between them? Thanks a lot. zw

2 1

[alsa-devel] VIA VT1731
by ALEKSANDR BOIKO 11 Apr '13

11 Apr '13

Hello! I'm using DAC Audio-GD Master 7 with Voyage MPD. There is a problem with playback audio files different frequency. I've read there is a path - solution. How can I get it? Help please.

2 1

[alsa-devel] ASOC snd_soc_dai_ops for clock mux control
by Gellner, Christoph (ADITG/SW1) 10 Apr '13

10 Apr '13

Hi all, I'm working on the driver of an audio CPU DAI IP providing - Internal clocks which can be used for master clock generation by TX as well as RX section - One oversampling clock available to RX section - One oversampling clock available to TX section. Kernel version is 3.5.7 I want to add support to the CPU DAI driver to - Specify the rate of the input clocks - Select which of the clock inputs shall be used by RX and which shall be used by TX section I'm currently wondering how to map this to existing snd_soc_dai_ops functions. Currently I see only set_sysclk, set_pll, set_clkdiv for clock control. I plan to use set_sysclk to specify the rate as well as the direction of each clock. What is currently missing for me is a way to specify the clock to be used by RX or TX section. I can't really add this in set_sysclk. In case I switch to clock X when set_sysclk is called with clock ID of X, I need a way to distinguish if RX or TX section or both need to switch to this clock. But I can't really double the internal clock X in virtual clocks X_TX, X_RX (one time for TX and one time for RX section) as the internal clock X has only one rate for both sections and this would not represent the hardware correctly. Do you have any recommendation how to implement ? What do you think about adding a new function pointer to snd_soc_dai_ops ? int (*set_clkmux)(struct snd_soc_dai *dai, int mux_id, int source_id); I think this would be the cleanest solution as it models the features of the hardware (the clock multiplexers for RX or TX sections) It might be possible to use set_pll or set_clkdiv to realize. I could use set_pll and ignore the freq_in and freq_out I could use set_clkdiv and interpret div (divider integer value) as a source_id But this is not a 100% clean solution in my opinion. Best regards Christoph

3 3

[alsa-devel] [PATCH 1/3] ALSA: compress_core: Update calc_avail to use cumulative values
by Charles Keepax 10 Apr '13

10 Apr '13

The app_pointer is managed locally by the compress core for memory mapped DSPs but for DSPs that are not memory mapped this would have to be manually updated from within the DSP driver itself, which is hardly very idiomatic. This patch switches to using the cumulative values to calculate the available buffer space because these are already gracefully passed out of the DSP driver to the compress core and otherwise should be functionally equivalent. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/core/compress_offload.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index c84abc8..27bd81a 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -160,8 +160,6 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream, static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, struct snd_compr_avail *avail) { - long avail_calc; /*this needs to be signed variable */ - memset(avail, 0, sizeof(*avail)); snd_compr_update_tstamp(stream, &avail->tstamp); /* Still need to return avail even if tstamp can't be filled in */ @@ -184,22 +182,11 @@ static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, return stream->runtime->buffer_size; } - /* FIXME: this routine isn't consistent, in one test we use - * cumulative values and in the other byte offsets. Do we - * really need the byte offsets if the cumulative values have - * been updated? In the PCM interface app_ptr and hw_ptr are - * already cumulative */ - - avail_calc = stream->runtime->buffer_size - - (stream->runtime->app_pointer - stream->runtime->hw_pointer); - pr_debug("calc avail as %ld, app_ptr %lld, hw+ptr %lld\n", avail_calc, - stream->runtime->app_pointer, - stream->runtime->hw_pointer); - if (avail_calc >= stream->runtime->buffer_size) - avail_calc -= stream->runtime->buffer_size; - pr_debug("ret avail as %ld\n", avail_calc); - avail->avail = avail_calc; - return avail_calc; + avail->avail = stream->runtime->buffer_size - + (stream->runtime->total_bytes_available - + stream->runtime->total_bytes_transferred); + pr_debug("ret avail as %lld\n", avail->avail); + return avail->avail; } static inline size_t snd_compr_get_avail(struct snd_compr_stream *stream) -- 1.7.2.5

5 19