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

Re: [alsa-devel] [PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S
by Padma Venkat 07 Aug '13

07 Aug '13

Hi Tomasz, On Wed, Aug 7, 2013 at 4:32 PM, Tomasz Figa <t.figa(a)samsung.com> wrote: > Hi Padmavathi, > > [Ccing DT maintainers with a little comment about contents of this patch > for them: > > This is a rework of Samsung i2s bindings to make them more reasonable than > they are at the moment. I know this was supposed to be stable, fixed, ABI, > etc., but as we discussed a lot the whole topic of DT bindings, we need to > sanitize existing bindings and this patch is a part of this work.] > [snip] >> >> Required SoC Specific Properties: >> >> -- compatible : "samsung,i2s-v5" >> +- compatible : should be one of the following. >> + - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. Previous versions >> + has only 8/16bit support. > > The comment about previous versions seems a bit enigmatic. > > If there is another variant supported by this driver that supports only > 8/16bit audio data, then it should have a separate compatible value. For previous i2s controllers there are two other i2s drivers available. I think I can delete this comment here. > >> + - samsung,s3c6410-i2sv4: for 8/16/24bit multichannel(5.1 channel) >> I2S. + Introduced in s3c6410. This also applicable for s5p64x0 >> platforms. + - samsung,s5pc100-i2s: for 8/16/24bit multichannel(5.1 >> channel) I2S + with secondary fifo and s/w reset control. >> + - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with >> + secondary fifo, s/w reset control and internal mux for root clk >> src. + >> - reg: physical base address of the controller and length of memory >> mapped region. >> - dmas: list of DMA controller phandle and DMA request line ordered >> pairs. @@ -21,13 +30,6 @@ Required SoC Specific Properties: >> >> Optional SoC Specific Properties: >> >> -- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel >> - support, this flag is enabled. >> -- samsung,supports-rstclr: This flag should be set if I2S software reset >> bit - control is required. When this flag is set I2S software reset bit >> will be - enabled or disabled based on need. >> -- samsung,supports-secdai:If I2S block has a secondary FIFO and internal >> DMA, - then this flag is enabled. >> - samsung,idma-addr: Internal DMA register base address of the audio >> sub system(used in secondary sound source). >> - pinctrl-0: Should specify pin control groups used for this controller. >> @@ -46,9 +48,6 @@ i2s0: i2s@03830000 { > > The example has also a compatible value set to "samsung,i2s-v5". I don't > think this is compliant to the new bindings. Yes. It's my mistake. Will change this to new one. > >> <&clock_audss EXYNOS_I2S_BUS>, >> <&clock_audss EXYNOS_SCLK_I2S>; >> clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; >> - samsung,supports-6ch; >> - samsung,supports-rstclr; >> - samsung,supports-secdai; >> samsung,idma-addr = <0x03000000>; >> pinctrl-names = "default"; >> pinctrl-0 = <&i2s0_bus>; >> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c >> index 47e08dd..8a5504c 100644 >> --- a/sound/soc/samsung/i2s.c >> +++ b/sound/soc/samsung/i2s.c >> @@ -40,6 +40,7 @@ enum samsung_dai_type { >> >> struct samsung_i2s_dai_data { > > const struct samsung_i2s_dai_data OK. > >> int dai_type; >> + u32 quirks; >> }; >> >> struct i2s_dai { >> @@ -1032,18 +1033,18 @@ static struct i2s_dai *i2s_alloc_dai(struct >> platform_device *pdev, bool sec) >> >> static const struct of_device_id exynos_i2s_match[]; >> >> -static inline int samsung_i2s_get_driver_data(struct platform_device >> *pdev) +static inline struct samsung_i2s_dai_data >> *samsung_i2s_get_driver_data( + struct platform_device > *pdev) >> { >> #ifdef CONFIG_OF >> - struct samsung_i2s_dai_data *data; >> if (pdev->dev.of_node) { >> const struct of_device_id *match; >> match = of_match_node(exynos_i2s_match, pdev->dev.of_node); >> - data = (struct samsung_i2s_dai_data *) match->data; >> - return data->dai_type; >> + return (struct samsung_i2s_dai_data *) match->data; > > If you make the dai_data const this cast will be no longer necessary. > >> } else >> #endif >> - return platform_get_device_id(pdev)->driver_data; >> + return (struct samsung_i2s_dai_data *) >> + platform_get_device_id(pdev)->driver_data; >> } >> >> #ifdef CONFIG_PM_RUNTIME >> @@ -1074,13 +1075,13 @@ static int samsung_i2s_probe(struct >> platform_device *pdev) struct resource *res; >> u32 regs_base, quirks = 0, idma_addr = 0; >> struct device_node *np = pdev->dev.of_node; >> - enum samsung_dai_type samsung_dai_type; >> + struct samsung_i2s_dai_data *i2s_dai_data; > > const OK. > >> int ret = 0; >> >> /* Call during Seconday interface registration */ >> - samsung_dai_type = samsung_i2s_get_driver_data(pdev); >> + i2s_dai_data = samsung_i2s_get_driver_data(pdev); >> >> - if (samsung_dai_type == TYPE_SEC) { >> + if (i2s_dai_data->dai_type == TYPE_SEC) { >> sec_dai = dev_get_drvdata(&pdev->dev); >> if (!sec_dai) { >> dev_err(&pdev->dev, "Unable to get drvdata\n"); >> @@ -1129,15 +1130,7 @@ static int samsung_i2s_probe(struct >> platform_device *pdev) idma_addr = i2s_cfg->idma_addr; >> } >> } else { >> - if (of_find_property(np, "samsung,supports-6ch", NULL)) >> - quirks |= QUIRK_PRI_6CHAN; >> - >> - if (of_find_property(np, "samsung,supports-secdai", NULL)) >> - quirks |= QUIRK_SEC_DAI; >> - >> - if (of_find_property(np, "samsung,supports-rstclr", NULL)) >> - quirks |= QUIRK_NEED_RSTCLR; >> - >> + quirks = i2s_dai_data->quirks; >> if (of_property_read_u32(np, "samsung,idma-addr", >> &idma_addr)) { >> if (quirks & QUIRK_SEC_DAI) { >> @@ -1250,27 +1243,60 @@ static int samsung_i2s_remove(struct >> platform_device *pdev) return 0; >> } >> >> +static struct samsung_i2s_dai_data i2sv3_dai_type = { > > const OK. > >> + .dai_type = TYPE_PRI, >> + .quirks = QUIRK_NO_MUXPSR, >> +}; >> + >> +static struct samsung_i2s_dai_data i2sv4_dai_type = { > > ditto > >> + .dai_type = TYPE_PRI, >> + .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR, >> +}; >> + >> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = { > > ditto > >> + .dai_type = TYPE_PRI, >> + .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI | >> + QUIRK_NEED_RSTCLR, >> +}; >> + >> +static struct samsung_i2s_dai_data i2sv5_dai_type = { > > ditto > >> + .dai_type = TYPE_PRI, >> + .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR, >> +}; >> + >> +static struct samsung_i2s_dai_data samsung_dai_type_sec = { > > ditto > >> + .dai_type = TYPE_SEC, >> +}; >> + >> static struct platform_device_id samsung_i2s_driver_ids[] = { >> { >> - .name = "samsung-i2s", >> - .driver_data = TYPE_PRI, >> + .name = "samsung,s3c6410-i2s", >> + .driver_data = (kernel_ulong_t)&i2sv3_dai_type, >> + }, { >> + .name = "samsung,s3c6410-i2s-multi", >> + .driver_data = (kernel_ulong_t)&i2sv4_dai_type, >> + }, { >> + .name = "samsung,s5pc100-i2s", >> + .driver_data = (kernel_ulong_t)&i2sv5_c100_dai_type, >> }, { >> - .name = "samsung-i2s-sec", >> - .driver_data = TYPE_SEC, >> + .name = "samsung,s5pv210-i2s", >> + .driver_data = (kernel_ulong_t)&i2sv5_dai_type, >> + }, { >> + .name = "samsung-i2s-sec", >> + .driver_data = (kernel_ulong_t)&samsung_dai_type_sec, >> }, >> {}, >> }; >> MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids); >> >> #ifdef CONFIG_OF >> -static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = { >> - [TYPE_PRI] = { TYPE_PRI }, >> - [TYPE_SEC] = { TYPE_SEC }, >> -}; >> - >> static const struct of_device_id exynos_i2s_match[] = { >> - { .compatible = "samsung,i2s-v5", >> - .data = &samsung_i2s_dai_data_array[TYPE_PRI], >> + { >> + .compatible = "samsung,s3c6410-i2s", >> + .data = &i2sv3_dai_type, >> + }, { >> + .compatible = "samsung,s5pv210-i2s", >> + .data = &i2sv5_dai_type, > > Hmm, documentation mentions 4 compatible values (and possibly one is > missing there), but this patch adds only 2 of them. I don't think this is > correct, especially that the driver already supports handling all of them. Documentation mentions about all the compatible strings which are all supported by this driver for reference. But some of the platforms haven't converted to DT yet so here I added the compatible strings for DT compliant platforms and compatible strings for non-DT compliant platforms I added in the platform_device_id structure. Any way we have to make all legacy platforms DT compliant so we need this "samsung,s3c6410-i2s-multi" in future. > > Best regards, > Tomasz > Thanks Padma

1 0

[alsa-devel] [PATCH] switch: arizona: Clear trig_sts bits on all paths
by Charles Keepax 07 Aug '13

07 Aug '13

We want the trig_sts bits to be cleared in all cases where we consider the jack detection interrupt to have been handled. Specifically, if a duplicate detection event was suppressed these bits were not cleared causing the CODEC to not enter a low power state. This patch clears the bits on the duplicate detection code path. Reported-by: Ryo Tsutsui <ryo.tsutsui(a)wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- drivers/extcon/extcon-arizona.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 7a1b4a7..4df68de 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -1034,6 +1034,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) else info->micd_timeout = DEFAULT_MICD_TIMEOUT; +out: /* Clear trig_sts to make sure DCVDD is not forced up */ regmap_write(arizona->regmap, ARIZONA_AOD_WKUP_AND_TRIG, ARIZONA_MICD_CLAMP_FALL_TRIG_STS | @@ -1041,7 +1042,6 @@ static irqreturn_t arizona_jackdet(int irq, void *data) ARIZONA_JD1_FALL_TRIG_STS | ARIZONA_JD1_RISE_TRIG_STS); -out: mutex_unlock(&info->lock); pm_runtime_mark_last_busy(info->dev); -- 1.7.2.5

2 2

[alsa-devel] Linux 3.10.4 and Logitech HD Webcam C525/C310
by Бойко Максим 07 Aug '13

07 Aug '13

Hi, I have Logitech HD Webcam 525 (046d:0826) but its mic works strange. The mic is turned off while video works fine. In dmesg I see the following messages [ 472.079738] cannot submit urb (err = -18) [ 472.079748] cannot submit urb (err = -18) [ 472.079754] cannot submit urb (err = -18) [ 472.079759] cannot submit urb (err = -18) [ 472.079783] cannot submit urb (err = -18) [ 472.079787] cannot submit urb (err = -18) [ 472.079792] cannot submit urb (err = -18) [ 472.079797] cannot submit urb (err = -18) I have did the following modifications to try to fix it (it works for some other cams) add to the sound/usb/mixer.c case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */ add to the sound/usb/quirks-table.h (see http://forums.gentoo.org/viewtopic-p-6886404.html) { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS, .idVendor = 0x046d, .idProduct = 0x0826, .bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "Logitech, Inc.", .product_name = "HD Webcam C525", .ifnum = QUIRK_NO_INTERFACE } }, But all these don't fix the mic. I have not enough experience to fix it myself but I can help with finding a bug and testing fixes. I have also found that the same problem exists for Logitech Webcam C310 (046d:081b). The bug is not specific for my laptop. I have the same issue on my desktop with both cameras. See attachments for additional info.

2 3

[alsa-devel] [PATCH 1/4] mfd: wm5110: Mark register containing FLL gains as readable
by Charles Keepax 07 Aug '13

07 Aug '13

The FLL gains are present on all devices and controlled from common code shared between them. This patch adds these registers into defaults list for wm5110 and marks them as readable. Reported-by: D.J. Barrow <dbarrow(a)wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- drivers/mfd/wm5110-tables.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c index 2a79723..c04324d 100644 --- a/drivers/mfd/wm5110-tables.c +++ b/drivers/mfd/wm5110-tables.c @@ -468,12 +468,14 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00000176, 0x0000 }, /* R374 - FLL1 Control 6 */ { 0x00000177, 0x0281 }, /* R375 - FLL1 Loop Filter Test 1 */ { 0x00000178, 0x0000 }, /* R376 - FLL1 NCO Test 0 */ + { 0x00000179, 0x0000 }, /* R376 - FLL1 Control 7 */ { 0x00000181, 0x0000 }, /* R385 - FLL1 Synchroniser 1 */ { 0x00000182, 0x0000 }, /* R386 - FLL1 Synchroniser 2 */ { 0x00000183, 0x0000 }, /* R387 - FLL1 Synchroniser 3 */ { 0x00000184, 0x0000 }, /* R388 - FLL1 Synchroniser 4 */ { 0x00000185, 0x0000 }, /* R389 - FLL1 Synchroniser 5 */ { 0x00000186, 0x0000 }, /* R390 - FLL1 Synchroniser 6 */ + { 0x00000187, 0x0001 }, /* R390 - FLL1 Synchroniser 7 */ { 0x00000189, 0x0000 }, /* R393 - FLL1 Spread Spectrum */ { 0x0000018A, 0x0004 }, /* R394 - FLL1 GPIO Clock */ { 0x00000191, 0x0000 }, /* R401 - FLL2 Control 1 */ @@ -484,12 +486,14 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00000196, 0x0000 }, /* R406 - FLL2 Control 6 */ { 0x00000197, 0x0000 }, /* R407 - FLL2 Loop Filter Test 1 */ { 0x00000198, 0x0000 }, /* R408 - FLL2 NCO Test 0 */ + { 0x00000199, 0x0000 }, /* R408 - FLL2 Control 7 */ { 0x000001A1, 0x0000 }, /* R417 - FLL2 Synchroniser 1 */ { 0x000001A2, 0x0000 }, /* R418 - FLL2 Synchroniser 2 */ { 0x000001A3, 0x0000 }, /* R419 - FLL2 Synchroniser 3 */ { 0x000001A4, 0x0000 }, /* R420 - FLL2 Synchroniser 4 */ { 0x000001A5, 0x0000 }, /* R421 - FLL2 Synchroniser 5 */ { 0x000001A6, 0x0000 }, /* R422 - FLL2 Synchroniser 6 */ + { 0x000001A7, 0x0001 }, /* R422 - FLL2 Synchroniser 7 */ { 0x000001A9, 0x0000 }, /* R425 - FLL2 Spread Spectrum */ { 0x000001AA, 0x0004 }, /* R426 - FLL2 GPIO Clock */ { 0x00000200, 0x0006 }, /* R512 - Mic Charge Pump 1 */ @@ -1392,6 +1396,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) case ARIZONA_FLL1_CONTROL_4: case ARIZONA_FLL1_CONTROL_5: case ARIZONA_FLL1_CONTROL_6: + case ARIZONA_FLL1_CONTROL_7: case ARIZONA_FLL1_LOOP_FILTER_TEST_1: case ARIZONA_FLL1_NCO_TEST_0: case ARIZONA_FLL1_SYNCHRONISER_1: @@ -1400,6 +1405,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) case ARIZONA_FLL1_SYNCHRONISER_4: case ARIZONA_FLL1_SYNCHRONISER_5: case ARIZONA_FLL1_SYNCHRONISER_6: + case ARIZONA_FLL1_SYNCHRONISER_7: case ARIZONA_FLL1_SPREAD_SPECTRUM: case ARIZONA_FLL1_GPIO_CLOCK: case ARIZONA_FLL2_CONTROL_1: @@ -1408,6 +1414,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) case ARIZONA_FLL2_CONTROL_4: case ARIZONA_FLL2_CONTROL_5: case ARIZONA_FLL2_CONTROL_6: + case ARIZONA_FLL2_CONTROL_7: case ARIZONA_FLL2_LOOP_FILTER_TEST_1: case ARIZONA_FLL2_NCO_TEST_0: case ARIZONA_FLL2_SYNCHRONISER_1: @@ -1416,6 +1423,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) case ARIZONA_FLL2_SYNCHRONISER_4: case ARIZONA_FLL2_SYNCHRONISER_5: case ARIZONA_FLL2_SYNCHRONISER_6: + case ARIZONA_FLL2_SYNCHRONISER_7: case ARIZONA_FLL2_SPREAD_SPECTRUM: case ARIZONA_FLL2_GPIO_CLOCK: case ARIZONA_MIC_CHARGE_PUMP_1: -- 1.7.2.5

2 4

[alsa-devel] [PATCH RESEND] mfd: arizona: Move regulator disable to after marking cache only
by Charles Keepax 07 Aug '13

07 Aug '13

If we disable DCVDD before we mark the cache as cache only, we might attempt to write to the chip whilst it is powered down and lose a write. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- drivers/mfd/arizona-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 89a1153..5ac3aa4 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -438,9 +438,9 @@ static int arizona_runtime_suspend(struct device *dev) } } - regulator_disable(arizona->dcvdd); regcache_cache_only(arizona->regmap, true); regcache_mark_dirty(arizona->regmap); + regulator_disable(arizona->dcvdd); return 0; } -- 1.7.2.5

2 1

[alsa-devel] [PATCH v6 0/8] Sound support for at91sam9x5-wm8731 based boards
by Richard Genoud 07 Aug '13

07 Aug '13

Hi, This patchset add sound on the at91sam9x5ek board. It's based on Nicolas Ferre's work in the 2.6.39 atmel patch for sam9x5: https://github.com/linux4sam/linux-at91/commit/0aa157c9e71ccccf3abc30fa37eb… It needs Bo Chen's patchset on the generic dmaengine (topic/atmel branch on Mark's sound tree) and the SSC interrupts disabled (cf http://www.spinics.net/lists/arm-kernel/msg256901.html) As the at91 chips are on their way to the common clock framework, I thought it may be better to retrieve the codec MCLK via this framework. So it needs Boris Brezillon patch set "ARM: at91: move to common clk framework" I've separated this patch because I don't know what is better: * applying the patchset with a hard coded clock, and once at91 has moved to common clock framework, update the code and change the DT binding. * wait for the common clock framework. Outstanding issue: If this machine driver will support more SoCs maybe we should name it differently. Maybe atmel_wm8731.c ? Since it could be merged with sam9g20_wm8731.c when the g20 is DT only (There will be some more work though). It has been tested on at91sam9g35ek, and should work on g15, g25, x25 and x35 also. patches applies on next-20130729 + "ARM: at91: move to common clk framework" Changes from v5: * Update the wm8731 DT binding documentation with available audio endpoints. * Remove Uwe's signed-off since it seems to be "an integration signed-off" * Remove rate constrains if freq==0 in wm8731. * Allocate dynamically card, dai and private structures. * Add a separate patch to set the oscillator value via DT. NB: this last patch needs Boris Brezillon patch set "ARM: at91: move to common clk framework" Changes from v4: * Move the rates constraints into the codec * Hard code the DAI format since it cannot be changed anyway (and remove the DT bindings accordingly) * Add some consistency in the functions naming (sam9x5ek/at91sam9x5ek/sam9x5) * Retrieve the SSC id from the SSC controller phandle * Clarify the atmel-ssc.txt documentation * Develop audio-routing documentation * Tidy up the includes in the machine driver Changes from v3: * Remove the use of macros in device tree documentation. Changes from v2: * Change atmel,sam9x5-audio-wm8731 to atmel,sam9x5-wm8731-audio for consistency with sam9g20 machine driver. * Use the snd_pcm_hw_constraint() API as suggested by Mark and Lars-Peter. * Remove the unnecessary snd_soc_dapm_sync() call as Lars-Peter suggested. * Add documentation for machine driver DT binding. * Update atmel-ssc DT binding documentation. * Add GPL license instead of just the "GPL" word (hope that's ok !) Changes from v1-RFC: * drop patches on SSC since Bo Chen already did the work * reorder patches to have the machine driver first * drop code already handled by the ASoC framework * drop unneeded SND_ATMEL_SOC_PDC config selection * use static snd_soc_card and snd_soc_dai_link structures. Best regards, Richard. Nicolas Ferre (1): ASoC: atmel: machine driver for at91sam9x5-wm8731 boards Richard Genoud (7): ASoC: wm8731: add rates constraints Documentation: DT: update atmel SSC with DMA binding ARM: AT91: DTS: sam9x5: add SSC DMA parameters ARM: AT91: DTS: sam9x5ek: add WM8731 codec ARM: AT91: DTS: sam9x5ek: enable SSC ARM: AT91: DTS: sam9x5ek: add sound configuration ASoC: sam9x5: get codec MCLK via device tree .../devicetree/bindings/misc/atmel-ssc.txt | 23 ++- .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 39 ++++ Documentation/devicetree/bindings/sound/wm8731.txt | 9 + arch/arm/boot/dts/at91sam9x5.dtsi | 3 + arch/arm/boot/dts/at91sam9x5ek.dtsi | 32 +++ sound/soc/atmel/Kconfig | 10 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/sam9x5_wm8731.c | 218 ++++++++++++++++++++ sound/soc/codecs/wm8731.c | 60 +++++- 9 files changed, 392 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt create mode 100644 sound/soc/atmel/sam9x5_wm8731.c -- 1.7.10.4

3 20

[alsa-devel] [PATCH] ASoC: ad1980: Provide stub DAPM support
by Mark Brown 07 Aug '13

07 Aug '13

From: Mark Brown <broonie(a)linaro.org> Since non-DAPM devices are not going to be supported provide DAPM input and output widgets and hook them up to the DAIs. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ad1980.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 89fcf7d..7257a88 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -96,6 +96,44 @@ SOC_ENUM("Capture Source", ad1980_cap_src), SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0), }; +static const struct snd_soc_dapm_widget ad1980_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("MIC1"), +SND_SOC_DAPM_INPUT("MIC2"), +SND_SOC_DAPM_INPUT("CD_L"), +SND_SOC_DAPM_INPUT("CD_R"), +SND_SOC_DAPM_INPUT("AUX_L"), +SND_SOC_DAPM_INPUT("AUX_R"), +SND_SOC_DAPM_INPUT("LINE_IN_L"), +SND_SOC_DAPM_INPUT("LINE_IN_R"), + +SND_SOC_DAPM_OUTPUT("LFE_OUT"), +SND_SOC_DAPM_OUTPUT("CENTER_OUT"), +SND_SOC_DAPM_OUTPUT("LINE_OUT_L"), +SND_SOC_DAPM_OUTPUT("LINE_OUT_R"), +SND_SOC_DAPM_OUTPUT("MONO_OUT"), +SND_SOC_DAPM_OUTPUT("HP_OUT_L"), +SND_SOC_DAPM_OUTPUT("HP_OUT_R"), +}; + +static const struct snd_soc_dapm_route ad1980_dapm_routes[] = { + { "Capture", NULL, "MIC1" }, + { "Capture", NULL, "MIC2" }, + { "Capture", NULL, "CD_L" }, + { "Capture", NULL, "CD_R" }, + { "Capture", NULL, "AUX_L" }, + { "Capture", NULL, "AUX_R" }, + { "Capture", NULL, "LINE_IN_L" }, + { "Capture", NULL, "LINE_IN_R" }, + + { "LFE_OUT", NULL, "Playback" }, + { "CENTER_OUT", NULL, "Playback" }, + { "LINE_OUT_L", NULL, "Playback" }, + { "LINE_OUT_R", NULL, "Playback" }, + { "MONO_OUT", NULL, "Playback" }, + { "HP_OUT_L", NULL, "Playback" }, + { "HP_OUT_R", NULL, "Playback" }, +}; + static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) { @@ -253,6 +291,11 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1980 = { .reg_cache_step = 2, .write = ac97_write, .read = ac97_read, + + .dapm_widgets = ad1980_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ad1980_dapm_widgets), + .dapm_routes = ad1980_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ad1980_dapm_routes), }; static int ad1980_probe(struct platform_device *pdev) -- 1.8.4.rc1

2 1

[alsa-devel] horribly wrong code when --with-versioned is active
by John Spencer 07 Aug '13

07 Aug '13

if --with-versioned is active (default), a couple of macros in pcm.c start generating some completely broken, __old-prefixed wrapper functions, which then are getting used whenever the actual function is called. for example: snd_pcm_hw_params_set_buffer_time_near __OLD_NEAR1(snd_pcm_hw_params_set_buffer_time_near, unsigned int); -> #define __OLD_NEAR1(name, ret_type) __P_OLD_NEAR1(__old_, name, ret_type) -> #define __P_OLD_NEAR1(pfx, name, ret_type) \ ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val, int *dir) \ { \ if (INTERNAL(name)(pcm, params, &val, dir) < 0) \ return 0; \ return (ret_type)val; \ } this will lead to generating a function __old_snd_pcm_hw_params_set_buffer_time_near which expands to unsigned int __old_snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val, int *dir) { if snd1_pcm_hw_params_set_buffer_time_near(pcm, params, &val, dir) < 0) return 0; return (ret_type)val; } there 2 bugs in there, 1) the real function gets passed a pointer to a pointer of unsigned, which is then happily dereferenced and the original pointer used as an int, and 2) the return type logic is wrong, in case of a non-error, the original pointer will be returned instead of 0 to indicate success. the right fix would look something like this: @@ -7190,19 +7192,15 @@ __OLD_GET1(snd_pcm_hw_params_get_tick_time_max, unsigned int, unsigned int); #define __P_OLD_NEAR(pfx, name, ret_type) \ -ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val) \ +ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type *val) \ { \ - if (INTERNAL(name)(pcm, params, &val) < 0) \ - return 0; \ - return (ret_type)val; \ + return(INTERNAL(name)(pcm, params, val)); \ } #define __P_OLD_NEAR1(pfx, name, ret_type) \ -ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val, int *dir) \ +ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type *val, int *dir) \ { \ - if (INTERNAL(name)(pcm, params, &val, dir) < 0) \ - return 0; \ - return (ret_type)val; \ + return (INTERNAL(name)(pcm, params, val, dir) < 0); \ } #define __OLD_NEAR(name, ret_type) __P_OLD_NEAR(__old_, name, ret_type) this is only half of the fix though, the "old" getter functions seem to misbehave as well. the misbehaviour can be inspected by using a small openal-soft (version 1.14) example code, and breaking on alsa_reset_playback and single stepping through the invocation of CHECK(snd_pcm_hw_params_set_buffer_time_near(data->pcmHandle, hp, &bufferLen, NULL));

2 3

[alsa-devel] [PATCH] ASoC: imx-mc13783: Make SND_SOC_IMX_MC13783 visible again
by Fabio Estevam 06 Aug '13

06 Aug '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Commit 02502da45 (ASoC: imx-mc13783: Depend on ARCH_ARM) introduced 'ARCH_ARM' as a dependency for SND_SOC_IMX_MC13783, but this is a non-existent symbol. This makes the selection of SND_SOC_IMX_MC13783 to be impossible. Use the correct 'ARM' symbol instead. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index c26449b..e15f771 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -194,7 +194,7 @@ config SND_SOC_IMX_SGTL5000 config SND_SOC_IMX_MC13783 tristate "SoC Audio support for I.MX boards with mc13783" - depends on MFD_MC13783 && ARCH_ARM + depends on MFD_MC13783 && ARM select SND_SOC_IMX_SSI select SND_SOC_IMX_AUDMUX select SND_SOC_MC13783 -- 1.8.1.2

2 1

[alsa-devel] [PATCH 1/2] ASoC: cs42l52: Reorder Min/Max and update to SX_TLV for Beep Volume
by brian.austin＠cirrus.com 06 Aug '13

06 Aug '13

From: Brian Austin <brian.austin(a)cirrus.com> Beep Volume Min/Max was backwards. Change to SOC_SONGLE_SX_TLV for correct volume representation Signed-off-by: Brian Austin <brian.austin(a)cirrus.com> --- sound/soc/codecs/cs42l52.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 987f728..ee25f32 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -451,7 +451,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { SOC_ENUM("Beep Pitch", beep_pitch_enum), SOC_ENUM("Beep on Time", beep_ontime_enum), SOC_ENUM("Beep off Time", beep_offtime_enum), - SOC_SINGLE_TLV("Beep Volume", CS42L52_BEEP_VOL, 0, 0x1f, 0x07, hl_tlv), + SOC_SINGLE_SX_TLV("Beep Volume", CS42L52_BEEP_VOL, 0, 0x07, 0x1f, hl_tlv), SOC_SINGLE("Beep Mixer Switch", CS42L52_BEEP_TONE_CTL, 5, 1, 1), SOC_ENUM("Beep Treble Corner Freq", beep_treble_enum), SOC_ENUM("Beep Bass Corner Freq", beep_bass_enum), -- 1.7.10.4

2 2