April 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
by Takashi Sakamoto 14 Apr '17

14 Apr '17

An abstraction of asynchronous transaction for transmission of MIDI messages was introduced in Linux v4.4. Each driver can utilize this abstraction to transfer MIDI messages via fixed-length payload of transaction to a certain unit address. Filling payload of the transaction is done by callback. In this callback, each driver can return negative error code, however current implementation assigns the return value to unsigned variable. This commit changes type of the variable to fix the bug. Reported-by: Julia Lawall <Julia.Lawall(a)lip6.fr> Cc: <stable(a)vger.kernel.org> # 4.4+ Fixes: 585d7cba5e1f ("ALSA: firewire-lib: add helper functions for asynchronous transactions to transfer MIDI messages") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h index f676931..c3768cd 100644 --- a/sound/firewire/lib.h +++ b/sound/firewire/lib.h @@ -45,7 +45,7 @@ struct snd_fw_async_midi_port { struct snd_rawmidi_substream *substream; snd_fw_async_midi_port_fill fill; - unsigned int consume_bytes; + int consume_bytes; }; int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port, -- 2.9.3

2 1

Re: [alsa-devel] [PATCH 2/8] firewire-tascam: remove callback function from async midi port (fwd)
by Julia Lawall 14 Apr '17

14 Apr '17

Hello, I haven't checked on the type, but it may be worth looking into (line 201). julia ---------- Forwarded message ---------- Date: Thu, 13 Apr 2017 18:20:17 +0800 From: kbuild test robot <fengguang.wu(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: Re: [alsa-devel] [PATCH 2/8] firewire-tascam: remove callback function from async midi port In-Reply-To: <20170413051527.21396-3-o-takashi(a)sakamocchi.jp> Hi Takashi, [auto build test WARNING on sound/for-next] [also build test WARNING on v4.11-rc6 next-20170413] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Takashi-Sakamoto/ALSA-firewire-lib… base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next :::::: branch date: 3 hours ago :::::: commit date: 3 hours ago >> sound/firewire/tascam/tascam-transaction.c:201:5-24: WARNING: Unsigned expression compared with zero: port -> consume_bytes <= 0 git remote add linux-review https://github.com/0day-ci/linux git remote update linux-review git checkout b866eaa9a02893e6383eb5177c11078a16af4e80 vim +201 sound/firewire/tascam/tascam-transaction.c 741f7c77a Takashi Sakamoto 2017-04-13 185 /* Nothing to do. */ 741f7c77a Takashi Sakamoto 2017-04-13 186 if (substream == NULL || snd_rawmidi_transmit_empty(substream)) 741f7c77a Takashi Sakamoto 2017-04-13 187 return; 741f7c77a Takashi Sakamoto 2017-04-13 188 741f7c77a Takashi Sakamoto 2017-04-13 189 /* Do it in next chance. */ 741f7c77a Takashi Sakamoto 2017-04-13 190 if (ktime_after(port->next_ktime, ktime_get())) { 741f7c77a Takashi Sakamoto 2017-04-13 191 schedule_work(&port->work); 741f7c77a Takashi Sakamoto 2017-04-13 192 return; 741f7c77a Takashi Sakamoto 2017-04-13 193 } 741f7c77a Takashi Sakamoto 2017-04-13 194 741f7c77a Takashi Sakamoto 2017-04-13 195 /* 741f7c77a Takashi Sakamoto 2017-04-13 196 * Fill the buffer. The callee must use snd_rawmidi_transmit_peek(). 741f7c77a Takashi Sakamoto 2017-04-13 197 * Later, snd_rawmidi_transmit_ack() is called. 741f7c77a Takashi Sakamoto 2017-04-13 198 */ 741f7c77a Takashi Sakamoto 2017-04-13 199 memset(port->buf, 0, port->len); b866eaa9a Takashi Sakamoto 2017-04-13 200 port->consume_bytes = fill_message(substream, port->buf); 741f7c77a Takashi Sakamoto 2017-04-13 @201 if (port->consume_bytes <= 0) { 741f7c77a Takashi Sakamoto 2017-04-13 202 /* Do it in next chance, immediately. */ 741f7c77a Takashi Sakamoto 2017-04-13 203 if (port->consume_bytes == 0) { 741f7c77a Takashi Sakamoto 2017-04-13 204 port->next_ktime = 0; 741f7c77a Takashi Sakamoto 2017-04-13 205 schedule_work(&port->work); 741f7c77a Takashi Sakamoto 2017-04-13 206 } else { 741f7c77a Takashi Sakamoto 2017-04-13 207 /* Fatal error. */ 741f7c77a Takashi Sakamoto 2017-04-13 208 port->error = true; 741f7c77a Takashi Sakamoto 2017-04-13 209 } :::::: The code at line 201 was first introduced by commit :::::: 741f7c77a1a15d04ebafcce4e079cfe1cfb612ff firewire-lib/firewire-tascam: localize async midi port :::::: TO: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> :::::: CC: 0day robot <fengguang.wu(a)intel.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [PATCH v4 0/2] Add STM32 SAI support
by olivier moysan 13 Apr '17

13 Apr '17

This patch-set handles the Serial Audio Interface (SAI) IP on STM32 platforms. The SAI IP is composed of two Sub-block A and B. (see the figure below) Each sub-block makes use of individual and shared resources. Shared resources: - Reset line. Reset common and sub-block registers. - Bus interface clocks. This clock is not exposed in device as it it managed by clock driver, according to kernel clocks gating. - Common register. SAI IP exhibits a common configuration register to manage synchronization modes. NB: These modes are not yet implemented in this version of the SAI driver. - Interrupt. Sub-blocks have their own interrupt status registers but they share the same interrupt line. Individual resources: - Register set - DMA request line. - Communication interface. Each sub-block has its own GPIOs and associated bus lines. - Kernel clock. Each sub-block has its own dedicated clock for its communication interface. To reflect this architecture Sub-block A and B are handled by 2 child devices. Sub-block A and B devices can be configured independently either as transmitter or receiver. A PCM device is associated to each sub-block. A sub-block has to select the appropriated parent clock at runtime, depending on the audio stream sampling rate to be played or captured. Two parent clocks must be provided to support sampling rates multiples of 8 kHz or 11.025kHz. Interface clock +--------------------------------+ +---------------> | SAI IP | Reset | +-----------------+ | +---------------> | |common registers | | | +-----------------+ | | | | +----------------------+ | | | Sub-block A | | Kernel clock A | | | | Bus A +--------------------> | +----------------+ +----------------> | | |A registers | | | | | +----------------+ | | | +----------------------+ | | | | +----------------------+ | | | Sub-block B | | Kernel clock B | | | | Bus B +--------------------> | +----------------+ +-----------------> | | |B registers | | | | | +----------------+ | | | +----------------------+ | | | +--------------------------------+ v3 -> v4 Apply minor changes from Peter review olivier moysan (2): ASoC: stm32: add bindings for SAI ASoC: stm32: add SAI driver .../devicetree/bindings/sound/st,stm32-sai.txt | 89 +++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/stm/Kconfig | 8 + sound/soc/stm/Makefile | 6 + sound/soc/stm/stm32_sai.c | 115 +++ sound/soc/stm/stm32_sai.h | 199 +++++ sound/soc/stm/stm32_sai_sub.c | 881 +++++++++++++++++++++ 8 files changed, 1300 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.txt create mode 100644 sound/soc/stm/Kconfig create mode 100644 sound/soc/stm/Makefile create mode 100644 sound/soc/stm/stm32_sai.c create mode 100644 sound/soc/stm/stm32_sai.h create mode 100644 sound/soc/stm/stm32_sai_sub.c -- 1.9.1

2 3

[alsa-devel] [PATCH] ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
by Takashi Iwai 13 Apr '17

13 Apr '17

The snd_use_lock_sync() (thus its implementation snd_use_lock_sync_helper()) has the 5 seconds timeout to break out of the sync loop. It was introduced from the beginning, just to be "safer", in terms of avoiding the stupid bugs. However, as Ben Hutchings suggested, this timeout rather introduces a potential leak or use-after-free that was apparently fixed by the commit 2d7d54002e39 ("ALSA: seq: Fix race during FIFO resize"): for example, snd_seq_fifo_event_in() -> snd_seq_event_dup() -> copy_from_user() could block for a long time, and snd_use_lock_sync() goes timeout and still leaves the cell at releasing the pool. For fixing such a problem, we remove the break by the timeout while still keeping the warning. Suggested-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_lock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c index 3b693e924db7..12ba83367b1b 100644 --- a/sound/core/seq/seq_lock.c +++ b/sound/core/seq/seq_lock.c @@ -28,19 +28,16 @@ /* wait until all locks are released */ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line) { - int max_count = 5 * HZ; + int warn_count = 5 * HZ; if (atomic_read(lockp) < 0) { pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line); return; } while (atomic_read(lockp) > 0) { - if (max_count == 0) { - pr_warn("ALSA: seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line); - break; - } + if (warn_count-- == 0) + pr_warn("ALSA: seq_lock: waiting [%d left] in %s:%d\n", atomic_read(lockp), file, line); schedule_timeout_uninterruptible(1); - max_count--; } } -- 2.11.1

1 0

[alsa-devel] [PATCH v2 1/2] ALSA: hda: Move common haswell init to a helper
by Subhransu S. Prusty 13 Apr '17

13 Apr '17

From: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira(a)intel.com> Geminilake vendor nid is different from other Skylake variants, but rest of the initialization code is same. So a variable is added in hdmi_spec to store the platform specific vendor nid and move the initialization code to a helper function to be used by both platform specific init. Fixes: 126cfa2f5e15 ("ALSA: hda: Add Geminilake HDMI codec ID") Signed-off-by: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira(a)intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Jaikrishna Nemallapudi <jaikrishnax.nemallapudi(a)intel.com> Cc: Senthilnathan Veppur <senthilnathanx.veppur(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 37f11560186a..90e4ff87445e 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -177,6 +177,7 @@ struct hdmi_spec { bool i915_bound; /* was i915 bound in this driver? */ struct hdac_chmap chmap; + hda_nid_t vendor_nid; }; #ifdef CONFIG_SND_HDA_I915 @@ -2372,6 +2373,7 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, } #define INTEL_VENDOR_NID 0x08 +#define INTEL_GLK_VENDOR_NID 0x0B #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ @@ -2381,14 +2383,15 @@ static void intel_haswell_enable_all_pins(struct hda_codec *codec, bool update_tree) { unsigned int vendor_param; + struct hdmi_spec *spec = codec->spec; - vendor_param = snd_hda_codec_read(codec, INTEL_VENDOR_NID, 0, + vendor_param = snd_hda_codec_read(codec, spec->vendor_nid, 0, INTEL_GET_VENDOR_VERB, 0); if (vendor_param == -1 || vendor_param & INTEL_EN_ALL_PIN_CVTS) return; vendor_param |= INTEL_EN_ALL_PIN_CVTS; - vendor_param = snd_hda_codec_read(codec, INTEL_VENDOR_NID, 0, + vendor_param = snd_hda_codec_read(codec, spec->vendor_nid, 0, INTEL_SET_VENDOR_VERB, vendor_param); if (vendor_param == -1) return; @@ -2400,8 +2403,9 @@ static void intel_haswell_enable_all_pins(struct hda_codec *codec, static void intel_haswell_fixup_enable_dp12(struct hda_codec *codec) { unsigned int vendor_param; + struct hdmi_spec *spec = codec->spec; - vendor_param = snd_hda_codec_read(codec, INTEL_VENDOR_NID, 0, + vendor_param = snd_hda_codec_read(codec, spec->vendor_nid, 0, INTEL_GET_VENDOR_VERB, 0); if (vendor_param == -1 || vendor_param & INTEL_EN_DP12) return; @@ -2409,7 +2413,7 @@ static void intel_haswell_fixup_enable_dp12(struct hda_codec *codec) /* enable DP1.2 mode */ vendor_param |= INTEL_EN_DP12; snd_hdac_regmap_add_vendor_verb(&codec->core, INTEL_SET_VENDOR_VERB); - snd_hda_codec_write_cache(codec, INTEL_VENDOR_NID, 0, + snd_hda_codec_write_cache(codec, spec->vendor_nid, 0, INTEL_SET_VENDOR_VERB, vendor_param); } @@ -2503,7 +2507,7 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec, } /* Intel Haswell and onwards; audio component with eld notifier */ -static int patch_i915_hsw_hdmi(struct hda_codec *codec) +static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid) { struct hdmi_spec *spec; int err; @@ -2520,6 +2524,7 @@ static int patch_i915_hsw_hdmi(struct hda_codec *codec) spec = codec->spec; codec->dp_mst = true; spec->dyn_pcm_assign = true; + spec->vendor_nid = vendor_nid; intel_haswell_enable_all_pins(codec, true); intel_haswell_fixup_enable_dp12(codec); @@ -2548,6 +2553,16 @@ static int patch_i915_hsw_hdmi(struct hda_codec *codec) return 0; } +static int patch_i915_hsw_hdmi(struct hda_codec *codec) +{ + return intel_hsw_common_init(codec, INTEL_VENDOR_NID); +} + +static int patch_i915_glk_hdmi(struct hda_codec *codec) +{ + return intel_hsw_common_init(codec, INTEL_GLK_VENDOR_NID); +} + /* Intel Baytrail and Braswell; with eld notifier */ static int patch_i915_byt_hdmi(struct hda_codec *codec) { @@ -3800,7 +3815,7 @@ static int patch_via_hdmi(struct hda_codec *codec) HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi), HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi), HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi), -HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_hsw_hdmi), +HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi), HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi), -- 1.9.1

2 3

[alsa-devel] [PATCH] topology: Allow a data section to contain multiple tuples objects
by fuweix.tang＠intel.com 13 Apr '17

13 Apr '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> It's easy to use a vendor tuples object to define a C structure instance. And a data section can include multiple vendor tuples objects. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> Signed-off-by: Fuwei Tang <fuweix.tang(a)intel.com> --- include/topology.h | 14 ++++++++++ src/topology/data.c | 78 ++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/include/topology.h b/include/topology.h index 1bebe1e..ccb3a00 100644 --- a/include/topology.h +++ b/include/topology.h @@ -214,6 +214,20 @@ extern "C" { * The keyword tuples is to define vendor specific tuples. Please refer to * section Vendor Tokens and Vendor tuples. * + * It's easy to use a vendor tuples object to define a C structure instance. + * And a data section can include multiple vendor tuples objects: + * + * <pre> + * SectionData."data element name" { + * index "1" #Index number + * tuples [ + * "id of the 1st vendor tuples section" + * "id of the 2nd vendor tuples section" + * ... + * ] + * }; + * </pre> + * * <h5>How to define an element with private data</h5> * An element can refer to a single data section or multiple data * sections. diff --git a/src/topology/data.c b/src/topology/data.c index 61882b8..bd90df9 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -408,7 +408,7 @@ static unsigned int get_tuple_size(int type) } } -/* fill a data element's private buffer with its tuples */ +/* Add a tuples object to the private buffer of its parent data element */ static int copy_tuples(struct tplg_elem *elem, struct tplg_vendor_tuples *tuples, struct tplg_vendor_tokens *tokens) { @@ -423,12 +423,9 @@ static int copy_tuples(struct tplg_elem *elem, unsigned int i, j; int token_val; - if (priv) { - SNDERR("error: %s has more data than tuples\n", elem->id); - return -EINVAL; - } + size = priv ? priv->size : 0; /* original private data size */ - size = 0; + /* scan each tuples set (one set per type) */ for (i = 0; i < tuples->num_sets ; i++) { tuple_set = tuples->set[i]; set_size = sizeof(struct snd_soc_tplg_vendor_array) @@ -448,7 +445,7 @@ static int copy_tuples(struct tplg_elem *elem, return -ENOMEM; off = priv->size; - priv->size = size; + priv->size = size; /* update private data size */ array = (struct snd_soc_tplg_vendor_array *)(priv->data + off); array->size = set_size; @@ -495,6 +492,7 @@ static int build_tuples(snd_tplg_t *tplg, struct tplg_elem *elem) struct tplg_ref *ref; struct list_head *base, *pos; struct tplg_elem *tuples, *tokens; + int err; base = &elem->ref_list; list_for_each(pos, base) { @@ -504,23 +502,27 @@ static int build_tuples(snd_tplg_t *tplg, struct tplg_elem *elem) if (!ref->id || ref->type != SND_TPLG_TYPE_TUPLE) continue; - tplg_dbg("look up tuples %s\n", ref->id); + tplg_dbg("tuples '%s' used by data '%s'\n", ref->id, elem->id); if (!ref->elem) ref->elem = tplg_elem_lookup(&tplg->tuple_list, ref->id, SND_TPLG_TYPE_TUPLE, elem->index); tuples = ref->elem; - if (!tuples) + if (!tuples) { + SNDERR("error: cannot find tuples %s\n", ref->id); return -EINVAL; + } - tplg_dbg("found tuples %s\n", tuples->id); tokens = get_tokens(tplg, tuples); - if (!tokens) + if (!tokens) { + SNDERR("error: cannot find token for %s\n", ref->id); return -EINVAL; + } - tplg_dbg("found tokens %s\n", tokens->id); - /* a data object can only have one tuples object */ - return copy_tuples(elem, tuples->tuples, tokens->tokens); + /* a data object can have multiple tuples objects */ + err = copy_tuples(elem, tuples->tuples, tokens->tokens); + if (err < 0) + return err; } return 0; @@ -689,6 +691,47 @@ static int parse_tuple_sets(snd_config_t *cfg, return 0; } +/* Parse tuples references for a data element, either a single tuples section + * or a list of tuples sections. + */ +static int parse_tuples_refs(snd_config_t *cfg, + struct tplg_elem *elem) +{ + snd_config_type_t type; + snd_config_iterator_t i, next; + snd_config_t *n; + const char *val = NULL; + + type = snd_config_get_type(cfg); + + /* refer to a single tuples section */ + if (type == SND_CONFIG_TYPE_STRING) { + if (snd_config_get_string(cfg, &val) < 0) + return -EINVAL; + tplg_dbg("\ttuples: %s\n", val); + return tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + } + + if (type != SND_CONFIG_TYPE_COMPOUND) { + SNDERR("error: compound type expected for %s", elem->id); + return -EINVAL; + } + + /* refer to a list of data sections */ + snd_config_for_each(i, next, cfg) { + const char *val; + + n = snd_config_iterator_entry(i); + if (snd_config_get_string(n, &val) < 0) + continue; + + tplg_dbg("\ttuples: %s\n", val); + tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + } + + return 0; +} + /* Parse private data references for the element, either a single data section * or a list of data sections. */ @@ -1002,10 +1045,9 @@ int tplg_parse_data(snd_tplg_t *tplg, snd_config_t *cfg, } if (strcmp(id, "tuples") == 0) { - if (snd_config_get_string(n, &val) < 0) - return -EINVAL; - tplg_dbg(" Data: %s\n", val); - tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + err = parse_tuples_refs(n, elem); + if (err < 0) + return err; continue; } -- 2.7.4

1 0

[alsa-devel] [PATCH] topology: Added supply widget support
by fuweix.tang＠intel.com 13 Apr '17

13 Apr '17

From: "Tewani, Pradeep D" <pradeep.d.tewani(a)intel.com> Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> Signed-off-by: Fuwei Tang <fuweix.tang(a)intel.com> --- include/sound/asoc.h | 3 ++- src/topology/dapm.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/sound/asoc.h b/include/sound/asoc.h index 082c542..9bef6eb 100644 --- a/include/sound/asoc.h +++ b/include/sound/asoc.h @@ -70,7 +70,8 @@ #define SND_SOC_TPLG_DAPM_DAI_IN 13 #define SND_SOC_TPLG_DAPM_DAI_OUT 14 #define SND_SOC_TPLG_DAPM_DAI_LINK 15 -#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK +#define SND_SOC_TPLG_DAPM_SUPPLY 16 +#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_SUPPLY /* Header magic number and string sizes */ #define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 13aa1c4..b7e244e 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -38,6 +38,7 @@ static const struct map_elem widget_map[] = { {"dai_in", SND_SOC_TPLG_DAPM_DAI_IN}, {"dai_out", SND_SOC_TPLG_DAPM_DAI_OUT}, {"dai_link", SND_SOC_TPLG_DAPM_DAI_LINK}, + {"supply", SND_SOC_TPLG_DAPM_SUPPLY}, }; static int lookup_widget(const char *w) -- 2.7.4

1 0

[alsa-devel] [PATCH] ALSA: line6: constify snd_kcontrol_new structures
by Bhumika Goyal 13 Apr '17

13 Apr '17

Declare snd_kcontrol_new strcutures as const as they are only passed as an argument to the function snd_ctl_new1. This argument is of type const, so snd_kcontrol_new structures having this property can be made const too. Done using Coccinelle: @r disable optional_qualifier@ identifier x; position p; @@ static struct snd_kcontrol_new x@p={...}; @ok@ identifier r.x; position p; @@ snd_ctl_new1(&x@p,...) @bad@ position p != {r.p,ok.p}; identifier r.x; @@ x@p @depends on !bad disable optional_qualifier@ identifier r.x; @@ +const struct snd_kcontrol_new x; Signed-off-by: Bhumika Goyal <bhumirks(a)gmail.com> --- sound/usb/line6/pod.c | 2 +- sound/usb/line6/toneport.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index 17aa616..358224c 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -380,7 +380,7 @@ static int snd_pod_control_monitor_put(struct snd_kcontrol *kcontrol, } /* control definition */ -static struct snd_kcontrol_new pod_control_monitor = { +static const struct snd_kcontrol_new pod_control_monitor = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Monitor Playback Volume", .index = 0, diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 8e22f43..ba7975c 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -250,7 +250,7 @@ static void toneport_start_pcm(unsigned long arg) } /* control definition */ -static struct snd_kcontrol_new toneport_control_monitor = { +static const struct snd_kcontrol_new toneport_control_monitor = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Monitor Playback Volume", .index = 0, @@ -261,7 +261,7 @@ static struct snd_kcontrol_new toneport_control_monitor = { }; /* source selector definition */ -static struct snd_kcontrol_new toneport_control_source = { +static const struct snd_kcontrol_new toneport_control_source = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "PCM Capture Source", .index = 0, -- 2.7.4

3 3

[alsa-devel] [PATCH v2] ASoC: fsl ssi doc: Move optional properties to the correct section
by Fabio Estevam 12 Apr '17

12 Apr '17

Properties 'fsl,ssi-asynchronous', 'fsl,playback-dma' and 'fsl,capture-dma' are optional, so move them under the optional section of the document. While at it mention that 'fsl,playback-dma' and 'fsl,capture-dma' only apply to Power Architecture. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Combine the two previous changes into a single patch - Fix identation .../devicetree/bindings/sound/fsl,ssi.txt | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt index 5b76be4..d415888 100644 --- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt +++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt @@ -20,24 +20,8 @@ Required properties: have. - interrupt-parent: The phandle for the interrupt controller that services interrupts for this device. -- fsl,playback-dma: Phandle to a node for the DMA channel to use for - playback of audio. This is typically dictated by SOC - design. See the notes below. -- fsl,capture-dma: Phandle to a node for the DMA channel to use for - capture (recording) of audio. This is typically dictated - by SOC design. See the notes below. - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs. This number is the maximum allowed value for SFCSR[TFWM0]. -- fsl,ssi-asynchronous: - If specified, the SSI is to be programmed in asynchronous - mode. In this mode, pins SRCK, STCK, SRFS, and STFS must - all be connected to valid signals. In synchronous mode, - SRCK and SRFS are ignored. Asynchronous mode allows - playback and capture to use different sample sizes and - sample rates. Some drivers may require that SRCK and STCK - be connected together, and SRFS and STFS be connected - together. This would still allow different sample sizes, - but not different sample rates. - clocks: "ipg" - Required clock for the SSI unit "baud" - Required clock for SSI master mode. Otherwise this clock is not used @@ -61,6 +45,24 @@ Optional properties: - fsl,mode: The operating mode for the AC97 interface only. "ac97-slave" - AC97 mode, SSI is clock slave "ac97-master" - AC97 mode, SSI is clock master +- fsl,ssi-asynchronous: + If specified, the SSI is to be programmed in asynchronous + mode. In this mode, pins SRCK, STCK, SRFS, and STFS must + all be connected to valid signals. In synchronous mode, + SRCK and SRFS are ignored. Asynchronous mode allows + playback and capture to use different sample sizes and + sample rates. Some drivers may require that SRCK and STCK + be connected together, and SRFS and STFS be connected + together. This would still allow different sample sizes, + but not different sample rates. +- fsl,playback-dma: Phandle to a node for the DMA channel to use for + playback of audio. This is typically dictated by SOC + design. See the notes below. + Only used on Power Architecture. +- fsl,capture-dma: Phandle to a node for the DMA channel to use for + capture (recording) of audio. This is typically dictated + by SOC design. See the notes below. + Only used on Power Architecture. Child 'codec' node required properties: - compatible: Compatible list, contains the name of the codec -- 2.7.4

3 2

[alsa-devel] [PATCH] ASoC: fsl_esai: Remove unneeded definition
by Fabio Estevam 12 Apr '17

12 Apr '17

There is no need for defining FSL_ESAI_RATES locally as the standard SNDRV_PCM_RATE_8000_192000 definition can be used instead. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/fsl/fsl_esai.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 38bfd46..809a069 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -19,7 +19,6 @@ #include "fsl_esai.h" #include "imx-pcm.h" -#define FSL_ESAI_RATES SNDRV_PCM_RATE_8000_192000 #define FSL_ESAI_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ @@ -647,14 +646,14 @@ static struct snd_soc_dai_driver fsl_esai_dai = { .stream_name = "CPU-Playback", .channels_min = 1, .channels_max = 12, - .rates = FSL_ESAI_RATES, + .rates = SNDRV_PCM_RATE_8000_192000, .formats = FSL_ESAI_FORMATS, }, .capture = { .stream_name = "CPU-Capture", .channels_min = 1, .channels_max = 8, - .rates = FSL_ESAI_RATES, + .rates = SNDRV_PCM_RATE_8000_192000, .formats = FSL_ESAI_FORMATS, }, .ops = &fsl_esai_dai_ops, -- 2.7.4

2 1