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

[alsa-devel] [PATCH 2/2] ASoC: fsl-asoc-card: add AC'97 support
by Maciej S. Szmigiero 31 Aug '15

31 Aug '15

Add AC'97 support to fsl-asoc-card using generic ASoC AC'97 CODEC. The SSI controller will silently enable any TX AC'97 slots that have their bits set in SLOTREQ received from CODEC and then will redirect some of playback samples there. That's why it is important to make sure that any of CODEC playback slots that can pull samples are set to slots 3/4 (standard PCM playback slots). Currently, this applies to S/PDIF slots as they were seen to pull samples sometimes even with S/PDIF output being disabled. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> --- .../devicetree/bindings/sound/fsl-asoc-card.txt | 10 +- sound/soc/fsl/fsl-asoc-card.c | 145 +++++++++++++++---- 2 files changed, 120 insertions(+), 35 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index a96774c..ce55c0a 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -13,13 +13,15 @@ So having this generic sound card allows all Freescale SoC users to benefit from the simplification of a new card support and the capability of the wide sample rates support through ASRC. -Note: The card is initially designed for those sound cards who use I2S and - PCM DAI formats. However, it'll be also possible to support those non - I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as long - as the driver has been properly upgraded. +Note: The card is initially designed for those sound cards who use AC'97, I2S + and PCM DAI formats. However, it'll be also possible to support those non + AC'97/I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as + long as the driver has been properly upgraded. The compatible list for this generic sound card currently: + "fsl,imx-audio-ac97" + "fsl,imx-audio-cs42888" "fsl,imx-audio-wm8962" diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 96f55ae..385a9f8 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -14,6 +14,9 @@ #include <linux/i2c.h> #include <linux/module.h> #include <linux/of_platform.h> +#if IS_ENABLED(CONFIG_SND_AC97_CODEC) +#include <sound/ac97_codec.h> +#endif #include <sound/pcm_params.h> #include <sound/soc.h> @@ -115,6 +118,11 @@ static const struct snd_soc_dapm_widget fsl_asoc_card_dapm_widgets[] = { SND_SOC_DAPM_MIC("DMIC", NULL), }; +static bool fsl_asoc_card_is_ac97(struct fsl_asoc_card_priv *priv) +{ + return priv->dai_fmt == SND_SOC_DAIFMT_AC97; +} + static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -133,7 +141,9 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, * set_bias_level(), bypass the remaining settings in hw_params(). * Note: (dai_fmt & CBM_CFM) includes CBM_CFM and CBM_CFS. */ - if (priv->card.set_bias_level && priv->dai_fmt & SND_SOC_DAIFMT_CBM_CFM) + if ((priv->card.set_bias_level && + priv->dai_fmt & SND_SOC_DAIFMT_CBM_CFM) || + fsl_asoc_card_is_ac97(priv)) return 0; /* Specific configurations of DAIs starts from here */ @@ -300,7 +310,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, ext_port--; /* - * Use asynchronous mode (6 wires) for all cases. + * Use asynchronous mode (6 wires) for all cases except AC97. * If only 4 wires are needed, just set SSI into * synchronous mode and enable 4 PADs in IOMUX. */ @@ -346,15 +356,30 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, IMX_AUDMUX_V2_PTCR_TCLKDIR; break; default: - return -EINVAL; + if (!fsl_asoc_card_is_ac97(priv)) + return -EINVAL; + } + + if (fsl_asoc_card_is_ac97(priv)) { + int_ptcr = IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TCLKDIR; + ext_ptcr = IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TFSEL(int_port) | + IMX_AUDMUX_V2_PTCR_TFSDIR; } /* Asynchronous mode can not be set along with RCLKDIR */ - ret = imx_audmux_v2_configure_port(int_port, 0, - IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)); - if (ret) { - dev_err(dev, "audmux internal port setup failed\n"); - return ret; + if (!fsl_asoc_card_is_ac97(priv)) { + unsigned int pdcr = + IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port); + + ret = imx_audmux_v2_configure_port(int_port, 0, + pdcr); + if (ret) { + dev_err(dev, "audmux internal port setup failed\n"); + return ret; + } } ret = imx_audmux_v2_configure_port(int_port, int_ptcr, @@ -364,11 +389,16 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, return ret; } - ret = imx_audmux_v2_configure_port(ext_port, 0, - IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); - if (ret) { - dev_err(dev, "audmux external port setup failed\n"); - return ret; + if (!fsl_asoc_card_is_ac97(priv)) { + unsigned int pdcr = + IMX_AUDMUX_V2_PDCR_RXDSEL(int_port); + + ret = imx_audmux_v2_configure_port(ext_port, 0, + pdcr); + if (ret) { + dev_err(dev, "audmux external port setup failed\n"); + return ret; + } } ret = imx_audmux_v2_configure_port(ext_port, ext_ptcr, @@ -389,6 +419,23 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) struct device *dev = card->dev; int ret; + if (fsl_asoc_card_is_ac97(priv)) { +#if IS_ENABLED(CONFIG_SND_AC97_CODEC) + struct snd_soc_codec *codec = card->rtd[0].codec; + struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); + + /* + * Use slots 3/4 for S/PDIF so SSI won't try to enable + * other slots and send some samples there + * due to SLOTREQ bits for S/PDIF received from codec + */ + snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS, + AC97_EA_SPSA_SLOT_MASK, AC97_EA_SPSA_3_4); +#endif + + return 0; + } + ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); if (ret) { @@ -404,10 +451,9 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) struct device_node *cpu_np, *codec_np, *asrc_np; struct device_node *np = pdev->dev.of_node; struct platform_device *asrc_pdev = NULL; - struct platform_device *cpu_pdev; + struct platform_device *cpu_pdev, *codec_pdev; struct fsl_asoc_card_priv *priv; - struct i2c_client *codec_dev; - struct clk *codec_clk; + struct i2c_client *codec_i2c_dev; const char *codec_dai_name; u32 width; int ret; @@ -420,9 +466,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) /* Give a chance to old DT binding */ if (!cpu_np) cpu_np = of_parse_phandle(np, "ssi-controller", 0); - codec_np = of_parse_phandle(np, "audio-codec", 0); - if (!cpu_np || !codec_np) { - dev_err(&pdev->dev, "phandle missing or invalid\n"); + if (!cpu_np) { + dev_err(&pdev->dev, "CPU phandle missing or invalid\n"); ret = -EINVAL; goto fail; } @@ -434,11 +479,13 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) goto fail; } - codec_dev = of_find_i2c_device_by_node(codec_np); - if (!codec_dev) { - dev_err(&pdev->dev, "failed to find codec platform device\n"); - ret = -EINVAL; - goto fail; + codec_np = of_parse_phandle(np, "audio-codec", 0); + if (codec_np) { + codec_pdev = of_find_device_by_node(codec_np); + codec_i2c_dev = of_find_i2c_device_by_node(codec_np); + } else { + codec_pdev = NULL; + codec_i2c_dev = NULL; } asrc_np = of_parse_phandle(np, "audio-asrc", 0); @@ -446,10 +493,13 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) asrc_pdev = of_find_device_by_node(asrc_np); /* Get the MCLK rate only, and leave it controlled by CODEC drivers */ - codec_clk = clk_get(&codec_dev->dev, NULL); - if (!IS_ERR(codec_clk)) { - priv->codec_priv.mclk_freq = clk_get_rate(codec_clk); - clk_put(codec_clk); + if (codec_pdev) { + struct clk *codec_clk = clk_get(&codec_pdev->dev, NULL); + + if (!IS_ERR(codec_clk)) { + priv->codec_priv.mclk_freq = clk_get_rate(codec_clk); + clk_put(codec_clk); + } } /* Default sample rate and format, will be updated in hw_params() */ @@ -486,12 +536,22 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO; priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO; priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else if (of_device_is_compatible(np, "fsl,imx-audio-ac97")) { + codec_dai_name = "ac97-hifi"; + priv->card.set_bias_level = NULL; + priv->dai_fmt = SND_SOC_DAIFMT_AC97; } else { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); ret = -EINVAL; goto asrc_fail; } + if (!fsl_asoc_card_is_ac97(priv) && !codec_pdev) { + dev_err(&pdev->dev, "failed to find codec platform device\n"); + ret = -EINVAL; + goto asrc_fail; + } + /* Common settings for corresponding Freescale CPU DAI driver */ if (strstr(cpu_np->name, "ssi")) { /* Only SSI needs to configure AUDMUX */ @@ -508,7 +568,9 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->cpu_priv.sysclk_id[0] = FSL_SAI_CLK_MAST1; } - sprintf(priv->name, "%s-audio", codec_dev->name); + snprintf(priv->name, sizeof(priv->name), "%s-audio", + fsl_asoc_card_is_ac97(priv) ? "ac97" : + codec_i2c_dev ? codec_i2c_dev->name : codec_pdev->name); /* Initialize sound card */ priv->pdev = pdev; @@ -532,8 +594,26 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) /* Normal DAI Link */ priv->dai_link[0].cpu_of_node = cpu_np; - priv->dai_link[0].codec_of_node = codec_np; priv->dai_link[0].codec_dai_name = codec_dai_name; + + if (!fsl_asoc_card_is_ac97(priv)) + priv->dai_link[0].codec_of_node = codec_np; + else { + u32 idx; + + ret = of_property_read_u32(cpu_np, "cell-index", &idx); + if (ret) { + dev_err(&pdev->dev, + "cannot get CPU index property\n"); + goto asrc_fail; + } + + priv->dai_link[0].codec_name = + devm_kasprintf(&pdev->dev, GFP_KERNEL, + "ac97-codec.%u", + (unsigned int)idx); + } + priv->dai_link[0].platform_of_node = cpu_np; priv->dai_link[0].dai_fmt = priv->dai_fmt; priv->card.num_links = 1; @@ -544,6 +624,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->dai_link[1].platform_of_node = asrc_np; priv->dai_link[2].codec_dai_name = codec_dai_name; priv->dai_link[2].codec_of_node = codec_np; + priv->dai_link[2].codec_name = + priv->dai_link[0].codec_name; priv->dai_link[2].cpu_of_node = cpu_np; priv->dai_link[2].dai_fmt = priv->dai_fmt; priv->card.num_links = 3; @@ -579,14 +661,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) asrc_fail: of_node_put(asrc_np); -fail: of_node_put(codec_np); +fail: of_node_put(cpu_np); return ret; } static const struct of_device_id fsl_asoc_card_dt_ids[] = { + { .compatible = "fsl,imx-audio-ac97", }, { .compatible = "fsl,imx-audio-cs42888", }, { .compatible = "fsl,imx-audio-sgtl5000", }, { .compatible = "fsl,imx-audio-wm8962", },

1 0

[alsa-devel] [PATCH 1/2] ASoC: fsl-asoc-card: put ASRC OF node in case of unknown device
by Maciej S. Szmigiero 31 Aug '15

31 Aug '15

In case of unknown DT compatible device the ASRC OF node possibly acquired earlier by of_parse_phandle() has to be put before returning from probe method. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> --- sound/soc/fsl/fsl-asoc-card.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 5aeb6ed..96f55ae 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -488,7 +488,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; } else { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); - return -EINVAL; + ret = -EINVAL; + goto asrc_fail; } /* Common settings for corresponding Freescale CPU DAI driver */

2 1

[alsa-devel] [GIT PULL] ASoC updates for v4.3
by Mark Brown 31 Aug '15

31 Aug '15

The following changes since commit c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b: Linux 4.2-rc8 (2015-08-23 20:52:59 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.2-rc8 for you to fetch changes up to 91931320cfbbcc1dd874c2d0aef62e7d90f07f70: Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc/topic/zx296702' into asoc-next (2015-08-30 15:59:18 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.3 Not many updates to the core here, but an awful lot of driver updates this time round: - Factoring out of AC'97 reset code into the core - New drivers for Cirrus CS4349, GTM601, InvenSense ICS43432, Realtek RT298 and ST STI controllers. - Machine drivers for Rockchip systems with MAX98090 and RT5645 and RT5650. - Initial driver support for Intel Skylake devices. - A large number of cleanups for Lars-Peter Clausen and Axel Lin. ---------------------------------------------------------------- Anatol Pomozov (4): ASoC: max98357a: Make 'sdmode-gpios' dts property optional ASoC: max98357a: Use DAI input as a dapm widget ASoC: max98357a: Do not print error message on asoc/gpio errors ASoC: rl6231: Simplify DMIC divider calculation expression Andrew Morton (1): ASoC: cs4349: include gpio/consumer.h Andrzej Hajda (2): ASoC: intel: use kmemdup rather than duplicating its implementation ASoC: topology: use kmemdup rather than duplicating its implementation Antonio Borneo (1): ASoC: wm0010: Remove redundant spi driver bus initialization Arnaud Pouliquen (12): ASoC: simple card: set cpu-dai sysclk with mclk-fs ASoC: sti-sas: Add sti platform codec ASoC: sti: add binding for ASoC driver ASoC: sti: Add uniperipheral header file ASoC: sti: Add CPU DAI driver for playback ASoC: sti-sas: fix x86 compilation issue. ASoC: sti: minor corrections for uniplayer ASoC: sti: Add CPU DAI driver for capture ASoC: sti: Add uniperipheral dai driver ASoC: Add ability to build sti drivers ASoC: sti: Add clock adjustement control ASoC: sti: Add IEC control Axel Lin (73): ASoC: gtm601: Fix modalias ASoC: rt5645: Constify dmi_system_id table ASoC: cs42xx8: Move the code checking *regmap argument earlier ASoC: cs42xx8: Setup of_match_table ASoC: 88pm860x: Don't change pm860x->dir setting if pm860x_set_dai_sysclk fails ASoC: ak4642: Fix up max_register setting ASoC: lm49453: Remove fs_rate from struct lm49453_priv ASoC: gtm601: Constify soc_codec_dev_gtm601 ASoC: Constify reg_default tables ASoC: rt286: Constify dmi_system_id table ASoC: wm0010: Remove spurious missing IRQF_ONESHOT ASoC: wm5100: Remove spurious IRQF_ONESHOT flag ASoC: wm8996: Remove spurious IRQF_ONESHOT flag ASoC: sti-sas: Fix checking return value for ERR_PTR ASoC: sti-sas: Staticise local symbols ASoC: Constify snd_soc_dai_ops variables ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops ASoC: sirf-audio-codec: Staticise local symbols ASoC: Constify dev_pm_ops variables ASoC: cs4349: Fix max_register setting for cs4349_regmap ASoC: cs4349: Constify cs4349_regmap ASoC: cs4349: Fix setting digital interface format ASoC: cs4349: Set .writeable_reg for cs4349_regmap ASoC: cs4349: Drop platform data support ASoC: cs4349: Remove unneeded NULL test for cs4349->reset_gpio ASoC: cs4349: Fix up setting PWR_DWN bit ASoC: cs35l32: Fix define for CS35L32_SDOUT_3ST ASoC: cs35l32: Remove unneeded NULL test for cs35l32->reset_gpio ASoC: cs42l73: Fix mask for setting CS42L73_SP_3ST bit ASoC: rt5677: Remove NULL test for desc before gpiod_set_value_cansleep call ASoC: tas2552: Fix off-by-one for max_register setting ASoC: tas5086: Improve the logic for de-emphasis sampling rate selection ASoC: pcm1681: Improve the logic for de-emphasis sampling rate selection ASoC: sta529: Remove redundant I2C_FUNC_SMBUS_BYTE_DATA functionality check ASoC: cs4265: CS4265_INT_STATUS is readable register ASoC: Use params_width() at appropriate places ASoC: rt5677: Return error if devm_gpiod_get_optional return ERR_PTR ASoC: tas2552: Remove unneeded NULL test for tas2552->enable_gpio ASoC: max98088: Get rid of max98088_access table ASoC: max98095: Get rid of max98095_access table ASoC: wm8983: Get rid of wm8983_access_masks table ASoC: max98090: Simplify max98090_readable_register implementation ASoC: wm8741: Simplify wm8741_set_dai_sysclk implementation ASoC: wm8731: Drop wm8731_writeable function ASoC: wm8753: Drop wm8753_writeable function ASoC: topology: Use kcalloc instead of kzalloc for array allocation ASoC: adav80x: Remove .read_flag_mask setting from adav80x_regmap_config ASoC: cs35l32: Use case range at appropriate places ASoC: cs42l52: Use case range at appropriate place ASoC: cs42l56: Use case range at appropriate place ASoC: cs42l73: Use case range at appropriate place ASoC: wm8741: Drop misleading readable_reg callback implementation ASoC: Set missing card owner field ASoC: davinci: Convert to use devm_ioremap_resource ASoC: omap-mcbsp: Convert to use devm_ioremap_resource ASoC: SPEAr: Convert to use devm_ioremap_resource ASoC: tegra: Fix unused variable 'spdif' warning ASoC: tegra: Use devm_ioremap_resource instead of open code ASoC: ics43432: Fix module license ASoC: pxa-ssp: Convert to devm_snd_soc_register_component ASoC: pxa2xx-i2s: Convert to devm_snd_soc_register_component ASoC: sh: ssi: Convert to devm_snd_soc_register_component ASoC: qcom: Constify asoc_qcom_lpass_cpu_dai_ops ASoC: au1x: Convert to devm_snd_soc_register_platform ASoC: blackfin: Convert to devm_snd_soc_register_platform ASoC: nuc900: Convert to devm_snd_soc_register_platform ASoC: pxa: Convert to devm_snd_soc_register_platform ASoC: txx9: Convert to devm_snd_soc_register_platform ASoC: spear_pcm: Use devm_snd_dmaengine_pcm_register to fix resource leak ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform ASoC: au1x: psc-i2s: Convert to use devm_ioremap_resource ASoC: sti_uniperif: Ensure component is unregistered when unload module ASoC: zx296702-i2s: Fix resource leak when unload module Bard Liao (4): ASoC: rt5645: move RT5645 muxes to rt5645_specific_dapm_widgets ASoC: add rt298 codec driver ASoC: rt298: remove meanless pr_info ASoC: rl6231: add pll preset table Ben Zhang (3): ASoC: rt5677: Switch to use descriptor-based gpiod API ASoC: rt5677: Switch to use unified device property API ASoC: rt5677: Allow arbitrary block read/write via SPI Charles Keepax (8): ASoC: arizona: Implement stability check for EQ coefficients ASoC: arizona: Implement stability check for LHPF coefficients mfd: wm5110: Add registers for custom write sequence triggers mfd: wm5110: Add register patch for rev E and above ASoC: wm5110: Add special DRE on/off handling for the headphone path ASoC: arizona: Use the more idiomatic params_width ASoC: arizona: Fix error path in codec probe ASoC: arizona: Poll for FLL clock OK rather than use interrupts Dan Carpenter (3): ASoC: fsl: fsl_spdif: signedness bug in fsl_spdif_startup() ASoC: max98925: reading beyond the end of the array ASoC: sti: error handling bug in sti_uniperiph_cpu_dai_of() Fabio Estevam (6): ASoC: fsl: fsl_asrc: Check for clk_prepare_enable() error ASoC: fsl: fsl_spdif: Check for clk_prepare_enable() error ASoC: max98090: Check for clk_prepare_enable() error ASoC: wm8904: Check for clk_prepare_enable() error ASoC: wm8731: Check for clk_prepare_enable() error ASoC: max98095: Check for clk_prepare_enable() error Fang, Yang A (2): ASoC: ts3a227e: do not report jack status when there is i2c read err ASoC: max98090: Fix sequencing when starting additional routes Geert Uytterhoeven (2): ASoC: fsi: Remove obsolete sh_fsi2 platform_device_id entry ASoC: rsnd: Silence DMA slave ID compile warning on 64-bit Hardik T Shah (1): ASoC: Intel: Skylake: Add helpers for SRC and converter modules Harsha Priya (1): ASoC: ssm4567: Added ACPI entry for SSM4567 codec Jarkko Nikula (6): ASoC: rt286: Prefix hexadecimal ID register value with 0x in error print ASoC: rt5640: Prefix hexadecimal ID register value with 0x in error print ASoC: rt5645: Prefix hexadecimal ID register value with 0x in error print ASoC: rt5651: Prefix hexadecimal ID register value with 0x in error print ASoC: rt5670: Prefix hexadecimal ID register value with 0x in error print ASoC: rt5677: Prefix hexadecimal ID register value with 0x in error print Javier Martinez Canillas (1): ASoC: Export OF module alias information in missing codec drivers Jean-Francois Moine (1): ASoC: kirkwood: prevent double streaming Jeeja KP (11): ASoC: Intel: Add Skylake HDA platform driver ASoC: Intel: Add Skylake HDA audio driver ASoC: Intel: Add makefile support for SKL driver ASoC: Intel: Add support for decoupled mode in skl driver ASoC: Intel: Skylake: Add NHLT support to get BE config ASoC: Intel: Skylake: Add dsp and ipc init helpers ASoC: Intel: Skylake: Fix the NHLT rate size ASoC: Intel: Skylake: Use acpi header for NHLT header ASoC: Intel: Skylake: Add helpers for DSP module configuration ASoC: Intel: Skylake: Add DSP module init and binding routines ASoC: Intel: Skylake: Add pipe management helpers Joe Perches (1): ASoC: atmel_ssc_dai: Correct misuse of 0x%<decimal> John Lin (1): ASoC: rt5640: fix line out no sound issue Jonathan Corbet (1): ASoC: Clean up docbook warnings Julia Lawall (1): ASoC: ux500: adjust devm usage Junjie Mao (1): ASoC: Intel: fix runtime pm imbalance on error Jyri Sarha (1): ASoC: omap-hdmi-audio: Set buffer bytes step constraint to 128 Kenneth Westfield (2): ASoC: qcom: move board Kconfig deps to parent config ASoC: qcom: remove Kconfig deps from variant configs Koro Chen (5): ASoC: dpcm: Add checks of playback/capture before dpcm_get_be ASoC: rt5645: Fix missing free_irq ASoC: rt5645: Add regulator support ASoC: mediatek: Add suspend/resume callbacks ASoC: mediatek: Remove AIF widgets for backend DAIs Krzysztof Kozlowski (2): ASoC: mediatek: Drop owner assignment from platform_driver ASoC: drivers: Drop owner assignment from i2c_driver Kuninori Morimoto (36): regmap: add force_write option on _regmap_update_bits() regmap: add regmap_write_bits() regmap: add regmap_fields_force_write() ASoC: rsnd: gen: add rsnd_force_write() ASoC: core: add snd_soc_of_parse_audio_prefix() ASoC: rsrc-card: use snd_soc_of_parse_audio_route/prefix for routing ASoC: rsnd: remove unnecessary 'out of memory' message from SSI ASoC: rsnd: remove unnecessary 'out of memory' message from SRC ASoC: rsnd: remove unnecessary 'out of memory' message from DVC ASoC: rsnd: rename BUSIF_DALIGN to SSI_BUSIF_DALIGN ASoC: rsnd: rename INT_ENABLE to SSI_INT_ENABLE ASoC: rsnd: fixup each module counter on __rsnd_mod_call() ASoC: rsnd: add workaround for SRC sync convert + DVC ASoC: rsnd: rsnd_mod_id() return -1 if mod was NULL ASoC: rsnd: move DVC specific macro into dvc.c ASoC: rsnd: move SRC specific macro into src.c ASoC: rsnd: dvc: make sure DVC soft reset ASoC: rsnd: src: make sure SRC soft reset ASoC: rsnd: enable module multi connection ASoC: rsnd: rename rsnd_path_parse/break() into add/remove ASoC: rsnd: add rsnd_path_parse() for CTU/MIX/DVC route setting ASoC: rsnd: add rsnd_dvc_initialize_lock/unlock() ASoC: rsnd: add rsnd_src_initialize_lock/unlock() ASoC: rsnd: tidyup ADINR function name ASoC: rsnd: add rsnd_get_adinr_chan() ASoC: rsnd: tidyup data align position ASoC: rsnd: show debug message for SSI/SRC/DVC connection ASoC: rsnd: tidyup rsnd_dma_ops definition place ASoC: rsnd: check the Gen1 at the beginning of DVC probe ASoC: rsnd: dma: add DMA name on .ops ASoC: rsnd: add rsnd_io_to_mod() ASoC: rsnd: tidyup SRC position on each code ASoC: rsnd: update Audio DMA path search method ASoC: rsnd: add CTU (Channel Transfer Unit) prototype support ASoC: rsnd: add MIX (Mixer) support ASoC: rsnd: tidyup parameter assignment position Lars-Peter Clausen (83): ASoC: rt5645: Replace direct snd_soc_codec dapm field access ASoC: tas571x: Replace direct snd_soc_codec dapm field access ASoC: omap3pandora: Use card DAPM context to access widgets ASoC: cht_bsw_max98090_ti: Use card DAPM context to access widgets ASoC: dapm_widget_show_codec: Use component instead of CODEC ASoC: Remove snd_soc_codec dapm field ASoC: Prevent components from being bound to multiple cards ASoC: Use card field to indicate whether a component is bound ASoC: uda134x: Move state struct allocation to bus probe ASoC: uda134x: Explicitly handle in-data addresses ASoC: uda134x: Convert to regmap ASoC: uda134x: Use regmap_update_bits() were appropriate ASoC: max98925: Remove control_data initialization ASoC: max9877: Make driver global regmap struct local ASoC: max9877: Convert to component ASoC: max9768: Use managed gpio request ASoC: max9768: Convert to component ASoC: cs4349: Fix suspend/resume ASoC: cs4349: Don't use rtd->codec ASoC: dapm: Add helper function to free a widget ASoC: dapm: Avoid duplicating immutable strings ALSA: ac97: Add helper function to reset the AC97 device ASoC: ac97: Add support for resetting device before registration ASoC: ad1980: Use core AC'97 reset helper ASoC: stac9766: Use core reset helper ASoC: wm9705: Use core AC'97 reset helper ASoC: wm9712: Use core AC'97 reset helper ASoC: wm9713: Use core AC'97 reset helper ASoC: dapm: Drop always true checks ASoC: dapm: Simplify list creation in dapm_dai_get_connected_widgets() ASoC: dapm: Add widget path iterators ASoC: wm8804: Drop duplicate const ASoC: lpass-ipq806x: Staticise local symbols ASoC: rcar ctu: Staticise local symbols ASoC: uniperf: Add missing __iomem annotation ASoC: uniperf: Staticise local symbols ASoC: xtfpga-i2s: Add missing __rcu annotation ASoC: 88pm860x: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: ab8500: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: adau1373: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: alc5623: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: alc5632: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: cs42l52: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: cs42l56: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: cs42l73: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: da7210: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: da7213: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: da9055: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: jz4740: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max9768: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max98088: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max98090: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max98095: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max9850: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: max9877: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5631: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5640: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5645: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5651: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5670: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: rt5677: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: sgtl5000: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: ssm2602: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: tpa6130a2: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: twl4030: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: uda1380: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8350: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8400: Don't use range container for TLV with one entry ASoC: wm8737: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8753: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8961: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8962: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm8990: Don't use range container for TLV with one entry ASoC: wm8991: Don't use range container for TLVs with one entry ASoC: wm8993: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm9081: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm9090: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm9713: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: wm_hubs: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE ASoC: dapm: dapm_dai_get_connected_widgets: Fix missing mutex unlock ASoC: dapm: Consolidate input and output path handling ASoC: dapm: Consolidate path trace events ASoC: ssm4567: Add sense support Luis de Bethencourt (1): ASoC: bcm2835-i2s: Fix module autoload for OF platform drivers Maciej S. Szmigiero (6): ASoC: fsl_ssi: enable IPG clock during AC'97 reg access ASoC: fsl_ssi: AC'97 DAI driver needs probe method too ASoC: fsl_ssi: enable AC'97 asymmetric rates ASoC: fsl_ssi: add AC'97 ops setting check and cleanup ASoC: fsl_ssi: instantiate AC'97 CODEC ASoC: fsl_ssi: adjust set DAI format in AC'97 mode Marek Belisko (2): ASoC: Add gtm601 codec driver Documentation: vendor-prefixes: Add option prefix Mark Brown (43): Merge branch 'topic/codec-dapm' of git://git.kernel.org/.../broonie/sound into asoc-rt5645 Merge tag 'regmap-force' into asoc-rcar ASoC: sti-sas: Remove spurious dependency on SND_SOC_STI Merge branches 'topic/rt298', 'topic/ts3a227e' and 'topic/cs42xx8' of git://git.kernel.org/.../broonie/sound into asoc-owner Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/.../broonie/sound into asoc-max9877 Merge branch 'topic/of-name' of git://git.kernel.org/.../broonie/sound into asoc-rcar Merge tag 'regmap-seq-delay-api' of git://git.kernel.org/.../broonie/regmap into asoc-wm5110 Merge tag 'regmap-seq-delay-api' of git://git.kernel.org/.../broonie/regmap into asoc-reg-default Merge branch 'fix/rt5645' of git://git.kernel.org/.../broonie/sound into asoc-rt5645 ASoC: sti-uniperf: Fix implicit inclusion of pinctrl Merge branch 'fix/dapm' of git://git.kernel.org/.../broonie/sound into asoc-dapm Merge branch 'topic/owner' of git://git.kernel.org/.../broonie/sound into asoc-ssm4567 Merge branch 'fix/ssm4567' of git://git.kernel.org/.../broonie/sound into asoc-ssm4567 Merge tag 'v4.2-rc6' into asoc-topology Merge branch 'topic/gtm601' of git://git.kernel.org/.../broonie/sound into asoc-ics43432 Merge branch 'topic/ics43432' of git://git.kernel.org/.../broonie/sound into asoc-gtm601 Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/adav80x', 'asoc/fix/arizona', 'asoc/fix/max98090', 'asoc/fix/rt5640', 'asoc/fix/samsung' and 'asoc/fix/wm8994' into asoc-linus 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/pcm1681' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branch 'asoc/topic/ssm4567' into asoc-next Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97', 'asoc/topic/ak4542', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic/blackfin' and 'asoc/topic/card' into asoc-next Merge remote-tracking branches 'asoc/topic/const', 'asoc/topic/cs35l32', 'asoc/topic/cs4265' and 'asoc/topic/cs42l52' into asoc-next Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42l73', 'asoc/topic/cs4349' and 'asoc/topic/da732x' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', 'asoc/topic/doc' and 'asoc/topic/dpcm' into asoc-next Merge remote-tracking branches 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-card' and 'asoc/topic/fsl-sai' into asoc-next Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc/topic/gtm601', 'asoc/topic/ics43432' and 'asoc/topic/ids' into asoc-next Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic/lm49453', 'asoc/topic/max9768' and 'asoc/topic/max98088' into asoc-next Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max98357a', 'asoc/topic/max9877' and 'asoc/topic/max98925' into asoc-next Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc/topic/nuc900', 'asoc/topic/of-name' and 'asoc/topic/omap' into asoc-next Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default', 'asoc/topic/rl6231', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/rt5651' and 'asoc/topic/rt5670' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf-codec' and 'asoc/topic/spear' into asoc-next Merge remote-tracking branches 'asoc/topic/ssm2518', 'asoc/topic/sta529', 'asoc/topic/sti' and 'asoc/topic/sti-sas' into asoc-next Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc/topic/tegra', 'asoc/topic/tlv' and 'asoc/topic/topology' into asoc-next Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/uda134x', 'asoc/topic/ux500' and 'asoc/topic/width' into asoc-next Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm5100', 'asoc/topic/wm5110', 'asoc/topic/wm8004' and 'asoc/topic/wm8731' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753', 'asoc/topic/wm8904', 'asoc/topic/wm8960' and 'asoc/topic/wm8983' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc/topic/zx296702' into asoc-next Masanari Iida (2): ASoC: Fix warning while make xmldocs caused by soc-core.c ASoC: Fix warning caused by a typo in comments of snd_soc_add_platform() Mengdong Lin (4): ASoC: topology: Change pass number of DAI smaller than graph ASoC: topology: Bind vendor specific kcontrol handlers before standard ones ASoC: topology: Reduce arguments of soc_tplg_kcontrol_bind_io() ASoC: topology: Add support for TLV bytes controls Nariman Poushin (2): regmap: Use reg_sequence for multi_reg_write / register_patch ASoC: wm5110: Use reg_sequence for multi_reg_write/register_patch Nicolas Boichat (5): ASoC: rt5645: Remove irq_jack_detection function ASoC: rt5645: Update dapm pins when the card is not instantiated yet ASoC: rt5645: Simplify rt5645_enable_push_button_irq ASoC: rt5645: Remove unused rt5645 variable ASoC: rt5645: Remove return value in jack detect work Nicolin Chen (1): ASoC: fsl-asoc-card: Specify codec_dai_name for DAI links Nik Nyby (1): ASoC: codecs: max98088: fix typo in constant Nikesh Oswal (1): ASoC: arizona: Fix gain settings of FLL in free-run mode Oder Chiou (7): ASoC: Add function "rl6231_get_pre_div" to correct the dmic clock calculation ASoC: rt5645: Modify the headphone depop and calibration function to prevent the pop sound in the booting time ASoC: rt5645: Modify the jack detection function to prevent the pop sound while the jack plug in ASoC: rt5645: Remove the incorrect setting of the JD mode ASoC: rt5645: Add the register RT5645_CHARGE_PUMP to readable check function ASoC: rt5645: Add struct dmi_system_id "Google Celes" for chrome platform ASoC: rt5645: Prevent the pop sound of the headphone while rebooting or shutdowning Omair M Abdullah (1): ASoC: Intel: Skylake: Print error code in IPC for SKL Ricard Wanderlof (3): ASoC: ssm2518: Add explicit device tree support ASoC: ics43432: Add codec driver for InvenSense ICS-43432 ASoC: ics43432: Fix build errors Sergey Kiselev (1): ASoC: wm8731: initialize the hardware when loading the codec driver Shengjiu Wang (2): ASoC: fsl: Add dedicated DMA buffer size for each cpu dai ASoC: core: Don't probe the component which is dummy Subhransu S. Prusty (9): ASoC: Intel: Define SKL ADSP IPC and general purpose registers ASoC: Intel: Reorganize the common dsp structure ASoC: Intel: Add helper to poll register for DSP status ASoC: Intel: Add helper to update register bits with attr RWC ASoC: Intel: Add Skylake IPC library ASoC: Intel: Add DSP init and boot up functionality for SKL ASoC: Intel: Skylake: Add dsp loader ops ASoC: Intel: Skylake: Process code loader DMA interrupt ASoC: Intel: Skylake: Add SKL DSP initialization Tim Howe (1): ASoC: cs4349: Add support for Cirrus Logic CS4349 Vaishali Thakkar (7): ASoC: xtensa: Remove unnecessary snd_pcm_lib_preallocate_free_for_all() ASoC: tegra: Use devm_clk_get ASoC: tegra: Convert to managed resources ASoC: davinci-vcif: Use devm_snd_soc_register_component ASoC: tegra: Revert part of "ASoC: tegra: Convert to managed resources" ASoC: rockchip: i2s: Adjust devm usage ASoC: samsung: Remove redundant arndale_audio_remove Vinod Koul (7): ASoC: intel: kconfig - Move DW_DMAC_CORE dependency to machines ASoC: intel - kconfig: remove SND_SOC_INTEL_SST prompt ASoC: intel - atom: statify sst_slot_enum_info ASoC: intel - atom: fix sst_platform_compr_ops declaration ASoC: Intel: Skylake: Add code loader DMA registers ASoC: Intel: Skylake: add code loader DMA operations ASoC: Intel: Skylake: Add code loader DMA APIs Xing Zheng (1): ASoC: rockchip: fix a misjudgement by return Xiubo Li (1): ASoC: fsl: fix typos for sound/soc/fsl/* Zidan Wang (4): ASoC: wm8960: update pll and clock setting function ASoC: fsl-sai: add 32 bit word length support ASoC: fsl-asoc-card: add wm8960 support ASoC: wm8994: fix add dynamic path error kbuild test robot (8): ASoC: fix platform_no_drv_owner.cocci warnings ASoC: gtm601_dai can be static ASoC: sti-sas: fix platform_no_drv_owner.cocci warnings ASoC: sti: sti_uniperiph_dai_create_ctrl() can be static ASoC: cs4349: fix platform_no_drv_owner.cocci warnings ASoC: rockchip: fix platform_no_drv_owner.cocci warnings ASoC: rockchip: fix platform_no_drv_owner.cocci warnings ASoC: ics43432: fix platform_no_drv_owner.cocci warnings zhengxing (2): ASoC: rockchip: Add machine driver for max98090 codec ASoC: rockchip: Add machine driver for rt5645/rt5650 codec Documentation/DocBook/alsa-driver-api.tmpl | 2 +- Documentation/devicetree/bindings/sound/cs4349.txt | 19 + .../devicetree/bindings/sound/ics43432.txt | 17 + .../devicetree/bindings/sound/max98357a.txt | 6 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 22 + .../bindings/sound/renesas,rsrc-card.txt | 7 + .../bindings/sound/rockchip-max98090.txt | 19 + .../devicetree/bindings/sound/rockchip-rt5645.txt | 17 + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 155 +++ .../devicetree/bindings/vendor-prefixes.txt | 2 + drivers/base/regmap/internal.h | 2 +- drivers/base/regmap/regmap.c | 73 +- drivers/gpu/drm/i2c/adv7511.c | 2 +- drivers/input/misc/drv260x.c | 6 +- drivers/input/misc/drv2665.c | 2 +- drivers/input/misc/drv2667.c | 4 +- drivers/mfd/arizona-core.c | 2 +- drivers/mfd/twl6040.c | 2 +- drivers/mfd/wm5102-tables.c | 6 +- drivers/mfd/wm5110-tables.c | 22 +- drivers/mfd/wm8994-core.c | 8 +- drivers/mfd/wm8997-tables.c | 2 +- include/linux/mfd/arizona/registers.h | 37 + include/linux/regmap.h | 28 +- include/sound/ac97_codec.h | 2 + include/sound/rcar_snd.h | 14 + include/sound/rt298.h | 20 + include/sound/soc-dapm.h | 84 +- include/sound/soc-topology.h | 13 +- include/sound/soc.h | 29 +- include/trace/events/asoc.h | 53 +- sound/ac97_bus.c | 62 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/atmel_ssc_dai.c | 2 +- sound/soc/au1x/dbdma2.c | 11 +- sound/soc/au1x/dma.c | 11 +- sound/soc/au1x/psc-i2s.c | 16 +- sound/soc/bcm/bcm2835-i2s.c | 2 + sound/soc/blackfin/bf5xx-ac97-pcm.c | 10 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 10 +- sound/soc/blackfin/bfin-eval-adau1x61.c | 1 + sound/soc/codecs/88pm860x-codec.c | 32 +- sound/soc/codecs/Kconfig | 25 + sound/soc/codecs/Makefile | 10 + sound/soc/codecs/ab8500-codec.c | 7 +- sound/soc/codecs/ad1980.c | 36 +- sound/soc/codecs/adau1373.c | 22 +- sound/soc/codecs/adau1701.c | 1 - sound/soc/codecs/adau1761-i2c.c | 1 - sound/soc/codecs/adau1781-i2c.c | 1 - sound/soc/codecs/adau1977-i2c.c | 1 - sound/soc/codecs/adav803.c | 1 - sound/soc/codecs/adav80x.c | 3 +- sound/soc/codecs/ak4535.c | 1 - sound/soc/codecs/ak4641.c | 1 - sound/soc/codecs/ak4642.c | 34 +- sound/soc/codecs/ak4671.c | 1 - sound/soc/codecs/alc5623.c | 8 +- sound/soc/codecs/alc5632.c | 10 +- sound/soc/codecs/arizona.c | 129 +- sound/soc/codecs/arizona.h | 20 +- sound/soc/codecs/cs35l32.c | 60 +- sound/soc/codecs/cs35l32.h | 2 +- sound/soc/codecs/cs4265.c | 19 +- sound/soc/codecs/cs4270.c | 1 - sound/soc/codecs/cs4271-i2c.c | 1 - sound/soc/codecs/cs42l51-i2c.c | 1 - sound/soc/codecs/cs42l52.c | 65 +- sound/soc/codecs/cs42l56.c | 71 +- sound/soc/codecs/cs42l73.c | 115 +- sound/soc/codecs/cs42xx8-i2c.c | 4 +- sound/soc/codecs/cs42xx8.c | 19 +- sound/soc/codecs/cs42xx8.h | 1 + sound/soc/codecs/cs4349.c | 392 ++++++ sound/soc/codecs/cs4349.h | 136 +++ sound/soc/codecs/da7210.c | 29 +- sound/soc/codecs/da7213.c | 18 +- sound/soc/codecs/da732x.c | 15 +- sound/soc/codecs/da9055.c | 19 +- sound/soc/codecs/gtm601.c | 95 ++ sound/soc/codecs/ics43432.c | 76 ++ sound/soc/codecs/isabelle.c | 11 +- sound/soc/codecs/jz4740.c | 7 +- sound/soc/codecs/lm4857.c | 1 - sound/soc/codecs/lm49453.c | 19 +- sound/soc/codecs/max9768.c | 71 +- sound/soc/codecs/max98088.c | 329 +---- sound/soc/codecs/max98088.h | 2 +- sound/soc/codecs/max98090.c | 171 ++- sound/soc/codecs/max98090.h | 1 + sound/soc/codecs/max98095.c | 354 +----- sound/soc/codecs/max98357a.c | 25 +- sound/soc/codecs/max9850.c | 8 +- sound/soc/codecs/max9877.c | 33 +- sound/soc/codecs/max98925.c | 6 +- sound/soc/codecs/mc13783.c | 6 +- sound/soc/codecs/ml26124.c | 3 +- sound/soc/codecs/pcm1681.c | 14 +- sound/soc/codecs/pcm512x-i2c.c | 1 - sound/soc/codecs/pcm512x.c | 4 +- sound/soc/codecs/rl6231.c | 104 +- sound/soc/codecs/rl6231.h | 1 + sound/soc/codecs/rt286.c | 11 +- sound/soc/codecs/rt298.c | 1271 ++++++++++++++++++++ sound/soc/codecs/rt298.h | 206 ++++ sound/soc/codecs/rt5631.c | 8 +- sound/soc/codecs/rt5640.c | 59 +- sound/soc/codecs/rt5645.c | 443 +++---- sound/soc/codecs/rt5645.h | 27 +- sound/soc/codecs/rt5651.c | 19 +- sound/soc/codecs/rt5670.c | 21 +- sound/soc/codecs/rt5677-spi.c | 233 +++- sound/soc/codecs/rt5677-spi.h | 8 +- sound/soc/codecs/rt5677.c | 159 +-- sound/soc/codecs/rt5677.h | 5 +- sound/soc/codecs/sgtl5000.c | 8 +- sound/soc/codecs/si476x.c | 2 +- sound/soc/codecs/sirf-audio-codec.c | 4 +- sound/soc/codecs/ssm2518.c | 10 +- sound/soc/codecs/ssm2602-i2c.c | 1 - sound/soc/codecs/ssm2602.c | 7 +- sound/soc/codecs/ssm4567.c | 34 +- sound/soc/codecs/sta32x.c | 1 - sound/soc/codecs/sta350.c | 1 - sound/soc/codecs/sta529.c | 4 - sound/soc/codecs/stac9766.c | 57 +- sound/soc/codecs/sti-sas.c | 628 ++++++++++ sound/soc/codecs/tas2552.c | 20 +- sound/soc/codecs/tas2552.h | 2 +- sound/soc/codecs/tas5086.c | 11 +- sound/soc/codecs/tas571x.c | 2 +- sound/soc/codecs/tfa9879.c | 3 +- sound/soc/codecs/tlv320aic31xx.c | 3 +- sound/soc/codecs/tlv320aic32x4.c | 1 - sound/soc/codecs/tlv320aic3x.c | 3 +- sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/tpa6130a2.c | 15 +- sound/soc/codecs/ts3a227e.c | 48 +- sound/soc/codecs/twl4030.c | 7 +- sound/soc/codecs/uda134x.c | 180 ++- sound/soc/codecs/uda134x.h | 2 - sound/soc/codecs/uda1380.c | 15 +- sound/soc/codecs/wm0010.c | 3 +- sound/soc/codecs/wm1250-ev1.c | 1 - sound/soc/codecs/wm2000.c | 1 - sound/soc/codecs/wm2200.c | 9 +- sound/soc/codecs/wm5100.c | 13 +- sound/soc/codecs/wm5102.c | 27 +- sound/soc/codecs/wm5110.c | 315 ++++- sound/soc/codecs/wm8350.c | 7 +- sound/soc/codecs/wm8400.c | 5 +- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 88 +- sound/soc/codecs/wm8737.c | 8 +- sound/soc/codecs/wm8741.c | 63 +- sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 14 +- sound/soc/codecs/wm8776.c | 5 +- sound/soc/codecs/wm8804-i2c.c | 1 - sound/soc/codecs/wm8804.c | 2 +- sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8903.c | 1 - sound/soc/codecs/wm8904.c | 5 +- sound/soc/codecs/wm8940.c | 1 - sound/soc/codecs/wm8955.c | 1 - sound/soc/codecs/wm8960.c | 221 +++- sound/soc/codecs/wm8960.h | 1 + sound/soc/codecs/wm8961.c | 8 +- sound/soc/codecs/wm8962.c | 21 +- sound/soc/codecs/wm8971.c | 1 - sound/soc/codecs/wm8974.c | 1 - sound/soc/codecs/wm8978.c | 1 - sound/soc/codecs/wm8983.c | 81 +- sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - sound/soc/codecs/wm8990.c | 6 +- sound/soc/codecs/wm8991.c | 53 +- sound/soc/codecs/wm8993.c | 12 +- sound/soc/codecs/wm8994.c | 18 +- sound/soc/codecs/wm8995.c | 1 - sound/soc/codecs/wm8996.c | 11 +- sound/soc/codecs/wm8997.c | 20 +- sound/soc/codecs/wm9081.c | 10 +- sound/soc/codecs/wm9090.c | 22 +- sound/soc/codecs/wm9705.c | 40 +- sound/soc/codecs/wm9712.c | 45 +- sound/soc/codecs/wm9713.c | 55 +- sound/soc/codecs/wm9713.h | 2 - sound/soc/codecs/wm_hubs.c | 7 +- sound/soc/davinci/davinci-i2s.c | 25 +- sound/soc/davinci/davinci-mcasp.c | 18 +- sound/soc/davinci/davinci-vcif.c | 14 +- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 16 +- sound/soc/fsl/fsl_asrc.c | 25 +- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/fsl/fsl_sai.h | 15 +- sound/soc/fsl/fsl_spdif.c | 25 +- sound/soc/fsl/fsl_ssi.c | 68 +- sound/soc/fsl/imx-pcm-dma.c | 25 +- sound/soc/fsl/imx-pcm.h | 9 +- sound/soc/fsl/imx-ssi.c | 2 +- sound/soc/generic/simple-card.c | 9 + sound/soc/intel/Kconfig | 29 +- sound/soc/intel/Makefile | 1 + sound/soc/intel/atom/sst-atom-controls.c | 6 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 - sound/soc/intel/atom/sst-mfld-platform.h | 1 + sound/soc/intel/atom/sst/sst_drv_interface.c | 9 +- sound/soc/intel/atom/sst/sst_ipc.c | 3 +- sound/soc/intel/boards/byt-max98090.c | 1 + sound/soc/intel/boards/byt-rt5640.c | 1 + sound/soc/intel/boards/bytcr_rt5640.c | 1 + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 19 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 + sound/soc/intel/boards/cht_bsw_rt5672.c | 1 + sound/soc/intel/common/sst-dsp-priv.h | 23 +- sound/soc/intel/common/sst-dsp.c | 71 ++ sound/soc/intel/common/sst-dsp.h | 6 + sound/soc/intel/skylake/Makefile | 9 + sound/soc/intel/skylake/skl-messages.c | 884 ++++++++++++++ sound/soc/intel/skylake/skl-nhlt.c | 140 +++ sound/soc/intel/skylake/skl-nhlt.h | 106 ++ sound/soc/intel/skylake/skl-pcm.c | 916 ++++++++++++++ sound/soc/intel/skylake/skl-sst-cldma.c | 327 +++++ sound/soc/intel/skylake/skl-sst-cldma.h | 251 ++++ sound/soc/intel/skylake/skl-sst-dsp.c | 342 ++++++ sound/soc/intel/skylake/skl-sst-dsp.h | 145 +++ sound/soc/intel/skylake/skl-sst-ipc.c | 771 ++++++++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 125 ++ sound/soc/intel/skylake/skl-sst.c | 280 +++++ sound/soc/intel/skylake/skl-topology.h | 286 +++++ sound/soc/intel/skylake/skl-tplg-interface.h | 88 ++ sound/soc/intel/skylake/skl.c | 536 +++++++++ sound/soc/intel/skylake/skl.h | 84 ++ sound/soc/kirkwood/kirkwood-dma.c | 4 + sound/soc/mediatek/mt8173-max98090.c | 2 +- sound/soc/mediatek/mt8173-rt5650-rt5676.c | 2 +- sound/soc/mediatek/mtk-afe-common.h | 8 - sound/soc/mediatek/mtk-afe-pcm.c | 89 +- sound/soc/nuc900/nuc900-pcm.c | 9 +- sound/soc/omap/mcbsp.c | 20 +- sound/soc/omap/omap-hdmi-audio.c | 10 +- sound/soc/omap/omap3pandora.c | 6 +- sound/soc/pxa/mmp-pcm.c | 9 +- sound/soc/pxa/pxa-ssp.c | 11 +- sound/soc/pxa/pxa2xx-i2s.c | 11 +- sound/soc/pxa/pxa2xx-pcm.c | 9 +- sound/soc/qcom/Kconfig | 7 +- sound/soc/qcom/lpass-cpu.c | 2 +- sound/soc/qcom/lpass-ipq806x.c | 2 +- sound/soc/qcom/lpass.h | 2 +- sound/soc/rockchip/Kconfig | 19 + sound/soc/rockchip/Makefile | 6 + sound/soc/rockchip/rockchip_i2s.c | 8 +- sound/soc/rockchip/rockchip_max98090.c | 236 ++++ sound/soc/rockchip/rockchip_rt5645.c | 225 ++++ sound/soc/samsung/arndale_rt5631.c | 11 +- sound/soc/samsung/snow.c | 1 + sound/soc/sh/dma-sh7760.c | 9 +- sound/soc/sh/fsi.c | 1 - sound/soc/sh/rcar/Makefile | 2 +- sound/soc/sh/rcar/core.c | 195 ++- sound/soc/sh/rcar/ctu.c | 171 +++ sound/soc/sh/rcar/dma.c | 128 +- sound/soc/sh/rcar/dvc.c | 73 +- sound/soc/sh/rcar/gen.c | 33 +- sound/soc/sh/rcar/mix.c | 200 +++ sound/soc/sh/rcar/rsnd.h | 111 +- sound/soc/sh/rcar/rsrc-card.c | 22 +- sound/soc/sh/rcar/src.c | 117 +- sound/soc/sh/rcar/ssi.c | 4 +- sound/soc/sh/ssi.c | 12 +- sound/soc/soc-ac97.c | 30 +- sound/soc/soc-core.c | 86 +- sound/soc/soc-dapm.c | 503 ++++---- sound/soc/soc-pcm.c | 16 +- sound/soc/soc-topology.c | 145 +-- sound/soc/spear/spdif_in.c | 20 +- sound/soc/spear/spear_pcm.c | 2 +- sound/soc/sti/Kconfig | 11 + sound/soc/sti/Makefile | 4 + sound/soc/sti/sti_uniperif.c | 254 ++++ sound/soc/sti/uniperif.h | 1229 +++++++++++++++++++ sound/soc/sti/uniperif_player.c | 1110 +++++++++++++++++ sound/soc/sti/uniperif_reader.c | 362 ++++++ sound/soc/tegra/tegra20_das.c | 23 +- sound/soc/tegra/tegra20_i2s.c | 23 +- sound/soc/tegra/tegra20_spdif.c | 47 +- sound/soc/tegra/tegra30_ahub.c | 80 +- sound/soc/tegra/tegra30_i2s.c | 23 +- sound/soc/txx9/txx9aclc.c | 10 +- sound/soc/ux500/ux500_msp_dai.c | 29 +- sound/soc/xtensa/xtfpga-i2s.c | 8 +- sound/soc/zte/zx296702-i2s.c | 6 +- 301 files changed, 16003 insertions(+), 3744 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/cs4349.txt create mode 100644 Documentation/devicetree/bindings/sound/ics43432.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-max98090.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-rt5645.txt create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt create mode 100644 include/sound/rt298.h create mode 100644 sound/soc/codecs/cs4349.c create mode 100644 sound/soc/codecs/cs4349.h create mode 100644 sound/soc/codecs/gtm601.c create mode 100644 sound/soc/codecs/ics43432.c create mode 100644 sound/soc/codecs/rt298.c create mode 100644 sound/soc/codecs/rt298.h create mode 100644 sound/soc/codecs/sti-sas.c create mode 100644 sound/soc/intel/skylake/Makefile create mode 100644 sound/soc/intel/skylake/skl-messages.c create mode 100644 sound/soc/intel/skylake/skl-nhlt.c create mode 100644 sound/soc/intel/skylake/skl-nhlt.h create mode 100644 sound/soc/intel/skylake/skl-pcm.c create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h create mode 100644 sound/soc/intel/skylake/skl-sst.c create mode 100644 sound/soc/intel/skylake/skl-topology.h create mode 100644 sound/soc/intel/skylake/skl-tplg-interface.h create mode 100644 sound/soc/intel/skylake/skl.c create mode 100644 sound/soc/intel/skylake/skl.h create mode 100644 sound/soc/rockchip/rockchip_max98090.c create mode 100644 sound/soc/rockchip/rockchip_rt5645.c create mode 100644 sound/soc/sh/rcar/ctu.c create mode 100644 sound/soc/sh/rcar/mix.c create mode 100644 sound/soc/sti/Kconfig create mode 100644 sound/soc/sti/Makefile create mode 100644 sound/soc/sti/sti_uniperif.c create mode 100644 sound/soc/sti/uniperif.h create mode 100644 sound/soc/sti/uniperif_player.c create mode 100644 sound/soc/sti/uniperif_reader.c

2 6

[alsa-devel] [PATCH] ASoC: Make SND_SOC_STI_SAS depend on RESET_CONTROLLER
by Axel Lin 31 Aug '15

31 Aug '15

(devm_)reset_control_get function is available only when RESET_CONTROLLER is set. Make SND_SOC_STI_SAS depend on RESET_CONTROLLER to fix build error if !RESET_CONTROLLER. Reported-by: Takashi Iwai <tiwai(a)suse.com> Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0c9733e..f8e0022 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -106,7 +106,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_STA350 if I2C select SND_SOC_STA529 if I2C select SND_SOC_STAC9766 if SND_SOC_AC97_BUS - select SND_SOC_STI_SAS + select SND_SOC_STI_SAS if RESET_CONTROLLER select SND_SOC_TAS2552 if I2C select SND_SOC_TAS5086 if I2C select SND_SOC_TAS571X if I2C @@ -634,6 +634,7 @@ config SND_SOC_STAC9766 config SND_SOC_STI_SAS tristate "codec Audio support for STI SAS codec" + depends on RESET_CONTROLLER config SND_SOC_TAS2552 tristate "Texas Instruments TAS2552 Mono Audio amplifier" -- 1.9.1

3 3

[alsa-devel] [PATCH] ASoC: ics43432: Fix build errors
by Ricard Wanderlof 31 Aug '15

31 Aug '15

Fix build errors Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- Not sure how the incorrect name or the misspelled license string got through my local build, perhaps because I've been developing this for an ARM system? Have now set up a tree to build for x86 as well, where the errors manifest themselves, to avoid this type of stuff happening in the future. sound/soc/codecs/ics43432.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/ics43432.c b/sound/soc/codecs/ics43432.c index d217fed..465d591 100644 --- a/sound/soc/codecs/ics43432.c +++ b/sound/soc/codecs/ics43432.c @@ -57,7 +57,7 @@ static const struct of_device_id ics43432_ids[] = { { .compatible = "invensense,ics43432", }, { } }; -MODULE_DEVICE_TABLE(of, ics43432_dt_ids); +MODULE_DEVICE_TABLE(of, ics43432_ids); #endif static struct platform_driver ics43432_driver = { @@ -73,4 +73,4 @@ module_platform_driver(ics43432_driver); MODULE_DESCRIPTION("ASoC ICS43432 driver"); MODULE_AUTHOR("Ricard Wanderlof <ricardw(a)axis.com>"); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 3

[alsa-devel] [PATCH] Revert part of "ASoC: tegra: Convert to managed resources"
by Vaishali Thakkar 31 Aug '15

31 Aug '15

Revert the problematic part of commit 470805eb9f31 ("ASoC: tegra: Convert to managed resources"). Before this commit, PM cleanup was performed after the component was unregistered. But returning directly will skip PM cleanup. So, to be on safe side it is better to use snd_soc_register_component instead of devm_snd_soc_register_component. Signed-off-by: Vaishali Thakkar <vthakkar1994(a)gmail.com> --- sound/soc/tegra/tegra20_spdif.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index a814da0..66237bc 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -329,9 +329,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = devm_snd_soc_register_component(&pdev->dev, - &tegra20_spdif_component, - &tegra20_spdif_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component, + &tegra20_spdif_dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -341,11 +340,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - return ret; + goto err_unregister_component; } return 0; +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_spdif_runtime_suspend(&pdev->dev); @@ -364,6 +365,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev) tegra20_spdif_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.9.1

3 4

[alsa-devel] [PATCH] ASoC: tegra: Use devm_ioremap_resource instead of open code
by Axel Lin 31 Aug '15

31 Aug '15

Use devm_ioremap_resource() to simplify the code. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/tegra/tegra20_das.c | 23 ++++------------------ sound/soc/tegra/tegra20_i2s.c | 23 ++++------------------ sound/soc/tegra/tegra20_spdif.c | 22 ++++----------------- sound/soc/tegra/tegra30_ahub.c | 43 +++++++---------------------------------- sound/soc/tegra/tegra30_i2s.c | 23 ++++------------------ 5 files changed, 23 insertions(+), 111 deletions(-) diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index f52600b..89add13 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -133,7 +133,7 @@ static const struct regmap_config tegra20_das_regmap_config = { static int tegra20_das_probe(struct platform_device *pdev) { - struct resource *res, *region; + struct resource *res; void __iomem *regs; int ret = 0; @@ -149,24 +149,9 @@ static int tegra20_das_probe(struct platform_device *pdev) das->dev = &pdev->dev; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "No memory resource\n"); - ret = -ENODEV; - goto err; - } - - region = devm_request_mem_region(&pdev->dev, res->start, - resource_size(res), pdev->name); - if (!region) { - dev_err(&pdev->dev, "Memory region already claimed\n"); - ret = -EBUSY; - goto err; - } - - regs = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!regs) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENOMEM; + regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); goto err; } diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index 05f1c6e..14106fa 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -339,7 +339,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = { static int tegra20_i2s_platform_probe(struct platform_device *pdev) { struct tegra20_i2s *i2s; - struct resource *mem, *memregion; + struct resource *mem; void __iomem *regs; int ret; @@ -362,24 +362,9 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "No memory resource\n"); - ret = -ENODEV; - goto err_clk_put; - } - - memregion = devm_request_mem_region(&pdev->dev, mem->start, - resource_size(mem), DRV_NAME); - if (!memregion) { - dev_err(&pdev->dev, "Memory region already claimed\n"); - ret = -EBUSY; - goto err_clk_put; - } - - regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); - if (!regs) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENOMEM; + regs = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); goto err_clk_put; } diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 0809b1e..a0c3640 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -265,7 +265,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = { static int tegra20_spdif_platform_probe(struct platform_device *pdev) { struct tegra20_spdif *spdif; - struct resource *mem, *memregion, *dmareq; + struct resource *mem, *dmareq; void __iomem *regs; int ret; @@ -285,10 +285,9 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "No memory resource\n"); - return -ENODEV; - } + regs = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(regs)) + return PTR_ERR(regs); dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmareq) { @@ -296,19 +295,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) return -ENODEV; } - memregion = devm_request_mem_region(&pdev->dev, mem->start, - resource_size(mem), DRV_NAME); - if (!memregion) { - dev_err(&pdev->dev, "Memory region already claimed\n"); - return -EBUSY; - } - - regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); - if (!regs) { - dev_err(&pdev->dev, "ioremap failed\n"); - return -ENOMEM; - } - spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &tegra20_spdif_regmap_config); if (IS_ERR(spdif->regmap)) { diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index 989b1e8..fef3b9a 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c @@ -521,7 +521,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) const struct tegra30_ahub_soc_data *soc_data; struct reset_control *rst; int i; - struct resource *res0, *res1, *region; + struct resource *res0, *res1; void __iomem *regs_apbif, *regs_ahub; int ret = 0; @@ -584,26 +584,12 @@ static int tegra30_ahub_probe(struct platform_device *pdev) } res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res0) { - dev_err(&pdev->dev, "No apbif memory resource\n"); - return -ENODEV; - } + regs_apbif = devm_ioremap_resource(&pdev->dev, res0); + if (IS_ERR(regs_apbif)) + return PTR_ERR(regs_apbif); - region = devm_request_mem_region(&pdev->dev, res0->start, - resource_size(res0), DRV_NAME); - if (!region) { - dev_err(&pdev->dev, "request region apbif failed\n"); - return -EBUSY; - } ahub->apbif_addr = res0->start; - regs_apbif = devm_ioremap(&pdev->dev, res0->start, - resource_size(res0)); - if (!regs_apbif) { - dev_err(&pdev->dev, "ioremap apbif failed\n"); - return -ENOMEM; - } - ahub->regmap_apbif = devm_regmap_init_mmio(&pdev->dev, regs_apbif, &tegra30_ahub_apbif_regmap_config); if (IS_ERR(ahub->regmap_apbif)) { @@ -614,24 +600,9 @@ static int tegra30_ahub_probe(struct platform_device *pdev) regcache_cache_only(ahub->regmap_apbif, true); res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res1) { - dev_err(&pdev->dev, "No ahub memory resource\n"); - return -ENODEV; - } - - region = devm_request_mem_region(&pdev->dev, res1->start, - resource_size(res1), DRV_NAME); - if (!region) { - dev_err(&pdev->dev, "request region ahub failed\n"); - return -EBUSY; - } - - regs_ahub = devm_ioremap(&pdev->dev, res1->start, - resource_size(res1)); - if (!regs_ahub) { - dev_err(&pdev->dev, "ioremap ahub failed\n"); - return -ENOMEM; - } + regs_ahub = devm_ioremap_resource(&pdev->dev, res1); + if (IS_ERR(regs_ahub)) + return PTR_ERR(regs_ahub); ahub->regmap_ahub = devm_regmap_init_mmio(&pdev->dev, regs_ahub, &tegra30_ahub_ahub_regmap_config); diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index fe36375..8e55583 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -379,7 +379,7 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) struct tegra30_i2s *i2s; const struct of_device_id *match; u32 cif_ids[2]; - struct resource *mem, *memregion; + struct resource *mem; void __iomem *regs; int ret; @@ -419,24 +419,9 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "No memory resource\n"); - ret = -ENODEV; - goto err_clk_put; - } - - memregion = devm_request_mem_region(&pdev->dev, mem->start, - resource_size(mem), DRV_NAME); - if (!memregion) { - dev_err(&pdev->dev, "Memory region already claimed\n"); - ret = -EBUSY; - goto err_clk_put; - } - - regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); - if (!regs) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENOMEM; + regs = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); goto err_clk_put; } -- 2.1.0

3 2

[alsa-devel] [asoc:topic/au1x 2/2] sound/soc/au1x/psc-i2s.c:299:6: warning: unused variable 'ret'
by kbuild test robot 30 Aug '15

30 Aug '15

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/au1x head: fd63542fc5492b86158dbd53ce5de764f171b1b6 commit: fd63542fc5492b86158dbd53ce5de764f171b1b6 [2/2] ASoC: au1x: psc-i2s: Convert to use devm_ioremap_resource config: mips-db1xxx_defconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout fd63542fc5492b86158dbd53ce5de764f171b1b6 # save the attached .config to linux build tree make.cross ARCH=mips All warnings (new ones prefixed by >>): sound/soc/au1x/psc-i2s.c: In function 'au1xpsc_i2s_drvprobe': >> sound/soc/au1x/psc-i2s.c:299:6: warning: unused variable 'ret' [-Wunused-variable] int ret; ^ vim +/ret +299 sound/soc/au1x/psc-i2s.c 0f83d639 Manuel Lauss 2009-10-31 283 .rates = AU1XPSC_I2S_RATES, 0f83d639 Manuel Lauss 2009-10-31 284 .formats = AU1XPSC_I2S_FMTS, 0f83d639 Manuel Lauss 2009-10-31 285 .channels_min = 2, 0f83d639 Manuel Lauss 2009-10-31 286 .channels_max = 8, /* 2 without external help */ 0f83d639 Manuel Lauss 2009-10-31 287 }, 0f83d639 Manuel Lauss 2009-10-31 288 .ops = &au1xpsc_i2s_dai_ops, 0f83d639 Manuel Lauss 2009-10-31 289 }; 0f83d639 Manuel Lauss 2009-10-31 290 4edf87f5 Kuninori Morimoto 2013-03-21 291 static const struct snd_soc_component_driver au1xpsc_i2s_component = { 4edf87f5 Kuninori Morimoto 2013-03-21 292 .name = "au1xpsc-i2s", 4edf87f5 Kuninori Morimoto 2013-03-21 293 }; 4edf87f5 Kuninori Morimoto 2013-03-21 294 5c658be0 Bill Pemberton 2012-12-07 295 static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) 0f83d639 Manuel Lauss 2009-10-31 296 { 226d0f22 Julia Lawall 2011-10-18 297 struct resource *iores, *dmares; 4a161d23 Manuel Lauss 2008-07-09 298 unsigned long sel; 4a161d23 Manuel Lauss 2008-07-09 @299 int ret; 0f83d639 Manuel Lauss 2009-10-31 300 struct au1xpsc_audio_data *wd; 4a161d23 Manuel Lauss 2008-07-09 301 aa4079c1 Julia Lawall 2011-12-29 302 wd = devm_kzalloc(&pdev->dev, sizeof(struct au1xpsc_audio_data), aa4079c1 Julia Lawall 2011-12-29 303 GFP_KERNEL); 0f83d639 Manuel Lauss 2009-10-31 304 if (!wd) 4a161d23 Manuel Lauss 2008-07-09 305 return -ENOMEM; 4a161d23 Manuel Lauss 2008-07-09 306 226d0f22 Julia Lawall 2011-10-18 307 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); :::::: The code at line 299 was first introduced by commit :::::: 4a161d235b68eb7234f40106560c488a1bdb3851 ALSA: ASoC: Au12x0/Au1550 PSC Audio support :::::: TO: Manuel Lauss <mano(a)roarinelk.homelinux.net> :::::: CC: Jaroslav Kysela <perex(a)perex.cz> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: spear_pcm: Use devm_snd_dmaengine_pcm_register to fix resource leak
by Axel Lin 30 Aug '15

30 Aug '15

All the callers assume devm_spear_pcm_platform_register is a devm_ API, so use devm_snd_dmaengine_pcm_register in devm_spear_pcm_platform_register. Fixes: e1771bcf99b0 ("ASoC: SPEAr: remove custom DMA alloc compat function") Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/spear/spear_pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c index a7dc3c5..e8476da 100644 --- a/sound/soc/spear/spear_pcm.c +++ b/sound/soc/spear/spear_pcm.c @@ -44,7 +44,7 @@ int devm_spear_pcm_platform_register(struct device *dev, *config = spear_dmaengine_pcm_config; config->compat_filter_fn = filter; - return snd_dmaengine_pcm_register(dev, config, + return devm_snd_dmaengine_pcm_register(dev, config, SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT); } -- 2.1.0

2 1

[alsa-devel] [PATCH] ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform
by Axel Lin 30 Aug '15

30 Aug '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/sh/dma-sh7760.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index fd11404..8fad444 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -327,13 +327,7 @@ static struct snd_soc_platform_driver sh7760_soc_platform = { static int sh7760_soc_platform_probe(struct platform_device *pdev) { - return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform); -} - -static int sh7760_soc_platform_remove(struct platform_device *pdev) -{ - snd_soc_unregister_platform(&pdev->dev); - return 0; + return devm_snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform); } static struct platform_driver sh7760_pcm_driver = { @@ -342,7 +336,6 @@ static struct platform_driver sh7760_pcm_driver = { }, .probe = sh7760_soc_platform_probe, - .remove = sh7760_soc_platform_remove, }; module_platform_driver(sh7760_pcm_driver); -- 2.1.0

3 2