October 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 00/14] ASoC: AC'97 driver cleanups
by Lars-Peter Clausen 31 Oct '14

31 Oct '14

Hi, This series does a few AC'97 driver cleanups in preparation of the conversion of the drivers to regmap. Most of the patches are quite trivial. The last two patches remove the virtual registers from the wm9712 and wm9713 drivers, which is a requirement for regmap conversion. The last patch is the only one in this series that is a bit more complex. Currently the drivers have a open-coded implementation of shared controls which is replaced by the patch with the generic one from the ASoC core. Unfortunately this changes the controls that are exposed by the driver, instead of having a "Left HP Mixer ..." and a "Right HP Mixer ..." control for each mixer input there will only be a single "HP Mixer" control. This may or may not be considered breaking the userspace interface. If it is we need to take a different approach at removing the virtual register form the driver. - Lars Lars-Peter Clausen (14): ASoC: ad1980: Remove unused header ASoC: ad1980: Cleanup printk usage ASoC: ad1980: Use table based control setup ASoC: stac9766: Cleanup printk usage ASoC: stac9766: Use table based control setup ASoC: wm9705: Cleanup printk usage ASoC: wm9705: Use table based control setup ASoC: wm9712: Cleanup printk usage ASoC: wm9712: Use table based control setup ASoC: wm9713: Cleanup printk usage ASoC: wm9713: Use table based control setup ASoC: wm9713: Move driver state struct allocation to driver probe ASoC: wm9713: Use virtual control instead of virtual register ASoC: wm9712/wm9713: Use shared controls sound/soc/blackfin/bf5xx-ad1980.c | 2 - sound/soc/codecs/ad1980.c | 23 ++---- sound/soc/codecs/ad1980.h | 26 ------ sound/soc/codecs/stac9766.c | 9 +- sound/soc/codecs/wm9705.c | 14 ++-- sound/soc/codecs/wm9712.c | 136 +++++++----------------------- sound/soc/codecs/wm9713.c | 170 +++++++++++--------------------------- 7 files changed, 98 insertions(+), 282 deletions(-) delete mode 100644 sound/soc/codecs/ad1980.h -- 1.8.0

3 22

[alsa-devel] [PATCH 0/9] ASoC: Intel: more modulartion of init and add ACPI
by Vinod Koul 31 Oct '14

31 Oct '14

The first patch is a fix of mfld-pcm driver Rest of the series is devoted to ACPI support with 7 patch moving the probe routine and sperating into common and PCI and later moving PCI code to sst-pci file so that it can be shared with ACPI Lats patch adds support for ACPI with BYT driver support. This series is dependent upon the PM and compressed series sent earlier today Subhransu S. Prusty (9): ASoC: Intel: mfld-pcm: Fix to Store device context in sst_data ASoC: Intel: move the driver wq init to a routine ASoC: Intel: move the lock and wq initialization to routine ASoC: Intel: move the driver context allocation to routine ASoC: Intel: modularize driver probe and remove ASoC: Intel: more probe modularization for sst ASoC: Intel: move PCI probe to a seprate file ASoC: Intel: add shim save context and restore routines ASoC: Intel: Add ACPI driver for SST sound/soc/intel/Kconfig | 7 + sound/soc/intel/sst-mfld-platform-pcm.c | 1 + sound/soc/intel/sst/Makefile | 8 + sound/soc/intel/sst/sst.c | 391 ++++++++++++------------------- sound/soc/intel/sst/sst.h | 7 + sound/soc/intel/sst/sst_acpi.c | 387 ++++++++++++++++++++++++++++++ sound/soc/intel/sst/sst_pci.c | 225 ++++++++++++++++++ sound/soc/intel/sst/sst_pvt.c | 2 + 8 files changed, 793 insertions(+), 235 deletions(-) create mode 100644 sound/soc/intel/sst/sst_acpi.c create mode 100644 sound/soc/intel/sst/sst_pci.c

3 24

[alsa-devel] [PATCH] ASoC: Intel: Add jack detection for Broadwell
by Jie Yang 31 Oct '14

31 Oct '14

Add jack dectection and event reporting for Broadwell. It use combo jack on BDW platform, which including Mic Jack pin and Headphone jack pin. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/broadwell.c | 49 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index 0e550f1..52cb764 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -19,6 +19,7 @@ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <sound/jack.h> #include <sound/pcm_params.h> #include "sst-dsp.h" @@ -26,8 +27,26 @@ #include "../codecs/rt286.h" +static struct snd_soc_jack broadwell_headset; +/* Headset jack detection DAPM pins */ +static struct snd_soc_jack_pin broadwell_headset_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + +static const struct snd_kcontrol_new broadwell_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), +}; + static const struct snd_soc_dapm_widget broadwell_widgets[] = { - SND_SOC_DAPM_HP("Headphones", NULL), + SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_SPK("Speaker", NULL), SND_SOC_DAPM_MIC("Mic Jack", NULL), SND_SOC_DAPM_MIC("DMIC1", NULL), @@ -42,7 +61,7 @@ static const struct snd_soc_dapm_route broadwell_rt286_map[] = { {"Speaker", NULL, "SPOL"}, /* HP jack connectors - unknown if we have jack deteck */ - {"Headphones", NULL, "HPO Pin"}, + {"Headphone Jack", NULL, "HPO Pin"}, /* other jacks */ {"MIC1", NULL, "Mic Jack"}, @@ -57,6 +76,27 @@ static const struct snd_soc_dapm_route broadwell_rt286_map[] = { {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, }; +static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + int ret = 0; + ret = snd_soc_jack_new(codec, "Headset", + SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset); + + if (ret) + return ret; + + ret = snd_soc_jack_add_pins(&broadwell_headset, + ARRAY_SIZE(broadwell_headset_pins), + broadwell_headset_pins); + if (ret) + return ret; + + rt286_mic_detect(codec, &broadwell_headset); + return 0; +} + + static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -116,7 +156,7 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) } /* always connected - check HP for jack detect */ - snd_soc_dapm_enable_pin(dapm, "Headphones"); + snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Speaker"); snd_soc_dapm_enable_pin(dapm, "Mic Jack"); snd_soc_dapm_enable_pin(dapm, "Line Jack"); @@ -196,6 +236,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .no_pcm = 1, .codec_name = "i2c-INT343A:00", .codec_dai_name = "rt286-aif1", + .init = broadwell_rt286_codec_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ignore_suspend = 1, @@ -213,6 +254,8 @@ static struct snd_soc_card broadwell_rt286 = { .owner = THIS_MODULE, .dai_link = broadwell_rt286_dais, .num_links = ARRAY_SIZE(broadwell_rt286_dais), + .controls = broadwell_controls, + .num_controls = ARRAY_SIZE(broadwell_controls), .dapm_widgets = broadwell_widgets, .num_dapm_widgets = ARRAY_SIZE(broadwell_widgets), .dapm_routes = broadwell_rt286_map, -- 1.9.1

2 1

[alsa-devel] [PATCH TINYCOMPRESS] makefile.linux: allow env to override CROSS_COMPILE and CC
by Qais Yousef 31 Oct '14

31 Oct '14

allow env variables to override them without having to modify the makefile. Signed-off-by: Qais Yousef <qais.yousef(a)imgtec.com> --- makefile.linux | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makefile.linux b/makefile.linux index 81782d0af461..c4dab6d3b7d5 100644 --- a/makefile.linux +++ b/makefile.linux @@ -9,8 +9,8 @@ LIBOBJ = ${LIBSRC:.c=.o} PLAYOBJ = ${PLAYSRC:.c=.o} RECOBJ = ${RECSRC:.c=.o} -CC = gcc -CROSS_COMPILE = +CROSS_COMPILE ?= +CC ?= ${CROSS_COMPILE}gcc CFLAGS += -std=c99 -Wall -Wextra -Wunused -DVERSION=\"${VER}\" -I./include LDFLAGS += -L. -ltinycompress @@ -20,19 +20,19 @@ all: libtinycompress cplay crec $(LIB): ${LIBOBJ} @echo " LD "$@ - @${CROSS_COMPILE}${CC} ${CFLAGS} -shared -Wl,-soname,$@.so -o $@.so ${LIBOBJ} ${LIBLDFLAGS} + @${CC} ${CFLAGS} -shared -Wl,-soname,$@.so -o $@.so ${LIBOBJ} ${LIBLDFLAGS} $(PLAYBIN): ${PLAYOBJ} ${LIB} @echo " LD "$@ - @${CROSS_COMPILE}${CC} ${CFLAGS} -o $@ ${PLAYOBJ} ${LDFLAGS} + @${CC} ${CFLAGS} -o $@ ${PLAYOBJ} ${LDFLAGS} $(RECBIN): ${RECOBJ} ${LIB} @echo " LD "$@ - @${CROSS_COMPILE}${CC} ${CFLAGS} -o $@ ${RECOBJ} ${LDFLAGS} + @${CC} ${CFLAGS} -o $@ ${RECOBJ} ${LDFLAGS} %.o: %.c @echo " CC "$< - @${CROSS_COMPILE}${CC} ${CFLAGS} -c -fPIC -o $@ $< + @${CC} ${CFLAGS} -c -fPIC -o $@ $< clean: @rm -rf ${BIN} ${PLAYOBJ} ${RECOBJ} ${LIB}.so ${LIBOBJ} -- 2.1.0

1 0

[alsa-devel] [PATCH v2 0/3] ASoC: Intel: add runtime power management support
by Vinod Koul 31 Oct '14

31 Oct '14

This series fixes the device open pm handling and adds the runtime pm support. Also we fix lock usage while changing the driver state Changes in v2: - fix style in comments - fix error prints and remove noisy debug Mythri P K (1): Audio: SST: use lock when changing SST state. Subhransu S. Prusty (1): ASoC: Intel: mrfld: Fix runtime pm calls in sst_open_pcm_stream Vinod Koul (1): ASoC: Intel: sst: add runtime power management handling sound/soc/intel/sst/sst.c | 65 +++++++++++++++++++++++++++++++ sound/soc/intel/sst/sst_drv_interface.c | 12 ++---- sound/soc/intel/sst/sst_ipc.c | 2 +- 3 files changed, 70 insertions(+), 9 deletions(-)

2 8

[alsa-devel] [PATCH 0/3] ASoC: Intel: add runtime power management support
by Vinod Koul 31 Oct '14

31 Oct '14

This series fixes the device opne pm handlinga dn adds the runtime pm support. Also we fix lock usage while changing teh driver state Mythri P K (1): Audio: SST: use lock when changing SST state. Subhransu S. Prusty (1): ASoC: Intel: mrfld: Fix runtime pm calls in sst_open_pcm_stream Vinod Koul (1): ASoC: Intel: sst: add runtime power management handling sound/soc/intel/sst/sst.c | 71 ++++++++++++++++++++++++++++++- sound/soc/intel/sst/sst_drv_interface.c | 12 ++---- sound/soc/intel/sst/sst_ipc.c | 2 +- 3 files changed, 75 insertions(+), 10 deletions(-)

2 6

[alsa-devel] [PATCH] ASoC: TLV320AIC23: make codecs selectable in Kconfig
by Max Filippov 31 Oct '14

31 Oct '14

Now that manual selection of drivers for audio subsystem components is preferred AIC23 codec must be selectable in Kconfig to make it possible. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- sound/soc/codecs/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8838838e..7dad805 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -552,11 +552,11 @@ config SND_SOC_TLV320AIC23 tristate config SND_SOC_TLV320AIC23_I2C - tristate + tristate "Texas Instruments TLV320AIC23 audio CODEC - I2C" select SND_SOC_TLV320AIC23 config SND_SOC_TLV320AIC23_SPI - tristate + tristate "Texas Instruments TLV320AIC23 audio CODEC - SPI" select SND_SOC_TLV320AIC23 config SND_SOC_TLV320AIC26 -- 1.8.1.4

2 1

[alsa-devel] [PATCH] ASoC: Intel: Fix block is enabled multiple times issue
by Jie Yang 31 Oct '14

31 Oct '14

During FW parsing and loading, block_list_prepare() may be called for each raw data block copying and this may made the hsw_block_enable() called mutiple times, which increase block->users many times. The result of this is hsw_block_disable() can't power gated the related block when trying to free the blocks during suspend, and the power gating status also confused. Here check the block user status, only calling enable() for those blocks who has no user yet. Remember that this works correctlly on current case, where there are enough SRAM memory so different module won't share a memory block. For further usage, we may need restructure the struct sst_mem_block to save the module list who is using it. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/sst-firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index 35788ad..c451398 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c @@ -149,7 +149,7 @@ static int block_list_prepare(struct sst_dsp *dsp, /* enable each block so that's it'e ready for data */ list_for_each_entry(block, block_list, module_list) { - if (block->ops && block->ops->enable) { + if (block->ops && block->ops->enable && !block->users) { ret = block->ops->enable(block); if (ret < 0) { dev_err(dsp->dev, -- 1.9.1

3 3

Re: [alsa-devel] Restore hidden register for default value
by Kailang 31 Oct '14

31 Oct '14

Hi Takashi, It's just the default value refill in initial state. It's only for ALC668(ALC3661). The patch was tested pass with issue machine in ODM site. Many Thanks. BR, Kailang > -----Original Message----- > From: Takashi Iwai [mailto:tiwai@suse.de] > Sent: Wednesday, October 22, 2014 4:00 PM > To: Kailang > Subject: Re: Restore hidden register for default value > > At Wed, 22 Oct 2014 07:56:43 +0000, > Kailang wrote: > > > > Hi Takashi, > > > > We want to post ALC668 for hidden register issue. > > > > Could I post like below array for codec initial state? > > > > WORD coefIndexDefault[][2] = {{0x1, > 0xbebe},{0x2,0xaaaa},{0x3,0x0},{0x4,0x180},{0x6,0x0}, > > > {0x7,0xf80},{0x8,0x31},{0xa,0x60},{0xb,0x0},{0xc,0x7cf7},{0xd, > 0x1080},{0xe,0x7f7f}, > > > {0xf,0xcccc},{0x10,0xddcc},{0x11,0x1},{0x13,0x0},{0x14,0x2aa0} > ,{0x17,0xA940}, > > > {0x19,0},{0x1A,0},{0x1B,0},{0x1c,0x0},{0x1d,0x0},{0x1e,0x7418} > ,{0x1f,0x804}, > > > {0x20,0x4200},{0x21,0x468},{0x22,0x8ccc},{0x23,0x250},{0x24,0x7418}, > > > > > {0x27,0x0000},{0x28,0x8ccc},{0x2a,0xff00},{0x2b,0x8000},{0xa7,0xff00}} > > ; Because codec sometimes has wrong value for hidden register after > > resume back or reboot. > > It needed to refill the default value with upper array in > initial state. > > But the hidden registers was more for 59 records. > > Could I post it with no remark? Because it just the default > value. Thanks. > > Some comments would be nice, of course, but not mandatory. > > One concern is exactly which codecs should this be applied. > There are a bunch of codecs compatible with alc668. It's > only for ALC668, and not for others (ALC668, 670, whatever). > > > Takashi > > ------Please consider the environment before printing this e-mail. >

1 0

[alsa-devel] [PATCH] usb-audio: Duplex support for Digidesign Mbox 1 and clock source selector
by Damien Zammit 31 Oct '14

31 Oct '14

Hi, Please review this patch and my previous one. This patch provides duplex support for the Digidesign Mbox 1 sound card. This also depends on my previous patch for enabling the clock source selector because the mixer is enabled in this patch. I reduced the supported sampling rates to just 48kHz because the device works better in this mode with the SPDIF external sync. Damien

1 0