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

[alsa-devel] [PATCH] ASoC: rt286: Change the DMI mapping for Dino
by Bard Liao 06 Mar '15

06 Mar '15

The board ID will be changed between revisions. So, it is better to map it by project name. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt286.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 693decb..098fc78 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1209,7 +1209,7 @@ static struct dmi_system_id dmi_dell_dino[] = { .ident = "Dell Dino", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_BOARD_NAME, "0144P8") + DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343") } }, { } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
by Eric Nelson 06 Mar '15

06 Mar '15

The only way the SGTL5000_VDDC_CHRGPMP_POWERUP bit is set is by execution on a machine with vddio and vdda below 3.1V, and the driver needn't handle the case where the design changes through a soft reboot. Even if that were desired, the register write removed by this patch would get over-written by the cached value. Patch inspired by Russell King's more colorful remarks in this patch: https://github.com/SolidRun/linux-imx6-3.14/commit/dd4bf6a Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> --- sound/soc/codecs/sgtl5000.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d4d793f..518731a 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -952,13 +952,6 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) /* Enable VDDC charge pump */ ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP; } else if (vddio >= 3100 && vdda >= 3100) { - /* - * if vddio and vddd > 3.1v, - * charge pump should be clean before set ana_pwr - */ - snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, - SGTL5000_VDDC_CHRGPMP_POWERUP, 0); - /* VDDC use VDDIO rail */ lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << -- 1.9.1

2 2

[alsa-devel] [PATCH] ASoC: Intel: Add suspend_pre and resume_post for Broadwell snd_soc_card
by Jie Yang 06 Mar '15

06 Mar '15

For broadwell machine, we need do some machine related setting before suspend and after resume, e.g. disable/enable jack detection, here adding snd_soc_card suspend_pre and resume_post for this task. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/broadwell.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index fba2ef5..af5d730 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -225,6 +225,32 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { }, }; +static int broadwell_suspend(struct snd_soc_card *card){ + struct snd_soc_codec *codec; + + list_for_each_entry(codec, &card->codec_dev_list, card_list) { + if (!strcmp(codec->component.name, "i2c-INT343A:00")) { + dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n"); + rt286_mic_detect(codec, NULL); + break; + } + } + return 0; +} + +static int broadwell_resume(struct snd_soc_card *card){ + struct snd_soc_codec *codec; + + list_for_each_entry(codec, &card->codec_dev_list, card_list) { + if (!strcmp(codec->component.name, "i2c-INT343A:00")) { + dev_dbg(codec->dev, "enabling jack detect for resume.\n"); + rt286_mic_detect(codec, &broadwell_headset); + break; + } + } + return 0; +} + /* broadwell audio machine driver for WPT + RT286S */ static struct snd_soc_card broadwell_rt286 = { .name = "broadwell-rt286", @@ -238,6 +264,8 @@ static struct snd_soc_card broadwell_rt286 = { .dapm_routes = broadwell_rt286_map, .num_dapm_routes = ARRAY_SIZE(broadwell_rt286_map), .fully_routed = true, + .suspend_pre = broadwell_suspend, + .resume_post = broadwell_resume, }; static int broadwell_audio_probe(struct platform_device *pdev) -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rt286: correct the OR to AND
by Jie Yang 06 Mar '15

06 Mar '15

Here it should be AND(&) to check the status. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/codecs/rt286.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 16723b1..49c44a7 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -397,7 +397,7 @@ int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) if (jack) { /* enable IRQ */ - if (rt286->jack->status | SND_JACK_HEADPHONE) + if (rt286->jack->status & SND_JACK_HEADPHONE) snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1"); regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2); /* Send an initial empty report */ -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency
by Arnd Bergmann 06 Mar '15

06 Mar '15

The change to enable OMAP5 support on this platform was a little too eager in adding a 'select' for a particular clock driver that might not be enabled in all configurations, which in turn leads to a build error: warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS) drivers/built-in.o: In function `palmas_clks_probe': drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config' I do not see a strong dependency here, so it's probably better to drop this select and to avoid adding more complexity here. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio") diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index e7c78b0406b5..e74d8db4619d 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -105,7 +105,6 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 select SND_OMAP_SOC_MCPDM select SND_SOC_TWL6040 select SND_SOC_DMIC - select COMMON_CLK_PALMAS if SOC_OMAP5 help Say Y if you want to add support for SoC audio on OMAP boards using ABE and twl6040 codec. This driver currently supports:

3 6

[alsa-devel] [PATCH] ALSA: ac97: ac97_patch: Simplify patch_vt1613_specific()
by Fabio Estevam 06 Mar '15

06 Mar '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> We can simplify the code by returning patch_build_controls() directly. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/pci/ac97/ac97_patch.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index eca2210..f4234ed 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3360,14 +3360,8 @@ AC97_SINGLE("DC Offset removal", 0x5a, 10, 1, 0), static int patch_vt1613_specific(struct snd_ac97 *ac97) { - int err; - - err = patch_build_controls(ac97, &snd_ac97_controls_vt1613[0], - ARRAY_SIZE(snd_ac97_controls_vt1613)); - if (err) - return err; - - return 0; + return patch_build_controls(ac97, &snd_ac97_controls_vt1613[0], + ARRAY_SIZE(snd_ac97_controls_vt1613)); }; static const struct snd_ac97_build_ops patch_vt1613_ops = { -- 1.9.1

2 1

[alsa-devel] [PATCH]Add VT1613 AC97 codec support
by Maciej S. Szmigiero 06 Mar '15

06 Mar '15

Patch to add an VT1613 AC97 codec support. This codec has additional DC offset removal control, headphone output and no video input. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 5ee2f17..5bca1a3 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -177,6 +177,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)] { 0x54584e03, 0xffffffff, "TLV320AIC27", NULL, NULL }, { 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL }, +{ 0x56494120, 0xfffffff0, "VIA1613", patch_vt1613, NULL }, { 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF { 0x56494182, 0xffffffff, "VIA1618", patch_vt1618, NULL }, diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index ceaac1c..eca2210 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3352,6 +3352,39 @@ static int patch_cm9780(struct snd_ac97 *ac97) } /* + * VIA VT1613 codec + */ +static const struct snd_kcontrol_new snd_ac97_controls_vt1613[] = { +AC97_SINGLE("DC Offset removal", 0x5a, 10, 1, 0), +}; + +static int patch_vt1613_specific(struct snd_ac97 *ac97) +{ + int err; + + err = patch_build_controls(ac97, &snd_ac97_controls_vt1613[0], + ARRAY_SIZE(snd_ac97_controls_vt1613)); + if (err) + return err; + + return 0; +}; + +static const struct snd_ac97_build_ops patch_vt1613_ops = { + .build_specific = patch_vt1613_specific +}; + +static int patch_vt1613(struct snd_ac97 *ac97) +{ + ac97->build_ops = &patch_vt1613_ops; + + ac97->flags |= AC97_HAS_NO_VIDEO; + ac97->caps |= AC97_BC_HEADPHONE; + + return 0; +} + +/* * VIA VT1616 codec */ static const struct snd_kcontrol_new snd_ac97_controls_vt1616[] = {

2 1

[alsa-devel] [GIT PULL] ASoC updates for v4.1
by Mark Brown 06 Mar '15

06 Mar '15

The following changes since commit 13a7a6ac0a11197edcd0f756a035f472b42cdf8b: Linux 4.0-rc2 (2015-03-03 09:04:59 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.1 for you to fetch changes up to d7e3281b52fea8917fb4a7a5b09df5e6a9d2850c: Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next (2015-03-05 01:07:27 +0000) ---------------------------------------------------------------- ASoC: Changes for v4.1 A selection of changes for v4.1 so far. The main things are: - Move of jack registration to the card where it belongs. - Support for DAPM routes specified by both the machine driver and DT. ---------------------------------------------------------------- Alexandre Belloni (1): ASoC: sam9g20_wm8731: drop machine_is_xxx Arnd Bergmann (2): ASoC: Samsung: add missing I2C/SPI dependencies ASoC: cirrus: tlv320aic23 needs I2C Bard Liao (8): ASoC: rt5670: Add disabled item in dmic pin enum ASoC: rt5670: Fix the speaker mono output issue ASoC: rt5670: Set RT5670_IRQ_CTRL1 non volatile ASoC: rt5670: set platform data by dmi ASoC: rt5670: Add runtime PM support ASoC: rt5670: Keep sysclk on if JD func is used ASoC: rt5670: redefine ASRC control registers 0x84 and 0x85 ASoC: rt5670: Fix the speaker mono output issue Charles Keepax (3): ASoC: wm_adsp: Improve round to next 4-byte boundary ASoC: wm8804: Split out bus drivers ASoC: wm8804: Merge CODEC probe and bus probe Fang, Yang A (2): ALSA: Add params_set_format helper ASoC: Intel: fix machine driver warnings Guenter Roeck (1): ASoC: Fix MAX98357A codec driver dependencies Jie Yang (1): ASoC: rt286: add jack detection disable with NULL jack passed Jyri Sarha (1): ASoC: omap-pcm: Allow only formats with 1, 2, and 4 byte physical size Kenneth Westfield (3): ASoC: max98357a: Add missing header files ASoC: max98357a: Remove use of DRV_NAME ASoC: max98357a: Use standard DAI names Kiran Padwal (1): ASoC: omap-hdmi-audio: Add missing error check for devm_kzalloc Kuninori Morimoto (1): ASoC: rsnd: set device data before snd_soc_register_platform/component Lars-Peter Clausen (30): ASoC: sn95031: Pass CODEC to sn95031_jack_detection() ASoC: Allow to register jacks at the card level ASoC: simple-card: Register jacks at the card level ASoC: imx-es8328: Register jacks at the card level ASoC: wm1133-ev: Register jacks at the card level ASoC: broadwell: Register jacks at the card level ASoC: byt-max98090: Register jacks at the card level ASoC: cht_bsw_rt5645: Register jacks at the card level ASoC: mfld_machine: Register jacks at the card level ASoC: ams-deltea: Register jacks at the card level ASoC: omap-abe-twl6040: Register jacks at the card level ASoC: omap-twl4030: Register jacks at the card level ASoC: rx51: Register jacks at the card level ASoC: hx4700: Register jacks at the card level ASoC: palm27x: Register jacks at the card level ASoC: ttc-dkb: Register jacks at the card level ASoC: z2: Register jacks at the card level ASoC: h1980_uda1380: Register jacks at the card level ASoC: littlemill: Register jacks at the card level ASoC: lowland: Register jacks at the card level ASoC: rx1950_uda1380: Register jacks at the card level ASoC: smartq: Register jacks at the card level ASoC: speyside: Register jacks at the card level ASoC: tobermory: Register jacks at the card level ASoC: tegra_alc5632: Register jacks at the card level ASoC: tegra_max98090: Register jacks at the card level ASoC: tegra_rt5640: Register jacks at the card level ASoC: tegra_rt5677: Register jacks at the card level ASoC: tegra_wm8903: Register jacks at the card level ASoC: Remove snd_soc_jack_new() Mark Brown (20): Merge branch 'fix/rt5677' of git://git.kernel.org/.../broonie/sound into asoc-rt5677 Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus Merge remote-tracking branch 'asoc/fix/cirrus' into asoc-linus Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/max98357a' into asoc-linus Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5677' into asoc-linus Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus Merge remote-tracking branch 'asoc/fix/sta32x' into asoc-linus Merge tag 'asoc-fix-v4.0-rc2' into asoc-linus Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'asoc/topic/gpiod' and 'asoc/topic/intel' into asoc-next Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'asoc/topic/omap' and 'asoc/topic/rt286' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/simple', 'asoc/topic/tegra' and 'asoc/topic/wm-adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next Mengdong Lin (2): ASoC: Intel: set initial runtime PM status to active for ACPI-enumerated ADSP ASoC: rt5670: add API to select ASRC clock source Nicolin Chen (3): ASoC: fsl_ssi: Fix the incorrect limitation of the bit clock rate ASoC: core: Add extra dapm properties for Device Tree ASoC: fsl-asoc-card: Add snd_soc_of_parse_audio_routing() Nikesh Oswal (1): ASoC: wm_adsp: Ensure DSP controls are always persistent Oder Chiou (3): ASoC: rt5677: Correct the routing paths of that after IF1/2 DACx Mux ASoC: rt5677: Add the chip type to distinguish the setting of the clock source ASoC: rt5677: Keep the LDO2 powered while used in the suspend mode Peter Rosin (3): ASoC: atmel_ssc_dai: Allow more rates ASoC: pcm512x: Rearrange to not repeat dacsrc_rate / dac_div ASoC: pcm512x: Allow independently overclocking PLL, DAC and DSP Peter Ujfalusi (8): ASoC: omap: Kconfig: Support for omap5-uevm analog audio ASoC: davinci-mcasp: Add support for CBS_CFM mode ASoC: omap-pcm: Correct dma mask ASoC: davinci: Select SND_EDMA_SOC when SND_DAVINCI_SOC is enabled ASoC: davinci-i2s: Convert to use edma-pcm ASoC: davinci-vcif: Convert to use edma-pcm ASoC: davinci-mcasp: Deprecate the use of davinci-pcm in favor of edma-pcm ASoC: davinci: Remove unused davinci-pcm platform driver Subhransu S. Prusty (3): ASoC: Intel: Add memcpy32_fromio as well ASoC: Intel: Remove ignore suspend support ASoC: Intel: Remove soc pm handling to allow platform driver handle it Thomas Niederprüm (2): ASoC: sta32x: fix register range in regmap. ASoC: OMAP: mcbsp: Fix CLKX and CLKR pinmux when used as inputs Tomeu Vizoso (3): ASoC: tegra: Expose Headphones pin to userspace ASoC: tegra: Add sink for the internal mic to tegra_max98090 ASoC: tegra: Add control for the Mic Jack pin Uwe Kleine-König (1): ASoC: improve usage of gpiod API Vincent Stehlé (1): ASoC: max98357a: Fix missing include Vinod Koul (12): ASoC: Intel: update MMX ID to 3 ASoC: Intel: save and restore the CSR register ASoC: Intel: reset the DSP while suspending ASoC: core: allow pcms to be registered as nonatomic ASoC: Intel: mark cht machine driver with nonatomic trigger ASoC: Intel: update MMX ID to 3 ASoC: Intel: add support for pause and resume in sst ASoC: Intel: add support for pcm stream suspend/resume ASoC: Intel: add support for platform suspend ASoC: Intel: add pm support in sst ipc driver ASoC: Intel: Move the fw download to power_control ASoC: Intel: wrap runtime_pm usage count under CONFIG_PM Vishal Thanki (2): ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of .../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + include/sound/pcm_params.h | 7 + include/sound/soc.h | 16 +- sound/soc/atmel/atmel_ssc_dai.c | 111 ++- sound/soc/atmel/atmel_ssc_dai.h | 1 + sound/soc/atmel/sam9g20_wm8731.c | 68 +- sound/soc/cirrus/Kconfig | 2 +- sound/soc/codecs/Kconfig | 20 +- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/adau1977.c | 17 +- sound/soc/codecs/cs35l32.c | 19 +- sound/soc/codecs/cs4265.c | 19 +- sound/soc/codecs/max98357a.c | 23 +- sound/soc/codecs/pcm512x.c | 178 ++++- sound/soc/codecs/rt286.c | 17 +- sound/soc/codecs/rt5670.c | 7 +- sound/soc/codecs/rt5670.h | 3 + sound/soc/codecs/rt5677.c | 76 +- sound/soc/codecs/rt5677.h | 6 + sound/soc/codecs/sn95031.c | 14 +- sound/soc/codecs/sn95031.h | 3 +- sound/soc/codecs/sta32x.c | 6 +- sound/soc/codecs/sta350.c | 30 +- sound/soc/codecs/tas2552.c | 13 +- sound/soc/codecs/wm8804-i2c.c | 64 ++ sound/soc/codecs/wm8804-spi.c | 56 ++ sound/soc/codecs/wm8804.c | 281 ++----- sound/soc/codecs/wm8804.h | 7 + sound/soc/codecs/wm_adsp.c | 13 +- sound/soc/davinci/Kconfig | 18 +- sound/soc/davinci/Makefile | 2 - sound/soc/davinci/davinci-i2s.c | 67 +- sound/soc/davinci/davinci-mcasp.c | 99 +-- sound/soc/davinci/davinci-pcm.c | 861 --------------------- sound/soc/davinci/davinci-pcm.h | 41 - sound/soc/davinci/davinci-vcif.c | 55 +- sound/soc/fsl/fsl-asoc-card.c | 6 + sound/soc/fsl/fsl_ssi.c | 11 +- sound/soc/fsl/imx-es8328.c | 6 +- sound/soc/fsl/wm1133-ev1.c | 12 +- sound/soc/generic/simple-card.c | 25 +- sound/soc/intel/broadwell.c | 16 +- sound/soc/intel/byt-max98090.c | 11 +- sound/soc/intel/bytcr_dpcm_rt5640.c | 4 +- sound/soc/intel/cht_bsw_rt5645.c | 16 +- sound/soc/intel/cht_bsw_rt5672.c | 9 +- sound/soc/intel/haswell.c | 4 +- sound/soc/intel/mfld_machine.c | 24 +- sound/soc/intel/sst-atom-controls.h | 2 +- sound/soc/intel/sst-mfld-platform-pcm.c | 60 ++ sound/soc/intel/sst-mfld-platform.h | 1 + sound/soc/intel/sst/sst.c | 138 +++- sound/soc/intel/sst/sst.h | 12 + sound/soc/intel/sst/sst_drv_interface.c | 65 +- sound/soc/intel/sst/sst_loader.c | 10 +- sound/soc/omap/Kconfig | 4 +- sound/soc/omap/ams-delta.c | 4 +- sound/soc/omap/omap-abe-twl6040.c | 10 +- sound/soc/omap/omap-hdmi-audio.c | 3 + sound/soc/omap/omap-mcbsp.c | 11 + sound/soc/omap/omap-pcm.c | 23 +- sound/soc/omap/omap-twl4030.c | 12 +- sound/soc/omap/rx51.c | 6 +- sound/soc/pxa/hx4700.c | 11 +- sound/soc/pxa/palm27x.c | 11 +- sound/soc/pxa/ttc-dkb.c | 15 +- sound/soc/pxa/z2.c | 10 +- sound/soc/samsung/Kconfig | 10 +- sound/soc/samsung/h1940_uda1380.c | 9 +- sound/soc/samsung/littlemill.c | 12 +- sound/soc/samsung/lowland.c | 14 +- sound/soc/samsung/rx1950_uda1380.c | 9 +- sound/soc/samsung/smartq_wm8987.c | 11 +- sound/soc/samsung/speyside.c | 14 +- sound/soc/samsung/tobermory.c | 13 +- sound/soc/sh/rcar/core.c | 4 +- sound/soc/soc-core.c | 16 +- sound/soc/soc-jack.c | 42 +- sound/soc/soc-pcm.c | 1 + sound/soc/tegra/tegra_alc5632.c | 9 +- sound/soc/tegra/tegra_max98090.c | 26 +- sound/soc/tegra/tegra_rt5640.c | 10 +- sound/soc/tegra/tegra_rt5677.c | 14 +- sound/soc/tegra/tegra_wm8903.c | 18 +- 84 files changed, 1282 insertions(+), 1727 deletions(-) create mode 100644 sound/soc/codecs/wm8804-i2c.c create mode 100644 sound/soc/codecs/wm8804-spi.c delete mode 100644 sound/soc/davinci/davinci-pcm.c delete mode 100644 sound/soc/davinci/davinci-pcm.h

2 1

[alsa-devel] [GIT PULL] ASoC updates for v4.0
by Mark Brown 06 Mar '15

06 Mar '15

The following changes since commit 13a7a6ac0a11197edcd0f756a035f472b42cdf8b: Linux 4.0-rc2 (2015-03-03 09:04:59 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.0-rc2 for you to fetch changes up to 3b8f4a70b840cff298010481d39404e9c39030d1: Merge remote-tracking branch 'asoc/fix/sta32x' into asoc-linus (2015-03-04 20:42:43 +0000) ---------------------------------------------------------------- ASoC: Fixes for v4.0 A few driver specific fixes here, none of them earth shattering in themselves, that have accumliated since the opening of the merge window. ---------------------------------------------------------------- Alexandre Belloni (1): ASoC: sam9g20_wm8731: drop machine_is_xxx Arnd Bergmann (2): ASoC: Samsung: add missing I2C/SPI dependencies ASoC: cirrus: tlv320aic23 needs I2C Bard Liao (2): ASoC: rt5670: Fix the speaker mono output issue ASoC: rt5670: Set RT5670_IRQ_CTRL1 non volatile Guenter Roeck (1): ASoC: Fix MAX98357A codec driver dependencies Kenneth Westfield (1): ASoC: max98357a: Add missing header files Kiran Padwal (1): ASoC: omap-hdmi-audio: Add missing error check for devm_kzalloc Kuninori Morimoto (1): ASoC: rsnd: set device data before snd_soc_register_platform/component Mark Brown (12): Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus Merge remote-tracking branch 'asoc/fix/cirrus' into asoc-linus Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/max98357a' into asoc-linus Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5677' into asoc-linus Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus Merge remote-tracking branch 'asoc/fix/sta32x' into asoc-linus Mengdong Lin (1): ASoC: Intel: set initial runtime PM status to active for ACPI-enumerated ADSP Nicolin Chen (1): ASoC: fsl_ssi: Fix the incorrect limitation of the bit clock rate Oder Chiou (1): ASoC: rt5677: Correct the routing paths of that after IF1/2 DACx Mux Peter Ujfalusi (1): ASoC: omap-pcm: Correct dma mask Thomas Niederprüm (2): ASoC: sta32x: fix register range in regmap. ASoC: OMAP: mcbsp: Fix CLKX and CLKR pinmux when used as inputs Vincent Stehlé (1): ASoC: max98357a: Fix missing include Vinod Koul (3): ASoC: Intel: update MMX ID to 3 ASoC: Intel: save and restore the CSR register ASoC: Intel: reset the DSP while suspending Vishal Thanki (1): ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of sound/soc/atmel/sam9g20_wm8731.c | 68 +++++++++++++++++-------------------- sound/soc/cirrus/Kconfig | 2 +- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/max98357a.c | 12 ++++++- sound/soc/codecs/rt5670.c | 7 +++- sound/soc/codecs/rt5677.c | 32 ++++++++--------- sound/soc/codecs/sta32x.c | 6 ++-- sound/soc/fsl/fsl_ssi.c | 11 +++--- sound/soc/generic/simple-card.c | 5 +++ sound/soc/intel/sst-atom-controls.h | 2 +- sound/soc/intel/sst/sst.c | 10 +++++- sound/soc/omap/omap-hdmi-audio.c | 3 ++ sound/soc/omap/omap-mcbsp.c | 11 ++++++ sound/soc/omap/omap-pcm.c | 2 +- sound/soc/samsung/Kconfig | 10 +++--- sound/soc/sh/rcar/core.c | 4 +-- 16 files changed, 112 insertions(+), 75 deletions(-)

2 1

[alsa-devel] [PATCH] ALSA: hda - Make path_has_mixer() tristate
by Ingo Brückl 06 Mar '15

06 Mar '15

... in order to distinguish whether there is no ctl or no path at all. It is used as !path_has_mixer() which means that it is true even if there is no path at all. For headphone or speaker outs without path, because they don't have a DAC assign to them, this would give a false positive result. Signed-off-by: Ingo Brückl <ib(a)wupperonline.de> diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index b680b4e..ecee349 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -1035,11 +1035,11 @@ static int hda_gen_bind_mute_put(struct snd_kcontrol *kcontrol, return snd_hda_mixer_bind_switch_put(kcontrol, ucontrol); } -/* any ctl assigned to the path with the given index? */ -static bool path_has_mixer(struct hda_codec *codec, int path_idx, int ctl_type) +/* any ctl assigned to the path (if one at all) with the given index? */ +static int path_has_mixer(struct hda_codec *codec, int path_idx, int ctl_type) { struct nid_path *path = snd_hda_get_path_from_idx(codec, path_idx); - return path && path->ctls[ctl_type]; + return path ? path->ctls[ctl_type] : -1; } static const char * const channel_name[4] = { -- 1.7.10

4 14