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

[alsa-devel] [PATCH] ASoC: fsl: imx-wm8962: Fix missing audmux external port setup check
by Andreas Pretzsch 23 Aug '13

23 Aug '13

Return value of imx_audmux_v2_configure_port(ext_port, ...) was not assigned. Following check tested the preceding call (int_port). Signed-off-by: Andreas Pretzsch <apr(a)cn-eng.de> --- Fix not tested (no matching hardware), only noticed during code reading. Patch against git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/wm8962 sound/soc/fsl/imx-wm8962.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 52a36a9..e018632 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -192,7 +192,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) dev_err(&pdev->dev, "audmux internal port setup failed\n"); return ret; } - imx_audmux_v2_configure_port(ext_port, + ret = imx_audmux_v2_configure_port(ext_port, IMX_AUDMUX_V2_PTCR_SYN, IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); if (ret) { -- 1.7.10.4

1 0

[alsa-devel] [GIT PULL] ASoC updates for v3.12
by Mark Brown 23 Aug '13

23 Aug '13

The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb: Linux 3.11-rc6 (2013-08-18 14:36:53 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.12 for you to fetch changes up to 43bcb402f84fe459102120b4e2d28d7117f16cd0: Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next (2013-08-22 14:29:02 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.12 - DAPM is now mandatory for CODEC drivers in order to avoid the repeated regressions in the special cases for non-DAPM CODECs and make it easier to integrate with other components on boards. All existing drivers have had some level of DAPM support added. - A lot of cleanups in DAPM plus support for maintaining controls in a specific state while a DAPM widget all contributed by Lars-Peter Clausen. - Core helpers for bitbanged AC'97 reset from Markus Pargmann. - New drivers and support for Analog Devices ADAU1702 and ADAU1401(a), Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and WM8904 based machines, Freescale S/PDIF and SSI AC'97, Renesas R-Car SoCs, Samsung Exynos5420 SoCs, Texas Instruments PCM1681 and PCM1792A and Wolfson Microelectronics WM8997. - Support for building drivers that can support it cross-platform for compile test. ---------------------------------------------------------------- Axel Lin (1): ASoC: adav80x: Add module device table for adav801 Bard Liao (1): ASoC: rt5640: remove unused mux Bo Shen (7): ASoC: atmel_ssc_dai: move set dma data to startup callback ASoC: atmel_ssc_dai: add error mask define ASoC: atmel-pcm-dma: move prepare for dma to dai prepare ARM: atmel-ssc: change phybase type to dma_addr_t ASoC: atmel-pcm: use generic dmaengine framework ASoC: wm8904: fix the typo error for LINER Mux ASoC: atmel: add wm8904 based audio machine driver Charles Keepax (6): mfd: arizona: Add GPIO control register bit definitions ASoC: arizona: Add signal activity output for DRC ASoC: arizona: Add default case to silence build warning ASoC: wm5110: Correct input OSR bits for wm5110 ASoC: arizona: Add widget<->mux route into mux route macro ASoC: wm8997: Initial CODEC driver Dan Carpenter (2): ASoC: adau1701: type bug with ADAU1707_CLKDIV_UNSET ASoC: dapm: using freed pointer in dapm_kcontrol_add_widget() Daniel Mack (11): ARM: pxa: ssp: remove unnecessary warning on kzalloc() failure ARM: pxa: ssp: add shortcut for &pdev->dev ARM: pxa: ssp: add DT bindings ARM: pxa: ssp: use devm_ functions ARM: pxa: ssp: add pxa_ssp_request_of() ALSA: move dmaengine implementation from ASoC to ALSA core ASoC: pxa: pxa-ssp: add DT bindings ASoC: pxa: use snd_dmaengine_dai_dma_data ASoC: pxa: pxa-ssp: set dma filter data from startup hook ASoC: pxa: add DT bindings for pxa2xx-pcm ALSA: core: allow SND_DMAENGINE_PCM use from modules Dimitris Papastamos (4): ASoC: core: Add snd_soc_card_get_kcontrol() ASoC: wm_adsp: Simplify kcontrol handling ASoC: wm0010: Use DMA-safe memory for SPI transfers ASoC: wm_adsp: Sanitize parameter passing Fabio Estevam (11): ASoC: sglt5000: Provide the reg_stride field ASoC: fsl: fsl_ssi: Use devm_ functions ASoC: fsl: fsl_ssi: Check the return value from clk_prepare_enable() ASoC: fsl: imx-wm8962: Fix error path ASoC: wm8962: Do not call configure_bclk() inside wm8962_set_dai_sysclk() ASoC: fsl: fsl_ssi: Add MODULE_ALIAS ASoC: fsl: imx-audmux: Check the return value from clk_prepare_enable() ASoC: fsl: Fix module build ASoC: imx-mc13783: Make SND_SOC_IMX_MC13783 visible again ASoC: fsl: Drop SND_SOC_FSL_UTILS from i.mx machine code ASoC: fsl: fsl_ssi: Fix the order of resources removal Jean-Francois Moine (1): ASoC: kirkwood-i2s: fix a compilation warning Julia Lawall (5): sound/soc/pxa/mioa701_wm9713.c: Avoid using ARRAY_AND_SIZE(e) as a function argument ASoC: samsung-ac97: simplify use of devm_ioremap_resource ASoC: mioa701_wm9713: Remove definition of ARRAY_AND_SIZE() ASoC: tegra20-ac97: simplify use of devm_ioremap_resource ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resource Kuninori Morimoto (13): ASoC: add ak4554 driver ASoC: ak4554: add DT support ASoC: add Renesas R-Car core feature ASoC: add Renesas R-Car module feature ASoC: add Renesas R-Car Generation feature ASoC: add Renesas R-Car SCU feature ASoC: add Renesas R-Car ADG feature ASoC: add Renesas R-Car SSI feature ASoC: rsnd: remove platform dai and add dai_id on platform setting ASoC: rsnd: add common DMAEngine method ASoC: rsnd: SSI supports DMA transfer ASoC: rsnd: SSI supports DMA transfer via BUSIF ASoC: rsnd: scu: cleanup empty functions Lars-Peter Clausen (28): ASoC: Remove unused dapm_get_snd_card() and dapm_get_soc_card() ASoC: Build adau1701 when SND_SOC_ALL_CODECS is selected ASoC: adau1701: Add adau1702 and adau1401(a) device ids ASoC: dapm: Pass snd_soc_card directly to soc_dpcm_runtime_update() ASoC: dapm: Run widget updates for shared controls at the same time ASoC: dapm: Add a update parameter to snd_soc_dapm_{mux,mixer}_update_power ASoC: tlv320aic3x: Use snd_soc_dapm_mixer_update_power ASoC: lm4857: Use table based setup for DAPM and controls ASoC: lm4857: Convert to regmap ASoC: dapm: Move snd_soc_dapm_update from dapm context to card ASoC: dapm: Pass card instead of dapm context to dapm_power_widgets() ASoC: dapm: Add a helper to get the CODEC for DAPM kcontrol ASoC: dapm: Wrap kcontrol widget list access ASoC: dapm: Move 'value' field from widget to control ASoC: dapm: Keep a list of paths per kcontrol ASoC: dapm: Make widget power register settings more flexible ASoC: dapm: Add snd_soc_dapm_add_path() helper function ASoC: dapm: Delay w->power update until the changes are written ASoC: bf5xx-ac97: Remove unused extern declaration ASoC: dapm: Check return value of snd_soc_cnew() ASoC: dapm: Fix kcontrol path list corruption ASoC: dapm: Implement mixer input auto-disable ASoC: tlv320aic26: Fix keyclick feature ASoC: mc13783: Remove embedded snd_soc_codec structs from private data structs ASoC: twl4030: Remove embedded snd_soc_codec structs from private data structs ASoC: Remove unused soc_pm_waitq ASoC: Remove unused snd_soc_info_volsw_ext() ASoC: Use snd_soc_info_enum_double() for SOC_ENUM_EXT controls Lothar Waßmann (1): ASoC: mxs: add some error messages to help identifying problems Ma Haijun (1): ASoC: wm8960: Fix ADC volume bits Marek Belisko (1): ASoC: Add PCM1681 codec driver. Mark Brown (169): ASoC: codecs: Make ALL_CODECS depend on COMPILE_TEST ASoC: pcm3008: Remove noisy version print ASoC: pcm3008: Move gpio allocation to probe ASoC: pcm3008: Check for platform data ASoC: pcm3008: Convert to devm_gpio_request_one() ASoC: wm8994: Move runtime PM init to platform device init ASoC: kirkwood: Remove unused headers ASoC: kirkwood: Enable build on non-Kirkwood platforms ASoC: kirkwood-i2s: Use devm_clk_get() for extclk ASoC: kirkwood-i2s: Remove empty remove() ASoC: kirkwood-i2s: Inline KIRKWOOD_I2S_RATES ASoC: tlv320aic3x: Add compatible strings for specific devices ASoC: tlv320aic3x: List tlv320aic3106 as a supported device ASoC: imx: Enable COMPILE_TEST builds ASoC: samsung-spdif: Convert to devm_clk_get() ASoC: omap: Enable COMPILE_TEST build for DT platforms ASoC: tegra: Remove unneeded mach-type.h incldues ASoC: tegra: Add GPIOLIB dependencies ASoC: tegra: Always use the generic dmaengine helper library ASoC: tegra: Enable COMPILE_TEST builds ASoC: imx-mc13783: Depend on ARCH_ARM ASoC: pcm: Use the power efficient workqueue for delayed powerdown ASoC: jack: Use power efficient workqueue ASoC: mxs: Enable COMPILE_TEST builds ASoC: max98090: Use power efficient workqueue ASoC: sta32x: Use power efficient workqueue ASoC: twl6040: Use power efficient workqueue ASoC: wm8350: Use power efficient workqueue ASoC: wm8753: Use power efficient workqueue ASoC: wm8994: Use power efficient workqueue ASoC: fsl_ssi: Provide register I/O functions by default ASoC: twl6040: Use power efficient workqueue ASoC: mxs: Remove unneeded mach-types.h inclusions ASoC: wm8962: Use power efficient workqueue ASoC: mxs: Depends on COMMON_CLK ASoC: dapm: Use generic power check for everything except DAIs ASoC: wm8994: Add clock bindings to the device tree ASoC: smdk_wm8994: Make driver name more unique ASoC: smdk_wm8994: Configure DAI format at init time ASoC: smdk_wm8994: Configure the MCLK1 rate based on the board Merge branch 'topic/core' of git://git.kernel.org/.../broonie/sound into asoc-dapm ASoC: samsung: Make secondary I2S DAI device a child of primary Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm ASoC: pcm1792a: Fix build with !OF ASoC: wm8994: Fix class W controls ASoC: ad1980: Provide stub DAPM support ASoC: ads711x: Add DAPM support ASoC: dt: Move WM8903 pin list from Tegra board binding to CODEC binding ASoC: pcm1681: Staticise DAI driver ASoC: ad73311: Add DAPM support ASoC: ad73311: Add to list of of Analog Devices supported CODECs ASoC: max9768: Add DAPM support ASoC: cs4271: Convert to table based control init ASoC: cs4271: Add DAPM support ASoC: doc: Add documentation to MAINTAINERS patterns ASoC: compress: Use power efficient workqueue ASoC: adau1701: Use gpio_set_value_cansleep() ASoC: ak4104: Add stub DAPM support ASoC: ak4104: Manage TXE using DAPM ASoC: ak5386: Add DAPM support Merge tag 'v3.11-rc5' into asoc-dapm Merge remote-tracking branch 'asoc/fix/dapm' into asoc-dapm ASoC: dapm: Don't create routes when creating kcontrols ASoC: dapm: Ensure kcontrol list is initialised ASoC: dt: Move WM8753 pin list from Tegra board binding to CODEC binding ASoC: dt: Move RT5640 pin list from Tegra board binding to CODEC binding ASoC: dt: Move ALC5632 pin list from Tegra board binding to CODEC binding ASoC: wm8753: Fix typo in DT binding example ASoC: ak4554: Add DAPM support ASoC: max9877: Convert to use regmap API ASoC: max9877: Convert to standard CODEC driver ASoC: max9877: Add basic DAPM support Merge branch 'topic/dma' of git://git.kernel.org/.../broonie/sound into asoc-pxa ASoC: pcm1792a: Remove empty capture DAI stub ASoC: pcm1792a: Add DAPM support ASoC: pcm1681: Add DAPM support Merge branch 'topic/dma' of git://git.kernel.org/.../broonie/sound into asoc-omap Merge branch 'topic/dma' of git://git.kernel.org/.../broonie/sound into asoc-omap ASoC: samsung: Fix DTS breakage from missing dependencies ASoC: tlv320aic26: Remove direct use of internal I/O functions ASoC: tlv320aic26: Remove noisy print ASoC: tlv320aic26: Add basic DAPM support ASoC: si476x: Add DAPM support ASoC: pcm3008: Use gpio_set_value_cansleep() ASoC: pcm3008: Add DAPM support ASoC: pcm3008: Manage DAC and ADC power with DAPM ASoC: wl1273: Add stub DAPM support ASoC: cs4270: Add DAPM support ASoC: wm8727: Add DAPM support ASoC: wm8782: Add DAPM support ASoC: wm5102: Add inputs for noise and mic mixers ASoC: wm5110: Add inputs for noise and mic mixers ASoC: wm8997: Add inputs for noise and mic mixers ASoC: ac97: Provide stub DAPM integration ASoC: hdmi: Provide stub DAPM integration ASoC: bt-sco: Add generic compatible string ASoC: bt-sco: Provide stub DAPM integration ASoC: spdif: Add stub DAPM widgets for Rx ASoC: spdif: Remove duplicate const ASoC: imx: Add MODULE_LICENSE to DMA drivers ASoC: samsung: Check to see if we managed to allocate a channel ASoC: samsung: Rename DMA platform registration functions Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linus Merge remote-tracking branch 'asoc/topic/ac97' into asoc-next Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-next Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-next Merge remote-tracking branch 'asoc/topic/ak5386' 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/au1x' into asoc-next Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next Merge remote-tracking branch 'asoc/topic/bt' into asoc-next Merge remote-tracking branch 'asoc/topic/compress' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/ep93xx' 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/kirkwood' into asoc-next Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next Merge remote-tracking branch 'asoc/topic/max9877' into asoc-next Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next Merge remote-tracking branch 'asoc/topic/omap' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-next Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next Merge remote-tracking branch 'asoc/topic/s6000' 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/si476x' into asoc-next Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next Merge remote-tracking branch 'asoc/topic/txx9' into asoc-next Merge remote-tracking branch 'asoc/topic/uda134x' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Merge remote-tracking branch 'asoc/topic/wl1273' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8731' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8782' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8904' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next Markus Pargmann (10): ASoC: imx-pcm-dma: DT support ASoC: imx-pcm-fiq: Introduce pcm-fiq-params ASoC: fsl: Move fsl-ssi binding doc to sound/ ASoC: imx-audmux: Read default configuration from devicetree ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ASoC: imx-audmux: default configuration parser fixups ASoC: imx-audmux: Move definitions to dt-bindings ASoC: core: Generic ac97 link reset functions ASoC: fsl-ssi: ac97-slave support Michael Grzeschik (2): ASoC: fsl-ssi: imx-pcm-fiq bugfix ASoC: fsl: disable ssi irq for imx Michael Trimarchi (2): ASoC: omap-mcbsp: Support SND_SOC_DAIFMT_CBM_CFS for omap3/4 ASoC: Add PCM1792A spi mode codec support Mike Dyer (1): ASoC: wm8960: Fix PLL register writes Nicolas Ferre (1): ASoC: atmel: machine driver for at91sam9x5-wm8731 boards Nicolin Chen (4): ASoC: fsl: Disable SSI in trigger() if RE/TE are both cleared ASoC: fsl: Set sdma peripheral type directly ASoC: spdif: Add S20_3LE and S24_LE support for dummy codec drivers ASoC: fsl: Add S/PDIF CPU DAI driver Oskar Schirmer (1): ASoC: sgtl5000: fix codec clock source transition to avoid clockless moment Padmavathi Venna (6): ASoC: Samsung: I2S: Modify driver to give more flexibility ASoC: Samsung: I2S: Add quirks as driver data in I2S ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420 ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi ARM: dts: Change i2s compatible string on exynos5250 ARM: dts: Change i2s compatible string on exynos5250 Peter Ujfalusi (1): ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot) Richard Fitzgerald (1): ASoC: core: init delayed_work for codec-codec links Richard Genoud (2): ASoC: wm8731: add rates constraints ASoC: atmel: update atmel SSC with DMA binding Rongjun Ying (1): ASoC: hdmi-codec: let the driver support HDMI sink Russell King (8): ASoC: uda134x: fix codec driver by converting to DAPM ASoC: spdif_transceiver: add output pin widget ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data ASoC: kirkwood: Free external clock if it is a duplicate of internal ASoC: avoid duplicated DAI routes ASoC: kirkwood: provide KIRKWOOD_PLAYCTL_ENABLE_MASK ASoC: kirkwood: combine kirkwood-i2s and kirkwood-dma drivers ASoC: kirkwood: move calculation of max buffer size to kirkwood.h Sachin Kamat (2): ASoC: s6105-ipcam: Fix incorrect placement of __initdata ASoC: pxa: Remove duplicate inclusion of dmaengine.h Steffen Trumtrar (1): ASoC: fsl-ssi: add SSIEN errata work around Stephen Warren (2): ASoC: tegra: fix compile warning in AC'97 driver ASoC: tegra: support a Mic Jack in the Tegra+RT5640 machine driver Tushar Behera (1): ASoC: samsung: Fix build error with dma function rename Vinod Koul (1): ASoC: compress: use soc_xxx handlers for metadata Wei Yongjun (7): ASoC: db1200: add .owner to struct snd_soc_card ASoC: imx_mc13783: add .owner to struct snd_soc_card ASoC: brownstone: add .owner to struct snd_soc_card ASoC: ttc_dkb: add .owner to struct snd_soc_card ASoC: mop500: add .owner to struct snd_soc_card ASoC: imx-sgtl5000: fix error return code in imx_sgtl5000_probe() ASoC: rcar: fix return value check in rsnd_gen1_probe() Wolfram Sang (5): ASoC: au1x: don't check resource with devm_ioremap_resource ASoC: ep93xx: don't check resource with devm_ioremap_resource ASoC: nuc900: don't check resource with devm_ioremap_resource ASoC: pxa: don't check resource with devm_ioremap_resource ASoC: txx9: don't check resource with devm_ioremap_resource .../devicetree/bindings/misc/atmel-ssc.txt | 23 +- .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 65 + Documentation/devicetree/bindings/sound/ak4554.c | 11 + .../devicetree/bindings/sound/alc5632.txt | 19 + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 35 + .../devicetree/bindings/sound/atmel-wm8904.txt | 55 + .../devicetree/bindings/sound/fsl,spdif.txt | 54 + .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 12 + .../devicetree/bindings/sound/imx-audmux.txt | 9 + .../devicetree/bindings/sound/mrvl,pxa-ssp.txt | 28 + .../devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | 15 + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 24 +- .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 26 +- .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 27 +- .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 24 +- .../devicetree/bindings/sound/pcm1792a.txt | 18 + Documentation/devicetree/bindings/sound/rt5640.txt | 20 + .../devicetree/bindings/sound/samsung-i2s.txt | 22 +- .../devicetree/bindings/sound/soc-ac97link.txt | 28 + .../devicetree/bindings/sound/ti,pcm1681.txt | 15 + .../devicetree/bindings/sound/tlv320aic3x.txt | 9 +- Documentation/devicetree/bindings/sound/wm8731.txt | 9 + Documentation/devicetree/bindings/sound/wm8753.txt | 24 +- Documentation/devicetree/bindings/sound/wm8903.txt | 19 + Documentation/devicetree/bindings/sound/wm8994.txt | 4 + MAINTAINERS | 2 + arch/arm/boot/dts/exynos5250.dtsi | 9 +- arch/arm/mach-dove/common.c | 4 +- arch/arm/mach-kirkwood/common.c | 24 +- arch/arm/plat-pxa/ssp.c | 171 ++- include/dt-bindings/sound/fsl-imx-audmux.h | 56 + include/linux/atmel-ssc.h | 2 +- include/linux/mfd/arizona/gpio.h | 96 ++ include/linux/platform_data/asoc-s3c.h | 1 + include/linux/platform_data/omap-abe-twl6040.h | 49 - include/linux/pxa2xx_ssp.h | 11 + include/sound/pxa2xx-lib.h | 7 - include/sound/rcar_snd.h | 84 ++ include/sound/soc-dapm.h | 199 ++-- include/sound/soc-dpcm.h | 2 +- include/sound/soc.h | 39 +- sound/arm/pxa2xx-ac97.c | 26 +- sound/arm/pxa2xx-pcm-lib.c | 52 +- sound/arm/pxa2xx-pcm.c | 5 +- sound/arm/pxa2xx-pcm.h | 6 +- sound/core/Kconfig | 3 + sound/core/Makefile | 3 + .../soc-dmaengine-pcm.c => core/pcm_dmaengine.c} | 0 sound/soc/Kconfig | 5 +- sound/soc/Makefile | 4 - sound/soc/atmel/Kconfig | 21 + sound/soc/atmel/Makefile | 4 + sound/soc/atmel/atmel-pcm-dma.c | 118 +- sound/soc/atmel/atmel_ssc_dai.c | 36 +- sound/soc/atmel/atmel_wm8904.c | 254 ++++ sound/soc/atmel/sam9x5_wm8731.c | 208 ++++ sound/soc/au1x/db1200.c | 4 + sound/soc/au1x/psc-ac97.c | 3 - sound/soc/blackfin/bf5xx-ac97.h | 1 - sound/soc/cirrus/ep93xx-ac97.c | 3 - sound/soc/cirrus/ep93xx-i2s.c | 3 - sound/soc/codecs/Kconfig | 19 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/ac97.c | 15 + sound/soc/codecs/ad1980.c | 43 + sound/soc/codecs/ad73311.c | 22 +- sound/soc/codecs/adau1701.c | 25 +- sound/soc/codecs/adav80x.c | 13 +- sound/soc/codecs/ads117x.c | 29 +- sound/soc/codecs/ak4104.c | 34 +- sound/soc/codecs/ak4554.c | 106 ++ sound/soc/codecs/ak5386.c | 17 +- sound/soc/codecs/arizona.c | 69 +- sound/soc/codecs/arizona.h | 5 +- sound/soc/codecs/bt-sco.c | 22 +- sound/soc/codecs/cs4270.c | 20 + sound/soc/codecs/cs4271.c | 30 +- sound/soc/codecs/hdmi.c | 30 +- sound/soc/codecs/lm4857.c | 107 +- sound/soc/codecs/max9768.c | 16 + sound/soc/codecs/max98090.c | 10 +- sound/soc/codecs/max9877.c | 294 ++--- sound/soc/codecs/mc13783.c | 1 - sound/soc/codecs/pcm1681.c | 339 ++++++ sound/soc/codecs/pcm1792a.c | 257 ++++ sound/soc/codecs/pcm1792a.h | 26 + sound/soc/codecs/pcm3008.c | 150 ++- sound/soc/codecs/rt5640.c | 26 - sound/soc/codecs/sgtl5000.c | 10 +- sound/soc/codecs/si476x.c | 14 + sound/soc/codecs/spdif_receiver.c | 17 +- sound/soc/codecs/spdif_transmitter.c | 18 +- sound/soc/codecs/sta32x.c | 10 +- sound/soc/codecs/tlv320aic26.c | 51 +- sound/soc/codecs/tlv320aic3x.c | 56 +- sound/soc/codecs/twl4030.c | 2 - sound/soc/codecs/twl6040.c | 7 +- sound/soc/codecs/uda134x.c | 88 +- sound/soc/codecs/wl1273.c | 17 + sound/soc/codecs/wm0010.c | 12 +- sound/soc/codecs/wm5102.c | 53 +- sound/soc/codecs/wm5110.c | 35 +- sound/soc/codecs/wm8350.c | 6 +- sound/soc/codecs/wm8727.c | 17 +- sound/soc/codecs/wm8731.c | 60 +- sound/soc/codecs/wm8753.c | 5 +- sound/soc/codecs/wm8782.c | 17 +- sound/soc/codecs/wm8903.c | 4 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8960.c | 10 +- sound/soc/codecs/wm8962.c | 7 +- sound/soc/codecs/wm8994.c | 39 +- sound/soc/codecs/wm8995.c | 5 +- sound/soc/codecs/wm8997.c | 1175 +++++++++++++++++++ sound/soc/codecs/wm8997.h | 23 + sound/soc/codecs/wm_adsp.c | 124 +- sound/soc/codecs/wm_adsp.h | 3 +- sound/soc/codecs/wm_hubs.c | 8 +- sound/soc/fsl/Kconfig | 13 +- sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_spdif.c | 1236 ++++++++++++++++++++ sound/soc/fsl/fsl_spdif.h | 191 +++ sound/soc/fsl/fsl_ssi.c | 500 ++++++-- sound/soc/fsl/imx-audmux.c | 78 +- sound/soc/fsl/imx-audmux.h | 52 +- sound/soc/fsl/imx-mc13783.c | 1 + sound/soc/fsl/imx-pcm-dma.c | 4 +- sound/soc/fsl/imx-pcm-fiq.c | 20 +- sound/soc/fsl/imx-pcm.h | 26 +- sound/soc/fsl/imx-sgtl5000.c | 4 +- sound/soc/fsl/imx-ssi.c | 11 +- sound/soc/fsl/imx-ssi.h | 1 + sound/soc/fsl/imx-wm8962.c | 3 +- sound/soc/kirkwood/Kconfig | 11 +- sound/soc/kirkwood/Makefile | 4 +- sound/soc/kirkwood/kirkwood-dma.c | 108 +- sound/soc/kirkwood/kirkwood-i2s.c | 67 +- sound/soc/kirkwood/kirkwood-openrd.c | 6 +- sound/soc/kirkwood/kirkwood-t5325.c | 6 +- sound/soc/kirkwood/kirkwood.h | 11 +- sound/soc/mxs/Kconfig | 3 +- sound/soc/mxs/mxs-saif.c | 1 - sound/soc/mxs/mxs-sgtl5000.c | 30 +- sound/soc/nuc900/nuc900-ac97.c | 3 - sound/soc/omap/Kconfig | 8 +- sound/soc/omap/omap-abe-twl6040.c | 133 +-- sound/soc/omap/omap-dmic.c | 9 +- sound/soc/omap/omap-mcbsp.c | 5 + sound/soc/omap/omap-mcpdm.c | 3 - sound/soc/pxa/Kconfig | 2 +- sound/soc/pxa/brownstone.c | 1 + sound/soc/pxa/mioa701_wm9713.c | 7 +- sound/soc/pxa/mmp-pcm.c | 7 +- sound/soc/pxa/mmp-sspa.c | 15 +- sound/soc/pxa/pxa-ssp.c | 76 +- sound/soc/pxa/pxa2xx-ac97.c | 67 +- sound/soc/pxa/pxa2xx-i2s.c | 28 +- sound/soc/pxa/pxa2xx-pcm.c | 21 +- sound/soc/pxa/ttc-dkb.c | 1 + sound/soc/s6000/s6105-ipcam.c | 2 +- sound/soc/samsung/ac97.c | 11 +- sound/soc/samsung/dma.c | 12 +- sound/soc/samsung/dma.h | 4 +- sound/soc/samsung/i2s-regs.h | 51 +- sound/soc/samsung/i2s.c | 193 ++- sound/soc/samsung/pcm.c | 4 +- sound/soc/samsung/s3c2412-i2s.c | 4 +- sound/soc/samsung/s3c24xx-i2s.c | 4 +- sound/soc/samsung/smdk_wm8994.c | 58 +- sound/soc/samsung/spdif.c | 12 +- sound/soc/sh/Kconfig | 7 + sound/soc/sh/Makefile | 3 + sound/soc/sh/rcar/Makefile | 2 + sound/soc/sh/rcar/adg.c | 234 ++++ sound/soc/sh/rcar/core.c | 861 ++++++++++++++ sound/soc/sh/rcar/gen.c | 280 +++++ sound/soc/sh/rcar/rsnd.h | 302 +++++ sound/soc/sh/rcar/scu.c | 236 ++++ sound/soc/sh/rcar/ssi.c | 728 ++++++++++++ sound/soc/soc-compress.c | 13 +- sound/soc/soc-core.c | 236 +++- sound/soc/soc-dapm.c | 810 +++++++------ sound/soc/soc-jack.c | 2 +- sound/soc/soc-pcm.c | 15 +- sound/soc/spear/Kconfig | 2 +- sound/soc/tegra/Kconfig | 14 +- sound/soc/tegra/tegra20_ac97.c | 8 - sound/soc/tegra/tegra_alc5632.c | 2 - sound/soc/tegra/tegra_rt5640.c | 1 + sound/soc/tegra/tegra_wm8753.c | 2 - sound/soc/tegra/trimslice.c | 2 - sound/soc/txx9/txx9aclc-ac97.c | 3 - sound/soc/ux500/mop500.c | 1 + 193 files changed, 10275 insertions(+), 2357 deletions(-) create mode 100644 Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt create mode 100644 Documentation/devicetree/bindings/sound/ak4554.c create mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel-wm8904.txt create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (87%) create mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt create mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm1792a.txt create mode 100644 Documentation/devicetree/bindings/sound/soc-ac97link.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt create mode 100644 include/dt-bindings/sound/fsl-imx-audmux.h create mode 100644 include/linux/mfd/arizona/gpio.h delete mode 100644 include/linux/platform_data/omap-abe-twl6040.h create mode 100644 include/sound/rcar_snd.h rename sound/{soc/soc-dmaengine-pcm.c => core/pcm_dmaengine.c} (100%) create mode 100644 sound/soc/atmel/atmel_wm8904.c create mode 100644 sound/soc/atmel/sam9x5_wm8731.c create mode 100644 sound/soc/codecs/ak4554.c create mode 100644 sound/soc/codecs/pcm1681.c create mode 100644 sound/soc/codecs/pcm1792a.c create mode 100644 sound/soc/codecs/pcm1792a.h create mode 100644 sound/soc/codecs/wm8997.c create mode 100644 sound/soc/codecs/wm8997.h create mode 100644 sound/soc/fsl/fsl_spdif.c create mode 100644 sound/soc/fsl/fsl_spdif.h create mode 100644 sound/soc/sh/rcar/Makefile create mode 100644 sound/soc/sh/rcar/adg.c create mode 100644 sound/soc/sh/rcar/core.c create mode 100644 sound/soc/sh/rcar/gen.c create mode 100644 sound/soc/sh/rcar/rsnd.h create mode 100644 sound/soc/sh/rcar/scu.c create mode 100644 sound/soc/sh/rcar/ssi.c

2 1

Re: [alsa-devel] oops during boot with CONFIG_SND_DYNAMIC_MINORS not set
by Takashi Iwai 23 Aug '13

23 Aug '13

At Fri, 23 Aug 2013 00:56:01 +0300, Stratos Karafotis wrote: > > On 08/23/2013 12:23 AM, Takashi Iwai wrote: > > At Thu, 22 Aug 2013 19:03:44 +0300, > > Stratos Karafotis wrote: > >> > >> On 08/22/2013 10:59 AM, Takashi Iwai wrote: > >>> At Thu, 22 Aug 2013 00:42:41 +0300, > >>> Stratos Karafotis wrote: > >>>> > >>>> Hi, > >>>> > >>>> I get the following oops during boot when build with CONFIG_SND_DYNAMIC_MINORS > >>>> not set (3.11-rc6). > >>>> The issue is vanished building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > >>>> as suggested in printk message. > >>>> > >>>> Regards, > >>>> Stratos > >>>> > >>>> > >>> > >>> Could you check the patch below? > >>> Thanks! > >>> > >>> > >>> Takashi > >>> > >>> --- > >>> From: Takashi Iwai <tiwai(a)suse.de> > >>> Subject: [PATCH] ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n > >>> > >>> Without the dynamic minor assignment, HDMI codec may have less PCM > >>> instances than the number of pins, which eventually leads to Oops. > >>> > >>> Reported-by: Stratos Karafotis <stratosk(a)semaphore.gr> > >>> Cc: <stable(a)vger.kernel.org> > >>> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > >>> --- > >>> sound/pci/hda/patch_hdmi.c | 3 +++ > >>> 1 file changed, 3 insertions(+) > >>> > >>> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > >>> index 030ca86..e2cb92b 100644 > >>> --- a/sound/pci/hda/patch_hdmi.c > >>> +++ b/sound/pci/hda/patch_hdmi.c > >>> @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) > >>> struct snd_pcm_chmap *chmap; > >>> struct snd_kcontrol *kctl; > >>> int i; > >>> + > >>> + if (pin_idx >= codec->num_pcms) > >>> + break; > >>> err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, > >>> SNDRV_PCM_STREAM_PLAYBACK, > >>> NULL, 0, pin_idx, &chmap); > >>> > >> > >> Hi, > >> > >> Unfortunately, still the same problem after applying your patch. > > > > Bah, it's a wrong one. The patch below should work better. > > Sorry for inconvenience. > > No problem! :) > > Yes, no more oops with the latest patch. > Tested with CONFIG_SND_DYNAMIC_MINORS=y and n. > > There is an error -16 now (please see below), but I guess it's normal(?) Yes, it's the expected behavior. Thanks for quick tests! Takashi > Thanks, > Stratos > > > [ 16.392453] ALSA sound/pci/hda/hda_codec.c:4506 Too many HDMI devices > [ 16.392457] ALSA sound/pci/hda/hda_codec.c:4508 Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > [ 16.392460] ALSA sound/pci/hda/hda_codec.c:4506 Too many HDMI devices > [ 16.392461] ALSA sound/pci/hda/hda_codec.c:4508 Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > [ 16.409640] ALSA sound/core/control.c:349 control 0:0:0:HDMI/DP Jack:0 is already present > [ 16.410627] hda_codec: cannot build controls for #3 (error -16) > [ 16.411683] input: HDA NVidia HDMI/DP as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input15 > [ 16.411844] input: HDA NVidia HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input16 > [ 16.411986] input: HDA NVidia HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input17 > [ 19.682495] EXT4-fs (sda2): mounted filesystem with ordered data mode. Opts: (null) > [ 21.367420] FAT-fs (sda1): Volume was not properly unmounted. Some data may be corrupt. Please run fsck. > [ 21.420191] EXT4-fs (dm-2): mounted filesystem with ordered data mode. Opts: (null) > [ 21.847085] type=1305 audit(1377207061.920:3): audit_pid=534 old=0 auid=4294967295 ses=4294967295 > res=1 > [ 22.164707] alsactl[549]: segfault at 1 ip 00007f6c8ad58a7d sp 00007fff19912de0 error 4 in libc-2.17.so[7f6c8ad10000+1b6000] >

1 0

[alsa-devel] [RFC PATCH 3/3] ALSA: hda - Haswell codec exposes device list/select info on pins
by mengdong.lin＠intel.com 23 Aug '13

23 Aug '13

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch is only to allow codec proc file to expose devices list/select info for Haswell codec pins. Since Haswell Gfx driver cannot support DP1.2 MST now, so all pins' device list is empty, meaning no pin is multi-streaming capaple. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 030ca86..87ca984 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1989,8 +1989,10 @@ static int patch_generic_hdmi(struct hda_codec *codec) return -EINVAL; } codec->patch_ops = generic_hdmi_patch_ops; - if (codec->vendor_id == 0x80862807) + if (codec->vendor_id == 0x80862807) { codec->patch_ops.set_power_state = haswell_set_power_state; + codec->dp_mst = true; + } generic_hdmi_init_per_pins(codec); -- 1.8.1.2

1 0

[alsa-devel] [RFC PATCH 2/3] ALSA: hda - add device list & select info of display pins to codec proc file
by mengdong.lin＠intel.com 23 Aug '13

23 Aug '13

From: Mengdong Lin <mengdong.lin(a)intel.com> If a display codec supports multi-stream transport on the pins, the pin's device list length and device entries will be exposed to codec proc file. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 9760f00..fd62d8f 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -582,6 +582,38 @@ static void print_gpio(struct snd_info_buffer *buffer, print_nid_array(buffer, codec, nid, &codec->nids); } +static void print_device_list(struct snd_info_buffer *buffer, + struct hda_codec *codec, hda_nid_t nid) +{ + int i, curr = -1; + union hda_devlist_entry dev_list[AC_MAX_DEVLIST_LEN]; + int devlist_len; + + devlist_len = snd_hda_get_devices(codec, nid, dev_list, + AC_MAX_DEVLIST_LEN); + snd_iprintf(buffer, " Devices: %d\n", devlist_len); + if (devlist_len <= 0) + return; + + curr = snd_hda_codec_read(codec, nid, 0, + AC_VERB_GET_DEVICE_SEL, 0); + + for (i = 0; i < devlist_len; i++) { + if (i == curr) + snd_iprintf(buffer, " *"); + else + snd_iprintf(buffer, " "); + + snd_iprintf(buffer, + "Dev %02d: PD = %ld, ELDV = %ld, IA = %ld\n", + i, dev_list[i].bits.present_detect, + dev_list[i].bits.eld_valid, dev_list[i].bits.inactive); + } + + return 0; + +} + static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { @@ -751,6 +783,9 @@ static void print_codec_info(struct snd_info_entry *entry, (wid_caps & AC_WCAP_DELAY) >> AC_WCAP_DELAY_SHIFT); + if (wid_type == AC_WID_PIN && codec->dp_mst) + print_device_list(buffer, codec, nid); + if (wid_caps & AC_WCAP_CONN_LIST) print_conn_list(buffer, codec, nid, wid_type, conn, conn_len); -- 1.8.1.2

1 0

Re: [alsa-devel] [PATCH] rme96 Add missing vmalloc.h inclusion
by Takashi Iwai 22 Aug '13

22 Aug '13

At Thu, 22 Aug 2013 15:06:38 +0200, Knut Petersen wrote: > > [1 <text/plain; ISO-8859-1 (7bit)>] > On 22.08.2013 10:53, Takashi Iwai wrote: > > Actually this triggers the double free. It's freed in > > snd_rme96_free() via snd_card_free(). > Yes. Now I see that. > > I applied the patch with removal of this double vfree call. > Thanks. > > Unfortunately there still is a problem with the code: > vmalloc() and vfree() were used without inclusion > of linux/vmalloc.h. Indeed. Applied now. Thanks. Takashi > > cu, > Knut > > > [2 0001-alsa-rme96-Add-missing-inclusion-of-linux-vmalloc.h.patch <text/x-patch (7bit)>] > >From 2a3f98ff69308f3c2ee508ac0887e1f8bf493d64 Mon Sep 17 00:00:00 2001 > From: Knut Petersen <Knut_Petersen(a)t-online.de> > Date: Thu, 22 Aug 2013 14:36:16 +0200 > Subject: [PATCH] alsa/rme96: Add missing inclusion of linux/vmalloc.h > > Signed-off-by: Knut Petersen <Knut_Petersen(a)t-online.de> > --- > sound/pci/rme96.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c > index 2acf565..cc6deca 100644 > --- a/sound/pci/rme96.c > +++ b/sound/pci/rme96.c > @@ -28,6 +28,7 @@ > #include <linux/interrupt.h> > #include <linux/pci.h> > #include <linux/module.h> > +#include <linux/vmalloc.h> > > #include <sound/core.h> > #include <sound/info.h> > -- > 1.8.1.4 >

1 0

Re: [alsa-devel] oops during boot with CONFIG_SND_DYNAMIC_MINORS not set
by Takashi Iwai 22 Aug '13

22 Aug '13

At Thu, 22 Aug 2013 19:03:44 +0300, Stratos Karafotis wrote: > > On 08/22/2013 10:59 AM, Takashi Iwai wrote: > > At Thu, 22 Aug 2013 00:42:41 +0300, > > Stratos Karafotis wrote: > >> > >> Hi, > >> > >> I get the following oops during boot when build with CONFIG_SND_DYNAMIC_MINORS > >> not set (3.11-rc6). > >> The issue is vanished building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > >> as suggested in printk message. > >> > >> Regards, > >> Stratos > >> > >> > > > > Could you check the patch below? > > Thanks! > > > > > > Takashi > > > > --- > > From: Takashi Iwai <tiwai(a)suse.de> > > Subject: [PATCH] ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n > > > > Without the dynamic minor assignment, HDMI codec may have less PCM > > instances than the number of pins, which eventually leads to Oops. > > > > Reported-by: Stratos Karafotis <stratosk(a)semaphore.gr> > > Cc: <stable(a)vger.kernel.org> > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > > --- > > sound/pci/hda/patch_hdmi.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > > index 030ca86..e2cb92b 100644 > > --- a/sound/pci/hda/patch_hdmi.c > > +++ b/sound/pci/hda/patch_hdmi.c > > @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) > > struct snd_pcm_chmap *chmap; > > struct snd_kcontrol *kctl; > > int i; > > + > > + if (pin_idx >= codec->num_pcms) > > + break; > > err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, > > SNDRV_PCM_STREAM_PLAYBACK, > > NULL, 0, pin_idx, &chmap); > > > > Hi, > > Unfortunately, still the same problem after applying your patch. Bah, it's a wrong one. The patch below should work better. Sorry for inconvenience. Takashi --- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH v2] ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n Without the dynamic minor assignment, HDMI codec may have less PCM instances than the number of pins, which eventually leads to Oops. Reported-by: Stratos Karafotis <stratosk(a)semaphore.gr> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 030ca86..9f35862 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) struct snd_pcm_chmap *chmap; struct snd_kcontrol *kctl; int i; + + if (!codec->pcm_info[pin_idx].pcm) + break; err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, SNDRV_PCM_STREAM_PLAYBACK, NULL, 0, pin_idx, &chmap); -- 1.8.3.4

1 0

[alsa-devel] [PATCH v2 00/10] ALSA: usb-audio: fix playback/capture concurrent usage
by Eldad Zack 22 Aug '13

22 Aug '13

Hi, This patch series attempts to fix a long starting problem with the concurrent usage of playback and capture on implicit feedback devices. Applies against current for-next (HEAD b43dd416be21bc8ad60984e13def032f01aaaa18 ). v1: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-August/065517.html Thanks to Clemens I was able to get rid of the get_interface workaround, so I believe it's ready now, unless there's any other issues. Other changes: * Cleaned up and moved the set_param flag patch to #7. * Fixed a NULL dereference in patch #8 for explicit feedback. * Fixed a logic error in patch #9. * Added patch #10. Cheers, Eldad Eldad Zack (10): ALSA: usb-audio: remove unused parameter from sync_ep_set_params ALSA: usb-audio: remove deactivate_endpoints() ALSA: usb-audio: prevent NULL dereference on stop trigger ALSA: usb-audio: don't deactivate URBs on in-use EP ALSA: usb-audio: void return type of snd_usb_endpoint_deactivate() ALSA: usb-audio: clear SUBSTREAM_FLAG_SYNC_EP_STARTED on error ALSA: usb-audio: correct ep use_count semantics (add set_param flag) ALSA: usb-audio: conditional interface altsetting ALSA: usb-audio: conditional concurrent usage of endpoint ALSA: usb-audio: remove altset_idx from snd_usb_substream sound/usb/card.h | 2 +- sound/usb/endpoint.c | 76 +++++++++++++++++------- sound/usb/endpoint.h | 11 +++- sound/usb/pcm.c | 161 ++++++++++++++++++++++++++++++++++++++------------- sound/usb/pcm.h | 2 + sound/usb/proc.c | 4 +- 6 files changed, 192 insertions(+), 64 deletions(-) -- 1.8.1.5

3 17

[alsa-devel] [PATCH v10 0/2] Add freescale S/PDIF CPU DAI and machine drivers
by Nicolin Chen 22 Aug '13

22 Aug '13

Changelog: v9->v10: * Removed "dummy" words from binding doc in PATCH-2. v8->v9: * Use bool instead of atomic_t. * Use clk_prepare_enable() instead. * Dropped dumpregs(). * Dropped unnecessary clk_round_rate(). * Dropped unused clock source enum. * Revised dev_err() message. v7->v8: * Revised DT binding doc. * Revised dev_err() error msg. * Check return value of clk_set_rate(). v6->v7: * Removed extra comma in array. * Revised some comments. * Added some dev_err(). * Check the return value of soft reset. * Use bitrev8() instead of extra reverse_bits(). * Use cache_bypass as default for regmap. v5->v6: * Sorted out rxtx clk source in DT binding. * Use devm_xxxx() functions. * Use platform_get_resource() instead. v4->v5: * Dropped rx/tx-clksrc-names DT bindings. * Use standard clock binding instead to pass the clock source list. * Update the compatible list by using "imx35", the first SoC that has spdif. v3->v4: * Use regmap for CPU DAI driver. * Use individual clock source for 32KHz, 44KHz, 48KHz playback. * Determine clock source configuration from 'clocks' entry. * Added imx53 to compatible list, merged imx6q and imx6dl in the list. * Improve the algorism of reverse_bits(). * Dropped the unneeded clk_put(). v2->v3: * Removed a wrong tag from the commit of patch-1. v1->v2: * Dropped one applied patch for spdif dummy codec drivers. * Use generic DMA DT binding. * Let spdif controller driver calculate the clock div. * Added one optional clock source for spdif tx. * Reivsed documentation accordingly. Nicolin Chen (2): ASoC: fsl: Add S/PDIF CPU DAI driver ASoC: fsl: Add S/PDIF machine driver .../devicetree/bindings/sound/fsl,spdif.txt | 54 + .../devicetree/bindings/sound/imx-audio-spdif.txt | 29 + sound/soc/fsl/Kconfig | 14 + sound/soc/fsl/Makefile | 4 + sound/soc/fsl/fsl_spdif.c | 1236 ++++++++++++++++++++ sound/soc/fsl/fsl_spdif.h | 191 +++ sound/soc/fsl/imx-spdif.c | 134 +++ 7 files changed, 1662 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt create mode 100644 sound/soc/fsl/fsl_spdif.c create mode 100644 sound/soc/fsl/fsl_spdif.h create mode 100644 sound/soc/fsl/imx-spdif.c

4 10

[alsa-devel] [PATCH v5 1/1] ASoc: kirkwood: add DT support to the mvebu audio subsystem
by Jean-Francois Moine 22 Aug '13

22 Aug '13

This patch adds DT support to the audio subsystem of the mvebu family (Kirkwood, Dove, Armada 370). Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> --- This patch does not add any new function as S/PDIF or DPCM support. --- .../devicetree/bindings/sound/mvebu-audio.txt | 29 ++++++++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 26 +++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt new file mode 100644 index 0000000..7e5fd37 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -0,0 +1,29 @@ +* mvebu (Kirkwood, Dove, Armada 370) audio controller + +Required properties: + +- compatible: "marvell,mvebu-audio" + +- reg: physical base address of the controller and length of memory mapped + region. + +- interrupts: list of two irq numbers. + The first irq is used for data flow and the second one is used for errors. + +- clocks: one or two phandles. + The first one is mandatory and defines the internal clock. + The second one is optional and defines an external clock. + +- clock-names: names associated to the clocks: + "internal" for the internal clock + "extclk" for the external clock + +Example: + +i2s1: audio-controller@b4000 { + compatible = "marvell,mvebu-audio"; + reg = <0xb4000 0x2210>; + interrupts = <21>, <22>; + clocks = <&gate_clk 13>; + clock-names = "internal"; +}; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c.next b/sound/soc/kirkwood/kirkwood-i2s.c index e5f3f7a..a4170b4 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c.next +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -22,6 +22,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/platform_data/asoc-kirkwood.h> +#include <linux/of.h> + #include "kirkwood.h" #define DRV_NAME "mvebu-audio" @@ -453,6 +455,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai; struct kirkwood_dma_data *priv; struct resource *mem; + struct device_node *np = pdev->dev.of_node; int err; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); @@ -473,14 +476,16 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - if (!data) { - dev_err(&pdev->dev, "no platform data ?!\n"); + if (np) { + priv->burst = 128; /* might be 32 or 128 */ + } else if (data) { + priv->burst = data->burst; + } else { + dev_err(&pdev->dev, "no DT nor platform data ?!\n"); return -EINVAL; } - priv->burst = data->burst; - - priv->clk = devm_clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, np ? "internal" : NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "no clock\n"); return PTR_ERR(priv->clk); @@ -507,7 +512,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24; /* Select the burst size */ - if (data->burst == 32) { + if (priv->burst == 32) { priv->ctl_play |= KIRKWOOD_PLAYCTL_BURST_32; priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_32; } else { @@ -552,12 +557,21 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id mvebu_audio_of_match[] = { + { .compatible = "marvell,mvebu-audio" }, + { } +}; +MODULE_DEVICE_TABLE(of, mvebu_audio_of_match); +#endif + static struct platform_driver kirkwood_i2s_driver = { .probe = kirkwood_i2s_dev_probe, .remove = kirkwood_i2s_dev_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(mvebu_audio_of_match), }, }; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

2 1