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

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

17 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] ASoC: rt5677: fix warnings when kernel compiled without GPIOLIB support
by Anatol Pomozov 17 Oct '14

17 Oct '14

Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- sound/soc/codecs/rt5677.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 3b63772..f6df276 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -3649,6 +3649,11 @@ static void rt5677_free_gpio(struct i2c_client *i2c) dev_err(&i2c->dev, "Failed to remove GPIOs: %d\n", ret); } #else +static void rt5677_gpio_config(struct rt5677_priv *rt5677, unsigned offset, + int value) +{ +} + static void rt5677_init_gpio(struct i2c_client *i2c) { } -- 2.1.0.rc2.206.gedb03e5

2 2

[alsa-devel] [PATCH 0/2] ASoC: Intel: Add missing build dependencies
by Ricardo Neri 17 Oct '14

17 Oct '14

The Broadwell and Haswell machines utilize the RT286 and RT5640 codecs, respectively. To communicate with the codecs, the machine utilizes the Designware I2C platform adapter. Hence, such adapter should be present in order to probe the codec drivers correctly. This short patch series fixes the missing dependency. Thanks and BR, Ricardo Ricardo Neri (2): ASoC: Intel: Add new dependency for Broadwell machine ASoC: Intel: Add new dependency for Haswell machine sound/soc/intel/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.9.1

2 3

[alsa-devel] [PATCH] ASoC: atmel_ssc_dai: Fix spelling in pr_debug.
by Peter Rosin 17 Oct '14

17 Oct '14

>From 64e0a6c2fe731eb24c81c7c56a3cacdda3d51610 Mon Sep 17 00:00:00 2001 From: Peter Rosin <peda(a)axentia.se> Date: Thu, 16 Oct 2014 17:22:05 +0200 Subject: [PATCH] ASoC: atmel_ssc_dai: Fix spelling in pr_debug. Signed-off-by: Peter Rosin <peda(a)axentia.se> --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index f403f39..775a2ba 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -267,7 +267,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, if (!ssc_p->dir_mask) { if (ssc_p->initialized) { /* Shutdown the SSC clock. */ - pr_debug("atmel_ssc_dau: Stopping clock\n"); + pr_debug("atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); free_irq(ssc_p->ssc->irq, ssc_p); -- 1.7.10.4

4 3

[alsa-devel] Some thoughts on ALSA support for VCO audio clocks
by Tim Cussins 17 Oct '14

17 Oct '14

Hi all, I thought I'd brain-dump my thoughts on VCO support. It's not as coherent as I'd like it to be, but it's important I get it out there as the mini summit is only a few days away. Linn use-case ------------- We make network media players, and support synchronised playback where a master device sends audio to several slave devices for simultaneous rendering. On a given network there may be several masters, each coordinating several slaves. These masters might be recovering their clocks from one of many different types of external source: SPDIF or internet radio, for example. By keeping the audio clocks synchronised using an appropriate network protocol, we can achieve simultaneous playback across many devices, which enable simultaneous start, and no drift. Network devices can be dynamically configured as master/slave, and therefore must dynamically subscribe/unsubscribe to/from any master as appropriate. Incidentally, we use our own UPnP services to make this happen. Our hardware ------------ Our SoC of choice has an event timer, a notion of an event clock. This allows signals from peripherals to be timestamped in hardware, and for signals from the event module to be raised at peripherals using compare registers. Think of it as a capture/compare module with multiple capture channels and compare registers for almost all peripherals. To get synchronised start, We intend to drive the event timer using a VCO, and trigger our I2S module (with preloaded output fifo) using the appropriate compare register in the event module. Handwaving ---------- There are two use cases that are of interest here: VCO and PTP. The pure VCO model implies that the PCM driver *owns* the VCO. The PTP model implies that the PCM is a slave to a PTP clock, governed elsewhere. As our SoC event clock is system-wide, other drivers/processes may be timestamping using this clock. Therefore this proposal seeks to address the PTP model (PCM doesn't own VCO). The Linux kernel provides a kernel framework for supporting VCO-based clocks, the PCH framework, which exposes such clocks to userspace with a common API. This API isn't PTP-specific however, and would allow for other synchronisation mechanisms. The kernel refers to these as 'ptp' clocks, so I'll use PTP from here on in: This doesn't imply IEEE-1588 however. Takashi added support for the selection of timestamp type at runtime. These types currently correspond to posix clock types, and don't allow for other time-sources such as PTP clocks. I imagine that PCM modules should be able to advertise their supported timestamp types: In our case, our driver would additionally advertise some unique PTP clock. It would be ideal if we could uniquely identify a PTP clock using a posix clockid_t, the value of which could be meaningfully shared amongst userspace processes, for example over D-Bus. However it's not immediately clear that you can establish such a value. So for now let's design as though we can't. Unique clocks from userspace might be represented as some tuple of a _clock protocol_ (e.g. POSIX, PTP), and a _clock id_ that represents a specific clock (e.g. CLOCK_MONOTONIC, CLOCK_REALTIME, "/dev/ptp0"). I'll admit that a path to a device node is not ideal, but you get the idea: It's a conversation starter. Maybe major/minor number would be better. Either way, kernel-side ALSA must be able to timestamp using the information. Takashi's work presumes that the clock protocol is posix: I would advocate for allowing other protocols. No surprise there :) Timestamp Clock Enumeration --------------------------- PCM devices could be probed for supported timestamps. Some enumeration mechanism, akin to snd_pcm_query_chmaps_from_hw(), could return an array of snd_pcm_clock_descriptor_t*, as in: typedef struct _snd_pcm_clock_descriptor { /* enum indicating type of chewy center */ snd_pcm_clock_protocol_t protocol; union { /* Essentially a clockid_t */ struct snd_pcm_clock_posix *posix_data; /* Perhaps "/dev/ptp0", or a major/minor number. */ struct snd_pcm_clock_ptp *ptp_data; } id; } snd_pcm_clock_descriptor_t; A revised version of Takashi's snd_pcm_sw_params_set_tstamp_type() would take a snd_pcm_clock_descriptor_t*. This allows for existing posix clock types, PTP clock types, and allows further clock types without an API (ABI?) change. Summary ------- This document focuses on using a VCO as the output clock for a PCM device, and hints at userspace API amendments that would support such a configuration. It mentions: - Allowing the timestamp type to support other clock protocols - PCM devices can be probed for a list of supported clock protocol/id tuples. - These tuples are sufficient to uniquely identify clocks from userspace. - Proposal scales to multiple PTP clocks, with no implied relationship to the system clock. It doesn't attempt to tackle configurations where the VCO is owned by the PCM hardware: In this case, I would advocate for using the PTP interface anyway, rather than adding an ALSA API for controlling the VCO. Any comments and feedback would be very welcome. Cheers, Tim

2 4

[alsa-devel] [TINYCOMPRESS][PATCH] crec: Fix error with opening file using O_CREAT
by Richard Fitzgerald 17 Oct '14

17 Oct '14

From: Ammar Zahid Ali Syed <ammar.zhd(a)googlemail.com> The code was not compiling when mode was not passed to open() while using O_CREAT offset. Passed mode to the open() alongwith O_CREAT to specify the attributes of file and fix compile issue. Signed-off-by: Ammar Zahid Ali Syed <ammar.zhd(a)googlemail.com> --- crec.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/crec.c b/crec.c index 31703c5..e3f189f 100644 --- a/crec.c +++ b/crec.c @@ -66,6 +66,8 @@ #include <stdbool.h> #include <getopt.h> #include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> #define __force #define __bitwise #define __user @@ -256,7 +258,7 @@ void capture_samples(char *name, unsigned int card, unsigned int device, if (verbose) printf("%s: entry, reading %u bytes\n", __func__, length); - file = open(name, O_RDWR | O_CREAT); + file = open(name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (file == -1) { fprintf(stderr, "Unable to open file '%s'\n", name); exit(EXIT_FAILURE); -- 1.7.2.5

2 1

[alsa-devel] [PATCH] ASoC: Intel: mrfld: fix semicolon.cocci warnings
by Fengguang Wu 17 Oct '14

17 Oct '14

sound/soc/intel/sst-atom-controls.c:249:2-3: Unneeded semicolon sound/soc/intel/sst-atom-controls.c:289:2-3: Unneeded semicolon Removes unneeded semicolon. Generated by: scripts/coccinelle/misc/semicolon.cocci CC: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- sst-atom-controls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/soc/intel/sst-atom-controls.c +++ b/sound/soc/intel/sst-atom-controls.c @@ -246,7 +246,7 @@ static int sst_gain_get(struct snd_kcont dev_err(component->dev, "Invalid Input- gain type:%d\n", mc->type); return -EINVAL; - }; + } return 0; } @@ -286,7 +286,7 @@ static int sst_gain_put(struct snd_kcont dev_err(cmpnt->dev, "Invalid Input- gain type:%d\n", mc->type); return -EINVAL; - }; + } if (mc->w && mc->w->power) ret = sst_send_gain_cmd(drv, gv, mc->task_id,

3 2

[alsa-devel] [PATCH v2 0/3] ALSA: seq: bind seq driver automatically
by Takashi Iwai 17 Oct '14

17 Oct '14

Hi, this is a patchset split from the previous patch for fixing the autoloading issue of sequencer stuff. The end result is the exactly same changes. [PATCH 1/3] ALSA: seq: Use atomic ops for autoload refcount [PATCH 2/3] ALSA: seq: bind seq driver automatically [PATCH 3/3] Subject: ALSA: seq: Remove autoload locks in driver Takashi

1 3

[alsa-devel] [PATCH v2 1/2] ALSA: au88x0: added reference of vortex_t
by Sudip Mukherjee 17 Oct '14

17 Oct '14

added a pointer of the vortex in the following functions : vortex_alsafmt_aspfmt vortex_Vort3D_InitializeSource a3dsrc_ZeroStateA3D so that we can have a reference of the vortex in the function. this reference of the vortex will actually be used in a later patch to convert the pr_* macro to dev_*. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- no change from v1. sound/pci/au88x0/au88x0.h | 4 ++-- sound/pci/au88x0/au88x0_a3d.c | 6 +++--- sound/pci/au88x0/au88x0_core.c | 5 +++-- sound/pci/au88x0/au88x0_pcm.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index 466a5c8..3a8fefe 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h @@ -243,7 +243,7 @@ static int vortex_core_init(vortex_t * card); static int vortex_core_shutdown(vortex_t * card); static void vortex_enable_int(vortex_t * card); static irqreturn_t vortex_interrupt(int irq, void *dev_id); -static int vortex_alsafmt_aspfmt(int alsafmt); +static int vortex_alsafmt_aspfmt(int alsafmt, vortex_t *v); /* Connection stuff. */ static void vortex_connect_default(vortex_t * vortex, int en); @@ -278,7 +278,7 @@ static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix, static void vortex_Vort3D_enable(vortex_t * v); static void vortex_Vort3D_disable(vortex_t * v); static void vortex_Vort3D_connect(vortex_t * vortex, int en); -static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en); +static void vortex_Vort3D_InitializeSource(a3dsrc_t *a, int en, vortex_t *v); #endif /* Driver stuff. */ diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index 30f760e..bc9cda3a 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c @@ -484,7 +484,7 @@ static void a3dsrc_ZeroState(a3dsrc_t * a) } /* Reset entire A3D engine */ -static void a3dsrc_ZeroStateA3D(a3dsrc_t * a) +static void a3dsrc_ZeroStateA3D(a3dsrc_t *a, vortex_t *v) { int i, var, var2; @@ -601,7 +601,7 @@ static void vortex_Vort3D_enable(vortex_t *v) Vort3DRend_Initialize(v, XT_HEADPHONE); for (i = 0; i < NR_A3D; i++) { vortex_A3dSourceHw_Initialize(v, i % 4, i >> 2); - a3dsrc_ZeroStateA3D(&(v->a3d[0])); + a3dsrc_ZeroStateA3D(&v->a3d[0], v); } /* Register ALSA controls */ vortex_a3d_register_controls(v); @@ -676,7 +676,7 @@ static void vortex_Vort3D_connect(vortex_t * v, int en) } /* Initialize one single A3D source. */ -static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en) +static void vortex_Vort3D_InitializeSource(a3dsrc_t *a, int en, vortex_t *v) { if (a->vortex == NULL) { pr_warn diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 72e8128..00e2096 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c @@ -2177,7 +2177,8 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, return -EBUSY; } /* (De)Initialize A3D hardware source. */ - vortex_Vort3D_InitializeSource(&(vortex->a3d[a3d]), en); + vortex_Vort3D_InitializeSource(&vortex->a3d[a3d], en, + vortex); } /* Make SPDIF out exclusive to "spdif" device when in use. */ if ((stream->type == VORTEX_PCM_SPDIF) && (en)) { @@ -2765,7 +2766,7 @@ static int vortex_core_shutdown(vortex_t * vortex) /* Alsa support. */ -static int vortex_alsafmt_aspfmt(int alsafmt) +static int vortex_alsafmt_aspfmt(int alsafmt, vortex_t *v) { int fmt; diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index 5adc6b9..bdde182 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c @@ -332,7 +332,7 @@ static int snd_vortex_pcm_prepare(struct snd_pcm_substream *substream) dir = 1; else dir = 0; - fmt = vortex_alsafmt_aspfmt(runtime->format); + fmt = vortex_alsafmt_aspfmt(runtime->format, chip); spin_lock_irq(&chip->lock); if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) { vortex_adbdma_setmode(chip, dma, 1, dir, fmt, -- 1.8.1.2

4 12

[alsa-devel] [PATCH v2 0/2] Disable the ThinkPad HW mute/level control when possible
by Andy Lutomirski 16 Oct '14

16 Oct '14

This series is being resurrected after several years, and it's quite different from before, so I'm restarting the version number at 1 :) ThinkPad volume and mute controls are a mess. For whatever reason, ThinkPads have mute buttons that send KEY_MUTE *and* control an invisible-to-ALSA mute switch. Some of them have volume controls that interact with this switch as well. This is a perennial source of problems. On most ThinkPads, if you press mute and then unmute using GUI controls, you have no sound, because userspace and ALSA state gets out of sync with the hardware switch. There's a separate "sound card" that exposes the hardware switch, but userspace code generally doesn't understand that. There are already a few _OSI(Linux) overrides to turn all the hardware buttons into regular buttons. Rather than quirking ACPI everywhere, just teach thinkpad-acpi to program the buttons for full software control and to disable hardware controls. That allows us to remove the ACPI quirks and have normal mute controls. This approach should be much simpler than adding even more kludgey ALSA integration for questionable gain. I haven't tested on my X220 (which has a mute light in addition to a mute button), since that laptop's SATA controller died last week. It should work, though, and if someone else could test this on a ThinkPad with a mute light, that would be great. The only issue I know of with this version is that unloading and reloading the module to change the software_mute setting doesn't work quite right. I can fix that if it matters. Changes from v1: - Simplified the code a bit. - Improved suspend/hibernate behavior. Andy Lutomirski (2): thinkpad-acpi: Try to use full software mute control acpi: Remove _OSI(Linux) for ThinkPads drivers/acpi/blacklist.c | 54 -------------------- drivers/platform/x86/thinkpad_acpi.c | 98 ++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 64 deletions(-) -- 1.9.3

1 2