November 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/6] ALSA: PCM: Remove redundant null check before kfree
by Sachin Kamat 02 Dec '12

02 Dec '12

kfree on a null pointer is a no-op. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- Build tested and based on linux-next 20121115. --- sound/core/pcm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 030102c..61798f8 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -981,8 +981,7 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream) PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control))); kfree(runtime->hw_constraints.rules); #ifdef CONFIG_SND_PCM_XRUN_DEBUG - if (runtime->hwptr_log) - kfree(runtime->hwptr_log); + kfree(runtime->hwptr_log); #endif kfree(runtime); substream->runtime = NULL; -- 1.7.4.1

3 14

[alsa-devel] [PATCH 1/1] ASoC: wm9090: Use devm_regmap_init_i2c()
by Sachin Kamat 02 Dec '12

02 Dec '12

devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- sound/soc/codecs/wm9090.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index c7ddc56..bb55a70 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c @@ -628,7 +628,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, return -ENOMEM; } - wm9090->regmap = regmap_init_i2c(i2c, &wm9090_regmap); + wm9090->regmap = devm_regmap_init_i2c(i2c, &wm9090_regmap); if (IS_ERR(wm9090->regmap)) { ret = PTR_ERR(wm9090->regmap); dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); @@ -637,16 +637,16 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, ret = regmap_read(wm9090->regmap, WM9090_SOFTWARE_RESET, &reg); if (ret < 0) - goto err; + return ret; + if (reg != 0x9093) { dev_err(&i2c->dev, "Device is not a WM9090, ID=%x\n", reg); - ret = -ENODEV; - goto err; + return -ENODEV; } ret = regmap_write(wm9090->regmap, WM9090_SOFTWARE_RESET, 0); if (ret < 0) - goto err; + return ret; if (i2c->dev.platform_data) memcpy(&wm9090->pdata, i2c->dev.platform_data, @@ -658,23 +658,15 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, &soc_codec_dev_wm9090, NULL, 0); if (ret != 0) { dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); - goto err; + return ret; } return 0; - -err: - regmap_exit(wm9090->regmap); - return ret; } static int __devexit wm9090_i2c_remove(struct i2c_client *i2c) { - struct wm9090_priv *wm9090 = i2c_get_clientdata(i2c); - snd_soc_unregister_codec(&i2c->dev); - regmap_exit(wm9090->regmap); - return 0; } -- 1.7.4.1

2 1

[alsa-devel] [PATCH - hdsp.c 1/1] HDSP fixes for RPM
by Karl Grill 01 Dec '12

01 Dec '12

- changed iobox recognition and firmware loading to mimick XP driver - added loop to check_for_iobox() to fix timing issues Signed-off-by: Karl Grill <kgrill(a)chello.at> diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 0d6930c..4229b0d 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -155,10 +155,11 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin"); #define HDSP_BIGENDIAN_MODE 0x200 #define HDSP_RD_MULTIPLE 0x400 #define HDSP_9652_ENABLE_MIXER 0x800 +#define HDSP_DUNNO 0x1000 #define HDSP_TDO 0x10000000 -#define HDSP_S_PROGRAM (HDSP_PROGRAM|HDSP_CONFIG_MODE_0) -#define HDSP_S_LOAD (HDSP_PROGRAM|HDSP_CONFIG_MODE_1) +#define HDSP_S_PROGRAM (HDSP_DUNNO|HDSP_PROGRAM|HDSP_CONFIG_MODE_0) +#define HDSP_S_LOAD (HDSP_DUNNO|HDSP_PROGRAM|HDSP_CONFIG_MODE_1) /* Control Register bits */ @@ -676,13 +677,20 @@ static unsigned int hdsp_read(struct hdsp *hdsp, int reg) static int hdsp_check_for_iobox (struct hdsp *hdsp) { + int i; + if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0; - if (hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError) { - snd_printk("Hammerfall-DSP: no IO box connected!\n"); - hdsp->state &= ~HDSP_FirmwareLoaded; - return -EIO; + for(i=0; i<10000; i++) { + if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError)==0) { + if(i) + snd_printk("Hammerfall-DSP: IO box found after %d ms\n", i); + return 0; + } + msleep(1); } - return 0; + snd_printk("Hammerfall-DSP: no IO box connected!\n"); + hdsp->state &= ~HDSP_FirmwareLoaded; + return -EIO; } static int hdsp_wait_for_iobox(struct hdsp *hdsp, unsigned int loops, @@ -722,6 +730,7 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) { if (hdsp_fifo_wait (hdsp, 0, HDSP_LONG_WAIT)) { snd_printk ("Hammerfall-DSP: timeout waiting for download preparation\n"); + hdsp_write (hdsp, HDSP_control2Reg, 0x800); return -EIO; } @@ -731,25 +740,25 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) { hdsp_write(hdsp, HDSP_fifoData, hdsp->firmware_cache[i]); if (hdsp_fifo_wait (hdsp, 127, HDSP_LONG_WAIT)) { snd_printk ("Hammerfall-DSP: timeout during firmware loading\n"); + hdsp_write (hdsp, HDSP_control2Reg, 0x800); return -EIO; } } - ssleep(3); - - if (hdsp_fifo_wait (hdsp, 0, HDSP_LONG_WAIT)) { - snd_printk ("Hammerfall-DSP: timeout at end of firmware loading\n"); - return -EIO; - } + hdsp_fifo_wait (hdsp, 3, HDSP_LONG_WAIT); + hdsp_write (hdsp, HDSP_control2Reg, 0x800); + ssleep(3); #ifdef SNDRV_BIG_ENDIAN hdsp->control2_register = HDSP_BIGENDIAN_MODE; #else hdsp->control2_register = 0; #endif + hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register); snd_printk ("Hammerfall-DSP: finished firmware loading\n"); + } if (hdsp->state & HDSP_InitializationComplete) { snd_printk(KERN_INFO "Hammerfall-DSP: firmware loaded from cache, restoring defaults\n"); @@ -767,24 +776,46 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp) { if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) { - hdsp_write (hdsp, HDSP_control2Reg, HDSP_PROGRAM); + hdsp_write (hdsp, HDSP_control2Reg, 0x10a0); hdsp_write (hdsp, HDSP_fifoData, 0); - if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0) - return -EIO; - - hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD); + if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0) { + hdsp_write(hdsp, HDSP_control2Reg, 0x900); + hdsp_write(hdsp, HDSP_control2Reg, 0x10a0); + } + hdsp_write(hdsp, HDSP_control2Reg, 0x820); hdsp_write (hdsp, HDSP_fifoData, 0); - - if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT)) { - hdsp_write(hdsp, HDSP_control2Reg, HDSP_VERSION_BIT); - hdsp_write(hdsp, HDSP_control2Reg, HDSP_S_LOAD); - if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT)) - hdsp->io_type = RPM; - else - hdsp->io_type = Multiface; - } else { - hdsp->io_type = Digiface; + if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0) { + hdsp->io_type=Multiface; + snd_printk("Hammerfall-DSP: Multiface found\n"); + return 0; + } + hdsp_write(hdsp, HDSP_control2Reg, 0x10a0); + hdsp_write (hdsp, HDSP_fifoData, 0); + if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) == 0) { + hdsp->io_type=Digiface; + snd_printk("Hammerfall-DSP: Digiface found\n"); + return 0; + } + hdsp_write(hdsp, HDSP_control2Reg, 0x900); + hdsp_write(hdsp, HDSP_control2Reg, 0x10a0); + hdsp_write (hdsp, HDSP_fifoData, 0); + if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) == 0) { + hdsp->io_type=Multiface; + snd_printk("Hammerfall-DSP: Multiface found\n"); + return 0; + } + hdsp_write(hdsp, HDSP_control2Reg, 0x900); + hdsp_write(hdsp, HDSP_control2Reg, 0x10a0); + hdsp_write (hdsp, HDSP_fifoData, 0); + if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0) { + hdsp->io_type=Multiface; + snd_printk("Hammerfall-DSP: Multiface found\n"); + return 0; } + hdsp->io_type=RPM; + snd_printk("Hammerfall-DSP: RPM found\n"); + return 0; + } else { /* firmware was already loaded, get iobox type */ if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version2) -- 1.7.2.5

2 2

[alsa-devel] ASoC updates for v3.8
by Mark Brown 29 Nov '12

29 Nov '12

The following changes since commit 9489e9dcae718d5fde988e4a684a0f55b5f94d17: Linux 3.7-rc7 (2012-11-25 17:59:19 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next for you to fetch changes up to 536bc8f605a8ea62d1f75d5ec3ed8bc0526a6271: Merge branches 'fix/fsl', 'topic/ab8500', 'topic/adsp', 'topic/ak4104', 'topic/ak4535', 'topic/ak4642', 'topic/atmel', 'topic/cs4271', 'topic/da7210', 'topic/da9055', 'topic/davinci', 'topic/dmaengine', 'topic/fsi', 'topic/fsl', 'topic/hotplug', 'topic/jack', 'topic/jz4740', 'topic/kirkwood', 'topic/lm49453', 'topic/log', 'topic/max98090', 'topic/rt5631', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2000', 'topic/wm2200', 'topic/wm8350', 'topic/wm8400', 'topic/wm8510', 'topic/wm8741', 'topic/wm8750', 'topic/wm8753', 'topic/wm8770', 'topic/wm8804', 'topic/wm8962', 'topic/wm8971', 'topic/wm8978', 'topic/wm8985', 'topic/wm8988', 'topic/wm8993', 'topic/wm8994' and 'topic/wm8995' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next (2012-11-29 15:48:59 +0000) ---------------------------------------------------------------- ASoC: Updates for v3.8 Very quiet release for ASoC really: - Standardisation of the logging. - DT support for Atmel. - Support for Wolfson ADSP cores. - New drivers for Freescale/iVeia P1022 and Maxim MAX98090. ---------------------------------------------------------------- Will probably have another update with some bug fixes and trivial cleanups tomorrow. Andrey Smirnov (1): Add a codec driver for SI476X MFD Ashish Chavan (2): ASoC: da9055: Add support for DSP mode of AIF ASoC: da9055: DAPMise Headphone and Lineout enable controls Bill Pemberton (2): ASoC: remove use of __devinitconst ASoC: max98088: remove use of __devexit_p Bo Shen (9): ASoC: atmel-ssc: use devm_xxx() managed function ASoC: atmel-ssc: use module_platform_driver macro ASoC: sam9g20-wm8731: convert to use snd_soc_register_card() ASoC: sam9g20: using platform device for audio part ARM: at91: atmel-ssc: add platform device id table ARM: at91: atmel-ssc: add device tree support ASoC: atmel-ssc-dai: register dai and pcm directly ASoC: atmel-ssc-dai: match new method of dai and pcm register ASoC: at91sam9g20ek-wm8731: convert to dt support Charles Keepax (4): ASoC: wm5102: Correct micbias DAPM supplies ASoC: arizona: Add support for multiplexer with no associated mixer ASoC: wm5102: Remove mixer widgets on the ASRC ASoC: wm5110: Remove mixer widgets on the ASRC Daniel Mack (10): ASoC: ak4104: handle more sample rates ASoC: ak4104: add DT bindings ASoC: cs4271: add support for AMUTEB=BMUTEC feature ASoC: enable 192KHz support for McASP ASoC: McASP: add support for clock dividers ASoC: McASP: make AHCLK direction configurable ASoC: McASP: set format parameters in dependence of the DAI format ASoC: McASP: add support for 24 bit samples ASoC: McASP: treat SNDRV_PCM_FORMAT_U24_* as 32 bit words ASoC: ak4104: add reset line property to DT bindings Dimitris Papastamos (3): ASoC: bells: Up to 512fs ASoC: wm5102: Register DSP1 Aux widgets ASoC: wm0010: Up the completion timeout to 20ms instead of 10ms Eric Millbrandt (2): ASoC: fsl/pcm030 add unique dai_link names ASoC: wm8978: Remove remuxing of GPIO1 pin Javier Martin (2): ASoC: tlv320aic32x4: Fix problem with first capture. ASoC: tlv320aic32x4: Add rstn gpio to platform data. Kees Cook (1): ASoC: fsl: remove CONFIG_EXPERIMENTAL Kuninori Morimoto (13): ASoC: fsi: fixup channels_min/max ASoC: fsi: use devm_request_irq() ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only ASoC: fsi: care fsi_hw_start/stop() return value ASoC: fsi: add master clock control functions ASoC: fsi: tidyup FSIA/B settings ASoC: fsi: tidyup sh_fsi_platform_info pointer ASoC: fsi: SPDIF format become independent from platform flags ASoC: fsi: master clock selection become independent from platform flags ASoC: fsi: stream mode become independent from platform flags ASoC: fsi: add SND_SOC_DAIFMT_INV_xxx support ASoC: ak4642: cleanup struct ak4642_priv ASoC: Add max98090 codec driver Lars-Peter Clausen (3): ASoC: jz4740-codec: Add dB information ASoC: jz4740-codec: Use devm_request_and_ioremap ASoC: jz4740-codec: Use regmap Lee Jones (1): ASoC: Ux500: Initialise PCM from MSP probe rather than as a device Liam Girdwood (5): ASoC: dapm: Standardise ASoC DAPM messages ASoC: cache: Standardise ASoC cache messages ASoC: Jack: Standardise ASoC Jack messages ASoC: pcm: Standardise ASoC PCM messages ASoC: core: Standardise ASoC messages Lothar Waßmann (6): ASoC: imx: add MODULE_LICENSE("GPL") ASoC: imx-sgtl5000: prevent module from being unloaded when in use ASoC: dmaengine_pcm: set MODULE_LICENSE ASoC: fsl: fix miscompilation of snd-soc-imx-pcm ASoC: mxs-saif: export mxs_saif_put_mclk,mxs_saif_get_mclk ASoC: fsl: fix miscompilation of snd-soc-imx-pcm Mark Brown (67): ASoC: wm2200: Convert to devm APIs ASoC: wm2200: Implement AEC loopback support ASoC: wm2200: Map DSPs into regmap ASoC: wm2200: Fully plumb the DSPs into the routing map ASoC: wm2200: Initial DSP support ASoC: wm2200: Provide initial coefficient loading regmap: Rename n_ranges to num_ranges regmap: When we sanity check during range adds say what errors we find regmap: Allow ranges to be named regmap: Factor out debugfs register read regmap: Provide debugfs read of register ranges regmap: Factor range lookup out of page selection regmap: Make return code checks consistent regmap: Split raw writes that cross window boundaries ASoC: bells: Add WM0010 support ASoC: bells: Correct typo in sub speaker DAI name for WM5110 ASoC: bells: Provide additional parameterisation ASoC: bells: Add WM2200 support ASoC: wm8750: Convert to direct regmap API usage ASoC: wm8770: Convert to direct regmap API usage ASoC: wm8770: Remove unneeded bias level manipulation ASoC: wm8770: Remove regulator allocation to SPI probe ASoC: wm8770: Conver to table based DAPM and control init ASoC: wm8971: Convert to direct regmap API usage ASoC: wm8994: Allow a delay between jack insertion and microphone detect ASoC: wm8994: Tune VMID power up sequence ASoC: wm8994: Tune VMID power down sequence ASoC: wm8958: Load firmwares simultaneously Merge tag 'regmap/range' of git://git.kernel.org/.../broonie/regmap into asoc-wm2200 ASoC: wm2200: Add names for ranges ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHz ASoC: adsp: Add ADSP base support Merge branch 'topic/adsp' of git://git.kernel.org/.../broonie/sound into asoc-arizona ASoC: arizona: Define standard hookup for ADSP2 ASoC: wm5102: Hook up DSP1 Merge branch 'topic/adsp' of git://git.kernel.org/.../broonie/sound into asoc-wm2200 ASoC: wm2200: Convert over to wm_adsp for ADSP1 support Merge tag 'v3.7-rc3' into HEAD ASoC: ab8500: Staticise non-exported ab85000_codec_dai Merge tag 'v3.7-rc6' into asoc-arizona Merge tag 'v3.7-rc6' into asoc-wm2200 ASoC: wm5102: Remove output OSR and PGA volume control ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHz mfd: wm8994: Store platform data in device ASoC: wm8994: Use pdata cached in MFD driver ASoC: arizona: Support higher clock rates ASoC: wm2000: Get the CODEC pointer from the widget ASoC: wm5102: Add missing routes for ASRC inputs ASoC: arizona: Suppress noop FLL updates ASoC: wm0010: Ignore interrupts in power down mode ASoC: pcm: Report error code when we fail to init platform Merge tag 'v3.7-rc7' into asoc-ux500 Merge tag 'v3.7-rc7' into asoc-wm2200 ASoC: arizona: Record FLL setting when disabling mfd: arizona: Allow the CODEC DAPM context to be accessed elsewhere Input - arizona-haptics: Add driver haptics module on Arizona CODECs ASoC: wm5102: Implement haptics support ASoC: wm5110: Implement haptics support mfd: arizona: Register haptics devices ASoC: wm8994: Use the same DCS codes for all WM1811 variants ASoC: wm_adsp: Enable DVFS for ADSP2 Merge branch 'topic/adsp' of git://git.kernel.org/.../broonie/sound into asoc-arizona ASoC: wm5102: Enable DVFS support for the DSP ASoC: wm_adsp: Set the core enable as well as start bit for ADSP2 Merge branches 'topic/omap' and 'topic/arizona' of git://git.kernel.org/.../broonie/sound into asoc-next ASoC: arizona: Add parentheses Merge branches 'fix/fsl', 'topic/ab8500', 'topic/adsp', 'topic/ak4104', 'topic/ak4535', 'topic/ak4642', 'topic/atmel', 'topic/cs4271', 'topic/da7210', 'topic/da9055', 'topic/davinci', 'topic/dmaengine', 'topic/fsi', 'topic/fsl', 'topic/hotplug', 'topic/jack', 'topic/jz4740', 'topic/kirkwood', 'topic/lm49453', 'topic/log', 'topic/max98090', 'topic/rt5631', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2000', 'topic/wm2200', 'topic/wm8350', 'topic/wm8400', 'topic/wm8510', 'topic/wm8741', 'topic/wm8750', 'topic/wm8753', 'topic/wm8770', 'topic/wm8804', 'topic/wm8962', 'topic/wm8971', 'topic/wm8978', 'topic/wm8985', 'topic/wm8988', 'topic/wm8993', 'topic/wm8994' and 'topic/wm8995' of git://git.kernel.org/.../broonie/sound into asoc-next Matt Porter (2): ASoC: davinci: replace private sram api with genalloc ARM: davinci: enable SRAM ping ping buffering on DA850 Nicolas Ferre (1): ASoC: atmel-ssc: add phybase in device structure Padmavathi Venna (1): ASoC: Samsung: Get I2S src_clk from clock alias id. Peter Ujfalusi (1): ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as boolean Randy Dunlap (1): ASoC: fix wm2200.c printk format warnings Russell King (5): ASoC: kirkwood-i2s: use devm_* APIs ASoC: kirkwood-i2s: better handling of play/record control registers ASoC: kirkwood-dma: remove restriction on sample rates ASoC: kirkwood-i2s: add support for external clock rates ASoC: kirkwood-dma: remove channel restrictions Sachin Kamat (9): ASoC: rt5631: Fix return value ASoC: wm8350: Use devm_regulator_bulk_get ASoC: wm8962: Use devm_regulator_bulk_get ASoC: wm8400: Use devm_regulator_bulk_get ASoC: wm8993: Use devm_regulator_bulk_get ASoC: ak4535: Use devm_regmap_init_i2c() ASoC: da7210: Use devm_regmap_init_i2c() ASoC: lm49453: Use devm_regmap_init_i2c() ASoC: wm2200: Remove empty labels Scott Ling (4): ASoC: wm0010: Remove boot_done variable as no longer required. ASoC: wm0010: Split out the firmware file parsing from the boot ASoC: wm0010: Split out the stage2 load from the boot function ASoC: wm0010: Add checking for .dfw info record version. Thomas Abraham (4): ASoC: SAMSUNG: ac97: use clk_prepare_enable and clk_disable_unprepare ASoC: SAMSUNG: i2s: use clk_prepare_enable and clk_disable_unprepare ASoC: SAMSUNG: pcm: use clk_prepare_enable and clk_disable_unprepare ASoC: SAMSUNG: spdif: use clk_prepare_enable and clk_disable_unprepare Timur Tabi (1): ASoC: add support for the Freescale / iVeia P1022 RDK reference board Tony Lindgren (1): ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support Tushar Behera (10): ASoC: wm8510: remove invalid free of devm_ allocated data ASoC: wm8753: remove invalid free of devm_ allocated data ASoC: wm8995: Convert to use devm_kzalloc() ASoC: wm8741: Convert to use devm_regmap_init_{spi,i2c}() ASoC: wm8753: Convert to use devm_regmap_init_{spi,i2c}() ASoC: wm8995: Convert to use devm_regmap_init_{spi,i2c}() ASoC: wm8804: Convert to use devm_regmap_init_{spi,i2c}() ASoC: wm8985: Convert to use devm_regmap_init_{spi,i2c}() ASoC: wm8988: Convert to use devm_regmap_init_{spi,i2c}() ASoC: ak4104: Convert to use devm_regmap_init_spi() Ulf Hansson (2): ASoC: Ux500: Fixup use of clocks ASoC: Ux500: Control apb clock Wei Yongjun (1): ASoC: jack: remove unused variable in snd_soc_jack_report() .../devicetree/bindings/misc/atmel-ssc.txt | 15 + Documentation/devicetree/bindings/sound/ak4104.txt | 22 + .../sound/atmel-at91sam9g20ek-wm8731-audio.txt | 26 + Documentation/devicetree/bindings/sound/cs4271.txt | 2 + .../devicetree/bindings/sound/omap-abe-twl6040.txt | 4 +- arch/arm/boot/dts/at91sam9260.dtsi | 8 + arch/arm/boot/dts/at91sam9263.dtsi | 16 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 32 +- arch/arm/boot/dts/at91sam9g45.dtsi | 16 + arch/arm/boot/dts/at91sam9x5.dtsi | 8 + arch/arm/mach-at91/at91rm9200.c | 9 +- arch/arm/mach-at91/at91rm9200_devices.c | 6 +- arch/arm/mach-at91/at91sam9260.c | 3 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 9 +- arch/arm/mach-at91/at91sam9261_devices.c | 6 +- arch/arm/mach-at91/at91sam9263.c | 6 +- arch/arm/mach-at91/at91sam9263_devices.c | 4 +- arch/arm/mach-at91/at91sam9g45.c | 6 +- arch/arm/mach-at91/at91sam9g45_devices.c | 4 +- arch/arm/mach-at91/at91sam9rl.c | 6 +- arch/arm/mach-at91/at91sam9rl_devices.c | 4 +- arch/arm/mach-at91/at91sam9x5.c | 1 + arch/arm/mach-at91/board-sam9g20ek.c | 11 + arch/arm/mach-davinci/board-da850-evm.c | 24 +- drivers/base/regmap/internal.h | 2 + drivers/base/regmap/regmap-debugfs.c | 50 +- drivers/base/regmap/regmap.c | 154 +++-- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/arizona-haptics.c | 255 ++++++++ drivers/mfd/arizona-core.c | 2 + drivers/mfd/wm8994-core.c | 35 +- drivers/misc/atmel-ssc.c | 135 ++-- include/linux/atmel-ssc.h | 6 + include/linux/mfd/arizona/core.h | 4 + include/linux/mfd/arizona/pdata.h | 6 + include/linux/mfd/wm8994/core.h | 4 + include/linux/mfd/wm8994/pdata.h | 5 + include/linux/platform_data/asoc-s3c.h | 6 - include/linux/platform_data/davinci_asp.h | 3 + include/linux/regmap.h | 6 +- include/sound/cs4271.h | 1 + include/sound/sh_fsi.h | 6 + include/sound/tlv320aic32x4.h | 1 + sound/soc/atmel/Kconfig | 3 +- sound/soc/atmel/atmel-pcm.c | 23 +- sound/soc/atmel/atmel-pcm.h | 3 + sound/soc/atmel/atmel_ssc_dai.c | 157 ++--- sound/soc/atmel/atmel_ssc_dai.h | 3 +- sound/soc/atmel/sam9g20_wm8731.c | 116 +++- sound/soc/codecs/Kconfig | 16 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ab8500-codec.c | 2 +- sound/soc/codecs/ak4104.c | 65 +- sound/soc/codecs/ak4535.c | 7 +- sound/soc/codecs/ak4642.c | 23 +- sound/soc/codecs/arizona.c | 21 + sound/soc/codecs/arizona.h | 65 +- sound/soc/codecs/cs4271.c | 21 +- sound/soc/codecs/da7210.c | 13 +- sound/soc/codecs/da9055.c | 43 +- sound/soc/codecs/jz4740.c | 142 ++--- sound/soc/codecs/lm49453.c | 10 +- sound/soc/codecs/max98088.c | 14 +- sound/soc/codecs/max98090.c | 577 +++++++++++++++++ sound/soc/codecs/rt5631.c | 2 +- sound/soc/codecs/si476x.c | 255 ++++++++ sound/soc/codecs/tlv320aic32x4.c | 24 + sound/soc/codecs/tlv320aic32x4.h | 3 + sound/soc/codecs/wm0010.c | 419 +++++++----- sound/soc/codecs/wm2000.c | 2 +- sound/soc/codecs/wm2200.c | 269 ++++++-- sound/soc/codecs/wm5100.c | 2 +- sound/soc/codecs/wm5102.c | 120 ++-- sound/soc/codecs/wm5110.c | 49 +- sound/soc/codecs/wm8350.c | 4 +- sound/soc/codecs/wm8400.c | 14 +- sound/soc/codecs/wm8510.c | 3 - sound/soc/codecs/wm8741.c | 4 +- sound/soc/codecs/wm8750.c | 86 ++- sound/soc/codecs/wm8753.c | 33 +- sound/soc/codecs/wm8770.c | 217 ++++--- sound/soc/codecs/wm8804.c | 17 +- sound/soc/codecs/wm8958-dsp2.c | 79 +-- sound/soc/codecs/wm8962.c | 7 +- sound/soc/codecs/wm8971.c | 80 ++- sound/soc/codecs/wm8978.c | 3 - sound/soc/codecs/wm8985.c | 30 +- sound/soc/codecs/wm8988.c | 14 +- sound/soc/codecs/wm8993.c | 7 +- sound/soc/codecs/wm8994.c | 184 +++--- sound/soc/codecs/wm8994.h | 1 - sound/soc/codecs/wm8995.c | 40 +- sound/soc/codecs/wm_adsp.c | 666 ++++++++++++++++++++ sound/soc/codecs/wm_adsp.h | 59 ++ sound/soc/codecs/wmfw.h | 128 ++++ sound/soc/davinci/davinci-evm.c | 5 + sound/soc/davinci/davinci-mcasp.c | 93 ++- sound/soc/davinci/davinci-mcasp.h | 2 +- sound/soc/davinci/davinci-pcm.c | 53 +- sound/soc/davinci/davinci-pcm.h | 2 + sound/soc/fsl/Kconfig | 20 +- sound/soc/fsl/Makefile | 14 +- sound/soc/fsl/imx-pcm.c | 4 + sound/soc/fsl/imx-sgtl5000.c | 1 + sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++ sound/soc/fsl/pcm030-audio-fabric.c | 4 +- sound/soc/kirkwood/kirkwood-dma.c | 16 +- sound/soc/kirkwood/kirkwood-i2s.c | 235 ++++--- sound/soc/kirkwood/kirkwood.h | 11 +- sound/soc/mxs/mxs-saif.c | 2 + sound/soc/omap/mcbsp.c | 4 +- sound/soc/omap/mcbsp.h | 6 + sound/soc/omap/omap-abe-twl6040.c | 4 +- sound/soc/omap/omap-mcbsp.c | 5 +- sound/soc/samsung/ac97.c | 6 +- sound/soc/samsung/bells.c | 222 +++++-- sound/soc/samsung/i2s.c | 20 +- sound/soc/samsung/pcm.c | 12 +- sound/soc/samsung/spdif.c | 12 +- sound/soc/sh/fsi.c | 550 ++++++++++++++-- sound/soc/soc-cache.c | 10 +- sound/soc/soc-core.c | 243 +++---- sound/soc/soc-dapm.c | 134 ++-- sound/soc/soc-dmaengine-pcm.c | 2 + sound/soc/soc-jack.c | 16 +- sound/soc/soc-pcm.c | 195 +++--- sound/soc/tegra/tegra20_das.c | 2 +- sound/soc/tegra/tegra20_i2s.c | 4 +- sound/soc/tegra/tegra20_spdif.c | 2 +- sound/soc/tegra/tegra30_ahub.c | 6 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_wm8753.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 2 +- sound/soc/tegra/trimslice.c | 2 +- sound/soc/ux500/mop500.c | 4 +- sound/soc/ux500/ux500_msp_dai.c | 55 +- sound/soc/ux500/ux500_msp_dai.h | 1 + sound/soc/ux500/ux500_pcm.c | 19 +- sound/soc/ux500/ux500_pcm.h | 3 + 142 files changed, 5700 insertions(+), 1796 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt create mode 100644 drivers/input/misc/arizona-haptics.c create mode 100644 sound/soc/codecs/max98090.c create mode 100644 sound/soc/codecs/si476x.c create mode 100644 sound/soc/codecs/wm_adsp.c create mode 100644 sound/soc/codecs/wm_adsp.h create mode 100644 sound/soc/codecs/wmfw.h create mode 100644 sound/soc/fsl/p1022_rdk.c

2 6

[alsa-devel] [PATCH 1/4] ASoC: firmware: Add support for FW based kcontrols.
by Liam Girdwood 29 Nov '12

29 Nov '12

This patch adds initial support for firmware based kcontrols by allowing soc.h to be included by any userspace firmware generation tools and assigns IDs to the standard ASoC kcontrol types using the kcontrol_new index and IDs to kcontrol get/put/info functions. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- include/sound/soc.h | 135 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 116 insertions(+), 19 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 91244a0..b0b1703 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -13,6 +13,8 @@ #ifndef __LINUX_SND_SOC_H #define __LINUX_SND_SOC_H +#ifdef __KERNEL__ + #include <linux/platform_device.h> #include <linux/types.h> #include <linux/notifier.h> @@ -27,6 +29,8 @@ #include <sound/control.h> #include <sound/ac97_codec.h> +#endif + /* * Convenience kcontrol builders */ @@ -51,12 +55,12 @@ #define SOC_SINGLE(xname, reg, shift, max, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ - .put = snd_soc_put_volsw, \ + .put = snd_soc_put_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } #define SOC_SINGLE_RANGE(xname, xreg, xshift, xmin, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .info = snd_soc_info_volsw_range, .get = snd_soc_get_volsw_range, \ - .put = snd_soc_put_volsw_range, \ + .put = snd_soc_put_volsw_range, .index = SOC_CONTROL_IO_RANGE, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .shift = xshift, .min = xmin,\ .max = xmax, .platform_max = xmax, .invert = xinvert} } @@ -66,7 +70,7 @@ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ - .put = snd_soc_put_volsw, \ + .put = snd_soc_put_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } #define SOC_SINGLE_SX_TLV(xname, xreg, xshift, xmin, xmax, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ @@ -76,6 +80,7 @@ .info = snd_soc_info_volsw, \ .get = snd_soc_get_volsw_sx,\ .put = snd_soc_put_volsw_sx, \ + .index = SOC_CONTROL_IO_VOLSW_SX \ .private_value = (unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .rreg = xreg, \ .shift = xshift, .rshift = xshift, \ @@ -85,7 +90,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw_range, \ + .info = snd_soc_info_volsw_range, .index = SOC_CONTROL_IO_RANGE, \ .get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .shift = xshift, .min = xmin,\ @@ -93,19 +98,19 @@ #define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ - .put = snd_soc_put_volsw, \ + .put = snd_soc_put_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \ max, invert) } #define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \ .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ xmax, xinvert) } #define SOC_DOUBLE_R_RANGE(xname, reg_left, reg_right, xshift, xmin, \ xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ - .info = snd_soc_info_volsw_range, \ + .info = snd_soc_info_volsw_range, .index = SOC_CONTROL_IO_RANGE, \ .get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \ .private_value = SOC_DOUBLE_R_RANGE_VALUE(reg_left, reg_right, \ xshift, xmin, xmax, xinvert) } @@ -115,7 +120,7 @@ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ - .put = snd_soc_put_volsw, \ + .put = snd_soc_put_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \ max, invert) } #define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \ @@ -123,7 +128,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_VOLSW, \ .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \ .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ xmax, xinvert) } @@ -133,7 +138,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw_range, \ + .info = snd_soc_info_volsw_range, .index = SOC_CONTROL_IO_RANGE, \ .get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \ .private_value = SOC_DOUBLE_R_RANGE_VALUE(reg_left, reg_right, \ xshift, xmin, xmax, xinvert) } @@ -145,6 +150,7 @@ .info = snd_soc_info_volsw, \ .get = snd_soc_get_volsw_sx, \ .put = snd_soc_put_volsw_sx, \ + .index = SOC_CONTROL_IO_SX, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .rreg = xrreg, \ .shift = xshift, .rshift = xshift, \ @@ -155,7 +161,7 @@ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \ - .put = snd_soc_put_volsw_s8, \ + .put = snd_soc_put_volsw_s8, .index = SOC_CONTROL_IO_VOLSW_S8, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .min = xmin, .max = xmax, \ .platform_max = xmax} } @@ -174,7 +180,7 @@ SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xmax, xtexts, xvalues) #define SOC_ENUM(xname, xenum) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\ - .info = snd_soc_info_enum_double, \ + .info = snd_soc_info_enum_double, .index = SOC_CONTROL_IO_ENUM, \ .get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \ .private_value = (unsigned long)&xenum } #define SOC_VALUE_ENUM(xname, xenum) \ @@ -182,17 +188,18 @@ .info = snd_soc_info_enum_double, \ .get = snd_soc_get_value_enum_double, \ .put = snd_soc_put_value_enum_double, \ + .index = SOC_CONTROL_IO_ENUM_VALUE, \ .private_value = (unsigned long)&xenum } #define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\ xhandler_get, xhandler_put) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) } #define SOC_DOUBLE_EXT(xname, reg, shift_left, shift_right, max, invert,\ xhandler_get, xhandler_put) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = \ SOC_DOUBLE_VALUE(reg, shift_left, shift_right, max, invert) } @@ -202,7 +209,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) } #define SOC_DOUBLE_EXT_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert,\ @@ -211,7 +218,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_EXT,\ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, \ xmax, xinvert) } @@ -221,24 +228,25 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw, .index = SOC_CONTROL_IO_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ xmax, xinvert) } #define SOC_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_bool_ext, \ + .info = snd_soc_info_bool_ext, .index = SOC_CONTROL_IO_BOOL_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = xdata } #define SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_enum_ext, \ + .info = snd_soc_info_enum_ext, .index = SOC_CONTROL_IO_ENUM_EXT, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = (unsigned long)&xenum } #define SND_SOC_BYTES(xname, xbase, xregs) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ + .index = SOC_CONTROL_IO_BYTES, \ .put = snd_soc_bytes_put, .private_value = \ ((unsigned long)&(struct soc_bytes) \ {.base = xbase, .num_regs = xregs }) } @@ -247,6 +255,7 @@ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ .put = snd_soc_bytes_put, .private_value = \ + .index = SOC_CONTROL_IO_BYTES, \ ((unsigned long)&(struct soc_bytes) \ {.base = xbase, .num_regs = xregs, \ .mask = xmask }) } @@ -256,6 +265,7 @@ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ .info = snd_soc_info_xr_sx, .get = snd_soc_get_xr_sx, \ .put = snd_soc_put_xr_sx, \ + .index = SOC_CONTROL_IO_XR_SX, \ .private_value = (unsigned long)&(struct soc_mreg_control) \ {.regbase = xregbase, .regcount = xregcount, .nbits = xnbits, \ .invert = xinvert, .min = xmin, .max = xmax} } @@ -281,6 +291,92 @@ #define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \ SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues) + +/* + * Numeric IDs for stock mixer types that are used to enumerate FW based mixers. + */ + +#define SOC_CONTROL_ID_PUT(p) ((p & 0xff) << 16) +#define SOC_CONTROL_ID_GET(g) ((g & 0xff) << 8) +#define SOC_CONTROL_ID_INFO(i) ((i & 0xff) << 0) +#define SOC_CONTROL_ID(g, p, i) \ + (SOC_CONTROL_ID_PUT(p) | SOC_CONTROL_ID_GET(g) |\ + SOC_CONTROL_ID_INFO(i)) + +#define SOC_CONTROL_GET_ID_PUT(id) ((id & 0xff0000) >> 16) +#define SOC_CONTROL_GET_ID_GET(id) ((id & 0x00ff00) >> 8) +#define SOC_CONTROL_GET_ID_INFO(id) ((id & 0x0000ff) >> 0) + +/* individual kcontrol info types - can be mixed with other types */ +#define SOC_CONTROL_TYPE_EXT 0 /* driver defined */ +#define SOC_CONTROL_TYPE_VOLSW 1 +#define SOC_CONTROL_TYPE_VOLSW_SX 2 +#define SOC_CONTROL_TYPE_VOLSW_S8 3 +#define SOC_CONTROL_TYPE_VOLSW_XR_SX 4 +#define SOC_CONTROL_TYPE_ENUM 6 +#define SOC_CONTROL_TYPE_ENUM_EXT 7 +#define SOC_CONTROL_TYPE_BYTES 8 +#define SOC_CONTROL_TYPE_BOOL_EXT 9 +#define SOC_CONTROL_TYPE_ENUM_VALUE 10 +#define SOC_CONTROL_TYPE_RANGE 11 +#define SOC_CONTROL_TYPE_STROBE 12 + +/* compound control IDs */ +#define SOC_CONTROL_IO_VOLSW \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW, \ + SOC_CONTROL_TYPE_VOLSW, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_VOLSW_SX \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_SX, \ + SOC_CONTROL_TYPE_VOLSW_SX, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_VOLSW_S8 \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_S8, \ + SOC_CONTROL_TYPE_VOLSW_S8, \ + SOC_CONTROL_TYPE_VOLSW_S8) +#define SOC_CONTROL_IO_VOLSW_XR_SX \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_XR_SX, \ + SOC_CONTROL_TYPE_VOLSW_XR_SX, \ + SOC_CONTROL_TYPE_VOLSW_XR_SX) +#define SOC_CONTROL_IO_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_ENUM \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_ENUM, \ + SOC_CONTROL_TYPE_ENUM, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_CONTROL_IO_ENUM_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_ENUM_EXT) +#define SOC_CONTROL_IO_BYTES \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_BYTES, \ + SOC_CONTROL_TYPE_BYTES, \ + SOC_CONTROL_TYPE_BYTES) +#define SOC_CONTROL_IO_BOOL_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_BOOL_EXT) +#define SOC_CONTROL_IO_ENUM_VALUE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_ENUM_VALUE, \ + SOC_CONTROL_TYPE_ENUM_VALUE, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_CONTROL_IO_RANGE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_RANGE, \ + SOC_CONTROL_TYPE_RANGE, \ + SOC_CONTROL_TYPE_RANGE) +#define SOC_CONTROL_IO_STROBE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_STROBE, \ + SOC_CONTROL_TYPE_STROBE, \ + SOC_CONTROL_TYPE_STROBE) + +#ifdef __KERNEL__ + +#define snd_soc_get_enum_text(soc_enum, idx) \ + (soc_enum->texts ? soc_enum->texts[idx] : soc_enum->dtexts[idx]) + + /* * Component probe and remove ordering levels for components with runtime * dependencies. @@ -1178,3 +1274,4 @@ extern struct dentry *snd_soc_debugfs_root; extern const struct dev_pm_ops snd_soc_pm_ops; #endif +#endif -- 1.7.10.4

3 27

[alsa-devel] [PATCH] ALSA: usb - Don't create "Speaker" mixer controls on headphones and headsets
by David Henningsson 29 Nov '12

29 Nov '12

A lot of headsets/headphones have a "Speaker" mixer control. This confuses PulseAudio to think it is a speaker instead of a headphone/headset. Therfore, we rename it to "Headphone". We determine if something is a headphone similar to how udev determines form factor (see 78-sound-card.rules). BugLink: https://bugs.launchpad.net/bugs/1082357 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/usb/mixer.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) I tried to find a better way of doing this using the existing quirk or map infrastructure but it didn't seem to fit, so added a new explicit check. diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 298070e..63fd758 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1094,6 +1094,32 @@ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str) return strlcat(kctl->id.name, str, sizeof(kctl->id.name)); } +/* A lot of headsets/headphones have a "Speaker" mixer. Make sure we + rename it to "Headphone". We determine if something is a headphone + similar to how udev determines form factor. */ +static void check_no_speaker_on_headset(struct snd_kcontrol *kctl, + struct snd_card *card) +{ + const char *names_to_check[] = { + "Headset", "headset", "Headphone", "headphone", NULL}; + const char **s; + bool found = 0; + + if (strcmp("Speaker", kctl->id.name)) + return; + + for (s = names_to_check; *s; s++) + if (strstr(card->shortname, *s)) { + found = 1; + break; + } + + if (!found) + return; + + strlcpy(kctl->id.name, "Headphone", sizeof(kctl->id.name)); +} + static void build_feature_ctl(struct mixer_build *state, void *raw_desc, unsigned int ctl_mask, int control, struct usb_audio_term *iterm, int unitid, @@ -1180,6 +1206,10 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, len = snprintf(kctl->id.name, sizeof(kctl->id.name), "Feature %d", unitid); } + + if (!mapped_name) + check_no_speaker_on_headset(kctl, state->mixer->chip->card); + /* determine the stream direction: * if the connected output is USB stream, then it's likely a * capture stream. otherwise it should be playback (hopefully :) -- 1.7.9.5

4 5

[alsa-devel] [asoc:topic/adsp 139/139] sound/soc/codecs/wm_adsp.c:556 wm_adsp2_event() warn: add some parenthesis here?
by Dan Carpenter 29 Nov '12

29 Nov '12

Hi Mark, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/adsp head: 973838a030d2a91fbd524c95281991510ed0a865 commit: 973838a030d2a91fbd524c95281991510ed0a865 [139/139] ASoC: wm_adsp: Enable DVFS for ADSP2 + sound/soc/codecs/wm_adsp.c:556 wm_adsp2_event() warn: add some parenthesis here? git remote update asoc git checkout 973838a030d2a91fbd524c95281991510ed0a865 vim +556 sound/soc/codecs/wm_adsp.c 2159ad93 Mark Brown 2012-10-11 540 struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); 2159ad93 Mark Brown 2012-10-11 541 struct wm_adsp *dsp = &dsps[w->shift]; 973838a0 Mark Brown 2012-11-28 542 unsigned int val; 2159ad93 Mark Brown 2012-10-11 543 int ret; 2159ad93 Mark Brown 2012-10-11 544 2159ad93 Mark Brown 2012-10-11 545 switch (event) { 2159ad93 Mark Brown 2012-10-11 546 case SND_SOC_DAPM_POST_PMU: 973838a0 Mark Brown 2012-11-28 547 if (dsp->dvfs) { 973838a0 Mark Brown 2012-11-28 548 ret = regmap_read(dsp->regmap, 973838a0 Mark Brown 2012-11-28 549 dsp->base + ADSP2_CLOCKING, &val); 973838a0 Mark Brown 2012-11-28 550 if (ret != 0) { 973838a0 Mark Brown 2012-11-28 551 dev_err(dsp->dev, 973838a0 Mark Brown 2012-11-28 552 "Failed to read clocking: %d\n", ret); 973838a0 Mark Brown 2012-11-28 553 return ret; 973838a0 Mark Brown 2012-11-28 554 } 973838a0 Mark Brown 2012-11-28 555 973838a0 Mark Brown 2012-11-28 @556 if (val & ADSP2_CLK_SEL_MASK >= 3) { Precedence bug. The intent was: if (val & ADSP2_CLK_SEL_MASK) >= 3) { 973838a0 Mark Brown 2012-11-28 557 ret = regulator_enable(dsp->dvfs); 973838a0 Mark Brown 2012-11-28 558 if (ret != 0) { 973838a0 Mark Brown 2012-11-28 559 dev_err(dsp->dev, 973838a0 Mark Brown 2012-11-28 560 "Failed to enable supply: %d\n", 973838a0 Mark Brown 2012-11-28 561 ret); 973838a0 Mark Brown 2012-11-28 562 return ret; 973838a0 Mark Brown 2012-11-28 563 } 973838a0 Mark Brown 2012-11-28 564 --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [asoc:topic/arizona 16/21] drivers/input/misc/arizona-haptics.c:164 arizona_haptics_close() warn: variable dereferenced before check 'haptics->arizona->dapm' (see line 158)
by Dan Carpenter 29 Nov '12

29 Nov '12

Hi Mark, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/arizona head: cac27cff066cf86c6fefe33d99d935e9d0d9c78c commit: 9dd555e2f4de1af1bb0f75cc84ed0708fcdb5987 [16/21] Input - arizona-haptics: Add driver haptics module on Arizona CODECs + drivers/input/misc/arizona-haptics.c:164 arizona_haptics_close() warn: variable dereferenced before check 'haptics->arizona->dapm' (see line 158) git remote update asoc git checkout 9dd555e2f4de1af1bb0f75cc84ed0708fcdb5987 vim +164 drivers/input/misc/arizona-haptics.c 9dd555e2 Mark Brown 2012-11-26 152 return 0; 9dd555e2 Mark Brown 2012-11-26 153 } 9dd555e2 Mark Brown 2012-11-26 154 9dd555e2 Mark Brown 2012-11-26 155 static void arizona_haptics_close(struct input_dev *input) 9dd555e2 Mark Brown 2012-11-26 156 { 9dd555e2 Mark Brown 2012-11-26 157 struct arizona_haptics *haptics = input_get_drvdata(input); 9dd555e2 Mark Brown 2012-11-26 @158 struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex; 9dd555e2 Mark Brown 2012-11-26 159 9dd555e2 Mark Brown 2012-11-26 160 cancel_work_sync(&haptics->work); 9dd555e2 Mark Brown 2012-11-26 161 9dd555e2 Mark Brown 2012-11-26 162 mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); 9dd555e2 Mark Brown 2012-11-26 163 9dd555e2 Mark Brown 2012-11-26 @164 if (haptics->arizona->dapm) 9dd555e2 Mark Brown 2012-11-26 165 snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS"); 9dd555e2 Mark Brown 2012-11-26 166 9dd555e2 Mark Brown 2012-11-26 167 mutex_unlock(dapm_mutex); --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] aic3104 confusion with input selection
by rohith R 29 Nov '12

29 Nov '12

shouldn't there be a .get function for SOC_DAPM_SINGLE_AIC3X macro? There is a hole in the list of allowable values for this registers which the macro addresses (0-8 and 15 for bank 0 registers 17 and register 18 )

1 0

[alsa-devel] [PATCH] ALSA: snd-usb: properly initialize the sync endpoint
by Daniel Mack 28 Nov '12

28 Nov '12

Jeffrey Barish reported an obvious bug in the pcm part of the usb-audio driver which causes the code to not initialize the sync endpoint from configure_endpoint(). Reported-by: Jeffrey Barish <jeff_barish(a)earthlink.net> Signed-off-by: Daniel Mack <zonque(a)gmail.com> Cc: stable(a)kernel.org [3.5+] --- sound/usb/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index bc3c9ac..e919c2e 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -458,7 +458,7 @@ static int configure_endpoint(struct snd_usb_substream *subs) return ret; if (subs->sync_endpoint) - ret = snd_usb_endpoint_set_params(subs->data_endpoint, + ret = snd_usb_endpoint_set_params(subs->sync_endpoint, subs->pcm_format, subs->channels, subs->period_bytes, -- 1.7.11.7

3 3