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

Re: [alsa-devel] [kbuild] sound/soc/soc-fw.c:945:9-16: ERROR: se is NULL but dereferenced.
by Fengguang Wu 23 Jun '13

23 Jun '13

On Sat, Jun 22, 2013 at 12:35:44PM -0300, Raphael S Carvalho wrote: > I'm in a Linux event now, and I can't clone the tree (probably the port for > that purpose isn't allowed) > Then I sending a simplified patch that shows which lines must be changed. Patch looks good to me. Thanks! Reviewed-by: Fengguang Wu <fengguang.wu(a)intel.com> > Signed-off: Raphael S. Carvalho <raphael.scarv(a)gmail.com> > > --- soc-fw_old.c 2013-06-22 12:13:48.000000000 -0300 > +++ soc-fw_new.c 2013-06-22 12:19:41.000000000 -0300 > @@ -893,7 +893,7 @@ > if (err < 0) { > dev_err(sfw->dev, "ASoC: could not create" > " values for %s\n", ec->hdr.name); > - goto err_se; > + goto err; > } > /* fall through to create texts */ > case SOC_CONTROL_TYPE_ENUM: > @@ -905,13 +905,13 @@ > if (err < 0) { > dev_err(sfw->dev, "ASoC: could not create" > " texts for %s\n", ec->hdr.name); > - goto err_se; > + goto err; > } > break; > default: > dev_err(sfw->dev, "ASoC: invalid enum control type %d for %s\n", > ec->hdr.index, ec->hdr.name); > - goto err_se; > + goto err; > } > > /* map standard io handlers and check for external handlers */ > @@ -928,21 +928,19 @@ > SOC_CONTROL_GET_ID_GET(ec->hdr.index), > SOC_CONTROL_GET_ID_PUT(ec->hdr.index), > SOC_CONTROL_GET_ID_INFO(ec->hdr.index)); > - goto err_se; > + goto err; > } > > err = soc_fw_init_kcontrol(sfw, kc); > if (err < 0) { > dev_err(sfw->dev, "ASoC: failed to init %s\n", > ec->hdr.name); > - goto err_se; > + goto err; > } > } > return kc; > > -err_se: > - kfree(kc); > - > +err: > /* free values and texts */ > if (se->dvalues) > kfree(se->dvalues); > @@ -950,7 +948,8 @@ > kfree(se->dtexts[i]); > > kfree(se); > - > +err_se: > + kfree(kc); > return NULL; > } > > > > On Sat, Jun 22, 2013 at 11:48 AM, Fengguang Wu <fengguang.wu(a)intel.com>wrote: > > > TO: Liam Girdwood <lrg(a)ti.com> > > CC: Peter Ujfalusi <peter.ujfalusi(a)ti.com> > > > > > > Hi Liam, > > > > FYI, there are coccinelle warnings in > > > > tree: git://gitorious.org/omap-audio/linux-audiopeter/topic/ti-audio-next-bnw-wip > > head: ac1981249f0c606cede98d6dab091ecb1ae480c9 > > commit: 6d98dbbcfb5da2176b3e60faaf86d2279790fe67 ASoC: firmware: Add > > support for dynamic components > > date: 5 weeks ago > > :::::: branch date: 5 days ago > > :::::: commit date: 5 weeks ago > > > > >> sound/soc/soc-fw.c:945:9-16: ERROR: se is NULL but dereferenced. > > -- > > >> sound/soc/soc-fw.c:1523:8-9: ERROR: reference preceded by free on line > > 1523 > > >> sound/soc/soc-fw.c:1443:8-9: ERROR: reference preceded by free on line > > 1443 > > >> sound/soc/soc-fw.c:1483:8-9: ERROR: reference preceded by free on line > > 1483 > > -- > > >> sound/soc/soc-fw.c:1528:6-8: ERROR: invalid reference to the index > > variable of the iterator on line 1513 > > >> sound/soc/soc-fw.c:1448:6-8: ERROR: invalid reference to the index > > variable of the iterator on line 1433 > > >> sound/soc/soc-fw.c:1488:6-8: ERROR: invalid reference to the index > > variable of the iterator on line 1473 > > > > git remote add omap-audio git://gitorious.org/omap-audio/linux-audio > > git remote update omap-audio > > git checkout 6d98dbbcfb5da2176b3e60faaf86d2279790fe67 > > vim +945 sound/soc/soc-fw.c > > > > 6d98dbbc Liam Girdwood 2012-12-05 929 goto > > err_se; > > 6d98dbbc Liam Girdwood 2012-12-05 930 } > > 6d98dbbc Liam Girdwood 2012-12-05 931 > > 6d98dbbc Liam Girdwood 2012-12-05 932 err = > > soc_fw_init_kcontrol(sfw, kc); > > 6d98dbbc Liam Girdwood 2012-12-05 933 if (err < 0) { > > 6d98dbbc Liam Girdwood 2012-12-05 934 > > dev_err(sfw->dev, "ASoC: failed to init %s\n", > > 6d98dbbc Liam Girdwood 2012-12-05 935 > > ec->hdr.name); > > 6d98dbbc Liam Girdwood 2012-12-05 936 goto > > err_se; > > 6d98dbbc Liam Girdwood 2012-12-05 937 } > > 6d98dbbc Liam Girdwood 2012-12-05 938 } > > 6d98dbbc Liam Girdwood 2012-12-05 939 return kc; > > 6d98dbbc Liam Girdwood 2012-12-05 940 > > 6d98dbbc Liam Girdwood 2012-12-05 941 err_se: > > 6d98dbbc Liam Girdwood 2012-12-05 942 kfree(kc); > > 6d98dbbc Liam Girdwood 2012-12-05 943 > > 6d98dbbc Liam Girdwood 2012-12-05 944 /* free values and texts */ > > 6d98dbbc Liam Girdwood 2012-12-05 @945 if (se->dvalues) > > 6d98dbbc Liam Girdwood 2012-12-05 946 kfree(se->dvalues); > > 6d98dbbc Liam Girdwood 2012-12-05 947 for (i = 0; i < ec->max; > > i++) > > 6d98dbbc Liam Girdwood 2012-12-05 948 > > kfree(se->dtexts[i]); > > 6d98dbbc Liam Girdwood 2012-12-05 949 > > 6d98dbbc Liam Girdwood 2012-12-05 950 kfree(se); > > 6d98dbbc Liam Girdwood 2012-12-05 951 > > 6d98dbbc Liam Girdwood 2012-12-05 952 return NULL; > > 6d98dbbc Liam Girdwood 2012-12-05 953 } > > > > --- > > 0-DAY kernel build testing backend Open Source Technology > > Center > > http://lists.01.org/mailman/listinfo/kbuild Intel > > Corporation > > _______________________________________________ > > kbuild mailing list > > kbuild(a)lists.01.org > > https://lists.01.org/mailman/listinfo/kbuild > >

1 0

[alsa-devel] [GIT PULL] ASoC updates for v3.11
by Mark Brown 21 Jun '13

21 Jun '13

The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f: Linux 3.10-rc6 (2013-06-15 11:51:07 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.11 for you to fetch changes up to 84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207: Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (2013-06-17 17:20:33 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.11 Not a big release subsystem wise, the main changes have been some nice improvements on the driver side: - Lots of cleanups and fixes for Blackfin, SGTL5000 and UX500. - Generalisation of the Bluetooth and HDMI stub drivers. - New CODEC drivers for SSM2518 and RT5640. - New machine driver for Tegra CPUs with RT5640. ---------------------------------------------------------------- Andrew Bresticker (1): ASoC: max98090: add digital mic mux to record path Axel Lin (2): ASoC: ssm2518: Fix trivial typo in checking tx_mask and rx_mask values ASoC: adav80x: Select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI Bard Liao (1): ASoC: add RT5640 CODEC driver Barry Song (2): ASoC: dfbmcs320: make the driver common for other BT modules ASoC: omap-hdmi-codec: make the driver common for other SoCs Boris BREZILLON (1): ASoC: atmel-ssc: prepare clk before calling enable Charles Keepax (10): ASoC: wm5102: Correct OSR control name for EPOUT mfd: wm5102: Manually apply register patch mfd: arizona: Change fast_start pdata name to better reflect functionality ASoC: bells: Hookup DMICs for Bells ASoC: wm0010: Set IRQ as a wake source ASoC: wm0010: Clear IRQ as wake source and include missing header ASoC: arizona: Hookup SYSCLK to inputs and noise generators mfd: wm5102: Expose DRE control registers ASoC: wm5102: Expose controls for DRE ASoC: wm5110: Correct rate control for DSP4 Dan Carpenter (2): ASoC: wm_adsp: memory leak in wm_adsp_create_control() ASoC: wm8994: missing break in wm8994_get_fll_config() Daniel Mack (3): ASoC: adau1701: refactor firmware loading function ASoC: codecs: adau1701: add DT bindings ASoC: codecs: adau1701: factor out firmware reset Dimitris Papastamos (2): ASoC: wm_adsp: Expose coefficient blocks as ALSA binary controls ASoC: wm_adsp: Ensure set controls are synced on each boot Emil Goode (1): ASoC: Fix double assignment of .owner in struct snd_soc_card Fabio Baltieri (15): ASoC: ux500: register controls to card instead of codec ASoC: ux500: drop clock gating widgets from machine driver ASoC: ab8500-codec: Add missing ad_to_slot definitions ASoC: ab8500-codec: Set tx dai slots from tx_mask ASoC: ab8500-codec: Set rx dai slots from rx_mask ASoC: ux500: Drop pinctrl sleep support ASoC: ab8500-codec: Move codec ops on a separate structure ASoC: ux500: Drop dangling struct i2s_controller ASoC: ux500: Drop unused code from msp headers ASoC: ux500: Add missing mop500_ab8500.h include ASoC: ux500: Drop redundant msp id enumerations ASoC: ux500: Ensure consistent configuration between DAIs ASoC: ux500: Move DMA parameters into ux500_msp ASoC: ux500: Set DMA address during device init ASoC: ux500: Add DMA slave config prepare routine Fabio Estevam (15): ASoC: imx-sgtl5000: Do not enter the error path on success ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable ASoC: mxs-sgtl5000: Remove unneeded fields from snd_soc_dai_link ASoC: fsl: imx-audmux: Let device core handle pinctrl ASoC: mxs: mxs-saif: Let device core handle pinctrl ASoC: sgtl5000: Fix comment about register addresses ASoC: sgtl5000: Convert to use regmap directly ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable ASoC: mxs-sgtl5000: Remove unneeded fields from snd_soc_dai_link ASoC: sgtl5000: Read SGTL5000_CHIP_ID in i2c_probe() ASoC: sgtl5000: Fix driver probe after reset ASoC: sgtl5000: Let the codec acquire its clock ASoC: sgtl5000: Use i2c_get_clientdata() ASoC: sgtl5000: Add 'clocks' entry as a required propery ASoC: imx-sgtl5000: Use devm_clk_get() Geert Uytterhoeven (1): blackfin: bf533-stamp: Remove bogus "||" Kuninori Morimoto (1): ASoC: fsi: fixup sparse errors Lars-Peter Clausen (36): ASoC: spear: Setup dma data in DAI probe ASoC: spear: Use generic dmaengine PCM ASoC: jz4740-i2s: Use clk_prepare_enable/clk_disable_unprepare ASoC: ep93xx: Setup dma data in DAI probe ASoC: ep93xx: Use generic dmaengine PCM ASoC: core: Move snd_soc_set_runtime_hwparams() to soc-pcm.c ASoC: core: Add helper function to initialize the runtime pcm ASoC: core: Use kasprintf instead of opencoding it ASoC: ep93xx-i2s: Staticize non exported struct ASoC: kirkwood-dma: Staticize non exported struct ASoC: spear: spdif_in: Staticize non exported struct ASoC: spear: spdif_out: Staticize unexported function ASoC: mmp-pcm: Staticize non exported structs and functions ASoC: mmp-sspa: Staticize non exported struct ASoC: bf5xx-tdm-pcm: Staticize non exported struct ASoC: mop500_ab8500: Staticize non exported functions ASoC: mop500: Staticize non exported struct ASoC: sn95031: Staticize non exported struct ASoC: davinci-sffsdr: Staticize non exported struct ASoC: Fix early event callback list iteration ASoC: Add ssm2518 support ASoC: blackfin: Remove unused bf5xx-{i2s, tdm, ac97}-pcm.h ASoC: blackfin: bf5xx-i2s: Use dev_{err, dbg} instead of pr_{error, debug} ASoC: blackfin: bf5xx-sport: Allow setting rx and tx mask independently ASoC: blackfin: bf5xx-i2s: Allocate buffer only as large as requested ASoC: blackfin: bf5xx-i2s-pcm: Use snd_pcm_lib_preallocate_pages_for_all() ASoC: blackfin: bf5xx-i2s: Add support for TDM mode ASoC: blackfin: Switch bf5xx-ad193x from bf5xx-tdm to bf5xx-i2s ASoC: blackfin: Switch bf5xx-ad1836 from bf5xx-tdm to bf5xx-i2s ASoC: blackfin: Remove bf5xx-tdm driver blackfin: Remove references to the bf5x_tdm driver ASoC: dapm: Setup private_free callback for dapm kcontrols ASoC: dapm: Remove unnecessary loop ASoC: dapm: Add a helper function to free a DAPM path ASoC: dapm: Remove unused long_name field from snd_soc_dapm_path struct ASoC: dapm: Add snd_soc_dapm_switch to the power up/down sequence table Marek Belisko (3): ASoC: spdif_transceiver: Change driver filename to spdif_transmitter.c. ASoC: spdif_transmitter: Add DT support. ASoC: spdif_receiver: Add DT support. Marek Vasut (1): ASoC: sgtl5000: Fix VAG_POWER enabling/disabling order Mark Brown (68): ASoC: sam9g20ek: Let device core handle pinctrl ASoC: dapm: Provide early event callbacks for power up and down ASoC: wm8994: Support EFS mode for FLL mfd: arizona: Read the device identification information after boot mfd: arizona: Add missing cleanup on remove mfd: arizona: Disable interrupts during suspend mfd: Add device tree bindings for Arizona class devices mfd: arizona: Support use of external DCVDD ASoC: wm8994: Handle LRCLK inversion for WM8958 and WM1811A ASoC: arizona: Provide simple DAI ops for autoconfiguring interfaces ASoC: wm5102: Stub hookup for Slimbus interface ASoC: wm5110: Stub hookup for Slimbus interface Merge tag 'v3.10-rc2' into asoc-ux500 mfd: wm5110: Make DSPn_STATUS_3 readable Merge tag 'mfd-arizona-v3.10-rc2' of git://git.kernel.org/.../broonie/misc into asoc-arizona ASoC: wm8994: Remove restore of DAC enable state ASoC: wm8994: Ensure lambda is zeroed for WM8994 ASoC: wm8994: Defer declaration of open circuit microphones ASoC: wm8994: Add digital loopback paths ASoC: wm8994: Remove unused variable ASoC: wm8994: Allow debounce before MICDET identification ASoC: sgtl5000: Make device cache only when powered off ASoC: max98090: Guard runtime PM callbacks Merge branch 'topic/fsl' of git://git.kernel.org/.../broonie/sound into asoc-sgtl5000 ASoC: wm8962: Restore device state after reset in runtime resume Merge branch 'fix/wm8962' of git://git.kernel.org/.../broonie/sound into asoc-wm8962 ASoC: SPEAr: Add dependency on dmaengine helpers ASoC: SPEAr: Hide component drivers in Kconfig ASoC: spear: Remove nonexistant EVM options ASoC: spear: Normalise module names Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linus Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next Merge remote-tracking branch 'asoc/topic/dfmbcs320' into asoc-next Merge remote-tracking branch 'asoc/topic/dwc' into asoc-next Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next Merge remote-tracking branch 'asoc/topic/omap' into asoc-next Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next Merge remote-tracking branch 'asoc/topic/spear' into asoc-next Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next Merge remote-tracking branch 'asoc/topic/x86' into asoc-next Michał Mirosław (1): ASoC: fix kernel message grepability Nicolin Chen (5): ASoC: WM8962: Create default platform data structure ASoC: wm8962: Add device tree binding ASoC: fsl: add imx-wm8962 machine driver ASoC: wm8962: Remove remaining direct register cache accesses ASoC: wm8962: Enable start-up and normal bias after reset in runtime resume Paul Bolle (2): ASoC: remove saarb and tavorevb3 machine drivers ASoC: OMAP: Remove obsolete Makefile line Rajeev Kumar (3): ASoC: dwc: debug message correction. ASoC: dwc: Folder path correction in file header. ASoC: Add Kconfig and Makefile to support SPEAr audio driver Sachin Kamat (7): ASoC: 88pm860x: Remove redundant platform_set_drvdata() ASoC: ep93xx: Remove redundant platform_set_drvdata() ASoC: jz4740: Remove redundant platform_set_drvdata() ASoC: omap-mcbsp: Remove redundant platform_set_drvdata() ASoC: Samsung: Remove redundant platform_set_drvdata() ASoC: mid-x86: Remove redundant platform_set_drvdata() ASoC: davinci: Remove redundant use of of_match_ptr macro Sekhar Nori (1): ASoC: davinci: remove sffsdr machine support Shawn Guo (6): ASoC: mxs: move to use generic DMA helper ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi ASoC: fsl: remove use of imx-pcm-audio from imx-ssi ASoC: fsl: create function imx_pcm_fiq_exit() ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi ASoC: fsl: remove imx-pcm driver Stephen Warren (7): ASoC: tegra: always use clk_get() in utility code ASoC: tegra: implement suspend/resume for Tegra30 AHUB ASoC: tegra: implement suspend/resume for Tegra30 I2S ASoC: tegra: add runtime PM to resume functions ASoC: rt5640: add device tree support ASoC: tegra: add tegra+RT5640 machine driver ASoC: rt5640: fix sparse warnings Tushar Behera (1): ASoC: spear: Convert to use devm_ioremap_resource Uwe Kleine-König (3): ASoC: SPEAr spdif_{in,out}: use devm for clk and a few more cleanups ASoC: simplify registration of snd-soc-dummy device ASoC: SPEAr spdif_{in,out}: fix fallout of previous cleanup Documentation/devicetree/bindings/mfd/arizona.txt | 62 + .../devicetree/bindings/sound/adi,adau1701.txt | 23 + .../devicetree/bindings/sound/imx-audio-wm8962.txt | 46 + .../devicetree/bindings/sound/mxs-saif.txt | 17 +- .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 71 + Documentation/devicetree/bindings/sound/rt5640.txt | 30 + .../devicetree/bindings/sound/sgtl5000.txt | 3 + .../devicetree/bindings/sound/spdif-receiver.txt | 10 + .../bindings/sound/spdif-transmitter.txt | 10 + .../devicetree/bindings/sound/ssm2518.txt | 20 + Documentation/devicetree/bindings/sound/wm8962.txt | 23 + arch/blackfin/mach-bf527/boards/ad7160eval.c | 12 - arch/blackfin/mach-bf527/boards/ezkit.c | 32 +- arch/blackfin/mach-bf533/boards/ezkit.c | 12 - arch/blackfin/mach-bf533/boards/stamp.c | 35 +- arch/blackfin/mach-bf537/boards/stamp.c | 30 +- arch/blackfin/mach-bf548/boards/ezkit.c | 28 +- arch/blackfin/mach-bf561/boards/ezkit.c | 14 +- arch/blackfin/mach-bf609/boards/ezkit.c | 2 +- drivers/mfd/arizona-core.c | 234 ++- drivers/mfd/arizona-i2c.c | 10 +- drivers/mfd/arizona-spi.c | 10 +- drivers/mfd/arizona.h | 12 + drivers/mfd/wm5102-tables.c | 9 +- drivers/mfd/wm5110-tables.c | 8 + drivers/misc/atmel-ssc.c | 8 +- include/linux/mfd/arizona/core.h | 2 + include/linux/mfd/arizona/pdata.h | 2 +- include/linux/mfd/arizona/registers.h | 47 + include/linux/mfd/wm8994/pdata.h | 5 + include/linux/mfd/wm8994/registers.h | 8 + include/linux/platform_data/ssm2518.h | 22 + include/sound/rt5640.h | 22 + include/sound/soc-dapm.h | 3 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/sam9g20_wm8731.c | 9 - sound/soc/blackfin/Kconfig | 47 +- sound/soc/blackfin/Makefile | 4 - sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 - sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 - sound/soc/blackfin/bf5xx-ac97.c | 8 +- sound/soc/blackfin/bf5xx-ad1836.c | 19 +- sound/soc/blackfin/bf5xx-ad193x.c | 40 +- sound/soc/blackfin/bf5xx-ad1980.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-i2s-pcm.c | 183 +- sound/soc/blackfin/bf5xx-i2s-pcm.h | 21 +- sound/soc/blackfin/bf5xx-i2s.c | 129 +- sound/soc/blackfin/bf5xx-sport.c | 10 +- sound/soc/blackfin/bf5xx-sport.h | 2 +- sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/blackfin/bf5xx-tdm-pcm.c | 345 ---- sound/soc/blackfin/bf5xx-tdm-pcm.h | 18 - sound/soc/blackfin/bf5xx-tdm.c | 328 --- sound/soc/blackfin/bf5xx-tdm.h | 23 - sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 16 +- sound/soc/cirrus/ep93xx-i2s.c | 16 +- sound/soc/cirrus/ep93xx-pcm.c | 138 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 18 +- sound/soc/codecs/Makefile | 14 +- sound/soc/codecs/ab8500-codec.c | 85 +- sound/soc/codecs/ab8500-codec.h | 42 +- sound/soc/codecs/adau1701.c | 69 +- sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 3 +- sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +- sound/soc/codecs/{omap-hdmi.c => hdmi.c} | 26 +- sound/soc/codecs/jz4740.c | 2 - sound/soc/codecs/max98090.c | 24 +- sound/soc/codecs/rt5640.c | 2128 ++++++++++++++++++++ sound/soc/codecs/rt5640.h | 2092 +++++++++++++++++++ sound/soc/codecs/sgtl5000.c | 267 ++- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/spdif_receiver.c | 10 + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + sound/soc/codecs/ssm2518.c | 856 ++++++++ sound/soc/codecs/ssm2518.h | 20 + sound/soc/codecs/wm0010.c | 10 + sound/soc/codecs/wm5102.c | 205 +- sound/soc/codecs/wm5110.c | 192 ++ sound/soc/codecs/wm8962.c | 143 +- sound/soc/codecs/wm8994.c | 188 +- sound/soc/codecs/wm8994.h | 3 + sound/soc/codecs/wm_adsp.c | 461 ++++- sound/soc/codecs/wm_adsp.h | 3 + sound/soc/davinci/Kconfig | 10 - sound/soc/davinci/Makefile | 2 - sound/soc/davinci/davinci-mcasp.c | 4 +- sound/soc/davinci/davinci-sffsdr.c | 181 -- sound/soc/dwc/designware_i2s.c | 6 +- sound/soc/fsl/Kconfig | 17 +- sound/soc/fsl/Makefile | 13 +- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl_ssi.c | 13 +- sound/soc/fsl/imx-audmux.c | 8 - sound/soc/fsl/imx-mc13783.c | 2 +- sound/soc/fsl/imx-pcm-dma.c | 2 + sound/soc/fsl/imx-pcm-fiq.c | 92 + sound/soc/fsl/imx-pcm.c | 145 -- sound/soc/fsl/imx-pcm.h | 10 +- sound/soc/fsl/imx-sgtl5000.c | 39 +- sound/soc/fsl/imx-ssi.c | 44 +- sound/soc/fsl/imx-ssi.h | 3 - sound/soc/fsl/imx-wm8962.c | 323 +++ sound/soc/fsl/mx27vis-aic32x4.c | 2 +- sound/soc/fsl/phycore-ac97.c | 2 +- sound/soc/fsl/wm1133-ev1.c | 2 +- sound/soc/jz4740/jz4740-i2s.c | 17 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/mid-x86/mfld_machine.c | 1 - sound/soc/mxs/mxs-pcm.c | 18 - sound/soc/mxs/mxs-pcm.h | 7 - sound/soc/mxs/mxs-saif.c | 37 +- sound/soc/mxs/mxs-saif.h | 1 - sound/soc/mxs/mxs-sgtl5000.c | 10 +- sound/soc/omap/Makefile | 1 - sound/soc/omap/omap-hdmi-card.c | 2 +- sound/soc/omap/omap-mcbsp.c | 2 - sound/soc/pxa/Kconfig | 20 - sound/soc/pxa/Makefile | 4 - sound/soc/pxa/mmp-pcm.c | 6 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/saarb.c | 190 -- sound/soc/pxa/tavorevb3.c | 189 -- sound/soc/pxa/zylonite.c | 1 - sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/bells.c | 14 + sound/soc/samsung/neo1973_wm8753.c | 2 +- sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - sound/soc/sh/fsi.c | 10 +- sound/soc/soc-core.c | 106 +- sound/soc/soc-dapm.c | 110 +- sound/soc/soc-pcm.c | 91 +- sound/soc/soc-utils.c | 13 +- sound/soc/spear/Kconfig | 9 + sound/soc/spear/Makefile | 8 + sound/soc/spear/spdif_in.c | 31 +- sound/soc/spear/spdif_out.c | 43 +- sound/soc/spear/spear_pcm.c | 152 +- sound/soc/tegra/Kconfig | 10 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra30_ahub.c | 25 + sound/soc/tegra/tegra30_i2s.c | 26 + sound/soc/tegra/tegra_asoc_utils.c | 23 +- sound/soc/tegra/tegra_rt5640.c | 257 +++ sound/soc/ux500/mop500.c | 2 +- sound/soc/ux500/mop500_ab8500.c | 62 +- sound/soc/ux500/ux500_msp_dai.c | 11 +- sound/soc/ux500/ux500_msp_dai.h | 4 - sound/soc/ux500/ux500_msp_i2s.c | 88 +- sound/soc/ux500/ux500_msp_i2s.h | 74 +- sound/soc/ux500/ux500_pcm.c | 30 + 157 files changed, 8786 insertions(+), 3053 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5640.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt create mode 100644 include/linux/platform_data/ssm2518.h create mode 100644 include/sound/rt5640.h delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-tdm.c delete mode 100644 sound/soc/blackfin/bf5xx-tdm.h rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) rename sound/soc/codecs/{omap-hdmi.c => hdmi.c} (69%) create mode 100644 sound/soc/codecs/rt5640.c create mode 100644 sound/soc/codecs/rt5640.h rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) create mode 100644 sound/soc/codecs/ssm2518.c create mode 100644 sound/soc/codecs/ssm2518.h delete mode 100644 sound/soc/davinci/davinci-sffsdr.c delete mode 100644 sound/soc/fsl/imx-pcm.c create mode 100644 sound/soc/fsl/imx-wm8962.c delete mode 100644 sound/soc/pxa/saarb.c delete mode 100644 sound/soc/pxa/tavorevb3.c create mode 100644 sound/soc/spear/Kconfig create mode 100644 sound/soc/spear/Makefile create mode 100644 sound/soc/tegra/tegra_rt5640.c

2 1

[alsa-devel] [PATCH 0/6] Convert JZ4740 to dmaengine
by Lars-Peter Clausen 21 Jun '13

21 Jun '13

Hi, This series replaces the custom JZ4740 DMA API with a dmaengine driver. This is done in 3 steps: 1) Add a dmaengine driver which wraps the custom JZ4740 DMA API 2) Update all users of the JZ4740 DMA API to use dmaengine instead 3) Remove the custom API and move all direct hardware access to the dmaengine driver. The first two patches in the series also make sure that the clock of the DMA core is enabled. Since the patches in this series depend on each other I'd prefer if they could all go through the DMA tree. There are a few minor changes to the patch 3 in v2 of this series, all other patches are identical to v1. - Lars Lars-Peter Clausen (4): dma: Add a jz4740 dmaengine driver MIPS: jz4740: Register jz4740 DMA device ASoC: jz4740: Use the generic dmaengine PCM driver MIPS: jz4740: Remove custom DMA API Maarten ter Huurne (2): MIPS: jz4740: Correct clock gate bit for DMA controller MIPS: jz4740: Acquire and enable DMA controller clock arch/mips/include/asm/mach-jz4740/dma.h | 56 --- arch/mips/include/asm/mach-jz4740/platform.h | 1 + arch/mips/jz4740/Makefile | 2 +- arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/clock.c | 2 +- arch/mips/jz4740/dma.c | 287 ------------- arch/mips/jz4740/platform.c | 21 + drivers/dma/Kconfig | 6 + drivers/dma/Makefile | 1 + drivers/dma/dma-jz4740.c | 617 +++++++++++++++++++++++++++ sound/soc/jz4740/Kconfig | 1 + sound/soc/jz4740/jz4740-i2s.c | 48 +-- sound/soc/jz4740/jz4740-pcm.c | 310 +------------- sound/soc/jz4740/jz4740-pcm.h | 20 - 14 files changed, 676 insertions(+), 697 deletions(-) delete mode 100644 arch/mips/jz4740/dma.c create mode 100644 drivers/dma/dma-jz4740.c delete mode 100644 sound/soc/jz4740/jz4740-pcm.h -- 1.8.2.1

3 17

[alsa-devel] [PATCH 0/4] ALSA: usb: misc consistency fixes
by Antonio Ospite 21 Jun '13

21 Jun '13

Hi, when working on the hiFace driver (which I plan on re-sending later today BTW) I've been reading the code of other drivers and I've stumbled on a couple of minor inconsistencies which were also spotted during the review rounds for the hiFace driver. I am sending some patches to address these issues, so that new drivers authors won't do the same mistakes I did when copying code over. Please take a closer look at the ones about vmalloc buffers, do we need an actual Tested-by for these? Patches are against 3.10-rc6. Thanks, Antonio Antonio Ospite (4): ALSA: snd-usb-caiaq: remove the unused snd_card_used variable ALSA: snd-usb-caiaq: use vmalloc buffers ALSA: snd-usb-6fire: use vmalloc buffers ALSA: usb: uniform style used in MODULE_SUPPORTED_DEVICE() sound/usb/6fire/chip.c | 2 +- sound/usb/6fire/pcm.c | 12 +++++------- sound/usb/caiaq/audio.c | 12 +++++------- sound/usb/caiaq/device.c | 31 +++++++++++++++---------------- sound/usb/usx2y/usbusx2y.c | 2 +- 5 files changed, 27 insertions(+), 32 deletions(-) -- Antonio Ospite http://ao2.it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing?

2 5

[alsa-devel] [patch] ALSA: vx_core: off by one in vx_read_status()
by Dan Carpenter 21 Jun '13

21 Jun '13

This code is older than git, and I haven't tested it, but if size == SIZE_MAX_STATUS then we would write one space past the end of the rmh->Stat[] array. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index c39961c..8359689 100644 --- a/sound/drivers/vx/vx_core.c +++ b/sound/drivers/vx/vx_core.c @@ -205,7 +205,7 @@ static int vx_read_status(struct vx_core *chip, struct vx_rmh *rmh) if (size < 1) return 0; - if (snd_BUG_ON(size > SIZE_MAX_STATUS)) + if (snd_BUG_ON(size >= SIZE_MAX_STATUS)) return -EINVAL; for (i = 1; i <= size; i++) {

2 1

[alsa-devel] WM8741 DAC with AT91SAM9G20
by Michael Lathion 21 Jun '13

21 Jun '13

Hi all, I'm trying to use a WM8742 dac instead of WM8731 on a custom board based on AT91SAM9G20EK (developpment board from Atmel for AT91SAM9G20 soc) with Linux Kernel 2.6.38. I have the driver working in alsa (driver compiled, mixer up in alsa, ...) but I can't have the ssc interface working. When trying to play sound with aplay I get only the masterclock and bitclock but no frame clock (LRCLK), see output below. What I've done is modifying the /sound/soc/atmel/sam9g20_wm8731.c file but it seems something is not configured as it should (probably related to WM8742 being slave and the WM8731 used on original dev board was master for clock distribution). My modified sam9g20_wm8741.c is enclosed to this mail, i suspect something is wrongly setup in CPU DAI configuration but can't find what. I'm trying to set this up from some weeks now but can't find the right config so if someone have any idea on what can has to be done it could be great! Thanks for help Regards Michael Linux kernel 2.6.38 AT91SAM9G20 processor WM8741 DAC Kernel boot output : ASoC: Mclk set to 22579200 wm8741-codec 0-001b: Successful registration FOX_Board_wm8741 : PB1003A: wm8741__init() called wm8741-codec 0-001b: wm8741_set_dai_sysclk info: freq=22579200 asoc: wm8741 <-> atmel-ssc-dai.0 mapping ok ALSA device list: #0: DAISY16 When trying play sound kernel driver print: wm8741-codec 0-001b: wm8741_set_dai_fmt: Format=0, Clock Inv=0 wm8741-codec 0-001b: wm8741_hw_params: bit size param = 2

2 2

[alsa-devel] [PATCH 1/2] ALSA: hda - Remove unused variable
by Wang Xingchao 21 Jun '13

21 Jun '13

Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7803ddd..0f7a380 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1891,7 +1891,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, /* override pins connection list */ snd_printdd("hdmi: haswell: override pin connection 0x%x\n", nid); - nconns = max(spec->num_cvts, 4); snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); } -- 1.8.1.2

1 1

Re: [alsa-devel] [RFC PATCH 00/11] ARM: s3c64xx: Let amba-pl08x driver handle DMA
by Mark Brown 21 Jun '13

21 Jun '13

On Wed, Jun 19, 2013 at 08:26:12PM +0200, Tomasz Figa wrote: > On Wednesday 19 of June 2013 18:40:47 Mark Brown wrote: > > - ret = pd->get_signal(plchan->cd); > > + ret = (pd->get_signal)(plchan->cd); > Hmm, that's strange. The former is a completely valid piece of code... I know, hence... > > to get it to build which makes me suspect the compiler a bit as well... ...my comment about suspecting the compiler. > > I was applying this to -next, are there any other dependencies I need or > > anything? > Hmm, I've been testing this on top of my common clock framework and device > tree patches, but I don't think this had any effect. Did you add necessary > clkdev lookups to the clock driver? No, I didn't - that's most likely it, I didn't really investigate. I didn't test the watchdog stuff as the clocks didn't get sent to me. > In Samsung CCF alias notation it looks like this: > + ALIAS(HCLK_DMA1, "dma-pl080s.1", "apb_pclk"), > + ALIAS(HCLK_DMA0, "dma-pl080s.0", "apb_pclk"), > Not sure how hard it will be to add such lookups to the old clock driver, > though. It's pretty much the same providing you know which clock needs to be used. > I will test this applied directly on top of current linux-next when I find > some time, but for now you might check out my v3.11-devel branch on my > github: > https://github.com/tom3q/linux.git Will try to get round to it.

2 4

[alsa-devel] [PATCH v2 0/3] ASoC: codecs: some more improvements for adau1701
by Daniel Mack 21 Jun '13

21 Jun '13

Sorry Lars, it's been a while since the last round. I hope I addressed all the details you mentioned. Thanks for having another look, Daniel Daniel Mack (3): ASoC: codecs: adau1701: allow configuration of PLL mode pins ASoC: codecs: adau1701: switch to direct regmap API usage ASoC: codecs: adau1701: add support for pin muxing .../devicetree/bindings/sound/adi,adau1701.txt | 18 ++ sound/soc/codecs/adau1701.c | 250 ++++++++++++++++----- sound/soc/codecs/adau1701.h | 4 + 3 files changed, 216 insertions(+), 56 deletions(-) -- 1.8.1.4

3 17

Re: [alsa-devel] [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
by Padma Venkat 21 Jun '13

21 Jun '13

Hi Mike, On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <mturquette(a)linaro.org> wrote: > Quoting Padmavathi Venna (2013-06-12 01:07:43) >> This patch adds enum entries for div_i2s1 and div_i2s2 which are >> required for i2s1 and i2s2 controllers. >> >> Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > > Looks good. Did you want me to take the clk patches or just gathering > Acks? Please take the patches :). Thanks Padma > > Regards, > Mike > >> --- >> drivers/clk/samsung/clk-exynos5250.c | 5 +++-- >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c >> index 5c97e75..7c68850 100644 >> --- a/drivers/clk/samsung/clk-exynos5250.c >> +++ b/drivers/clk/samsung/clk-exynos5250.c >> @@ -87,6 +87,7 @@ enum exynos5250_clks { >> sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, >> sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, >> sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, >> + div_i2s1, div_i2s2, >> >> /* gate clocks */ >> gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0, >> @@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = { >> DIV(none, "div_pcm1", "sclk_audio1", DIV_PERIC4, 4, 8), >> DIV(none, "div_audio2", "mout_audio2", DIV_PERIC4, 16, 4), >> DIV(none, "div_pcm2", "sclk_audio2", DIV_PERIC4, 20, 8), >> - DIV(none, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >> - DIV(none, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >> + DIV(div_i2s1, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >> + DIV(div_i2s2, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >> DIV(sclk_pixel, "div_hdmi_pixel", "sclk_vpll", DIV_DISP1_0, 28, 4), >> DIV_A(none, "armclk", "div_arm", DIV_CPU0, 28, 3, "armclk"), >> DIV_F(none, "div_mipi1_pre", "div_mipi1", >> -- >> 1.7.4.4

3 3