June 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2 1/3] ASoC: topology: Improve backwards compatibility with v4 topology files
by Guenter Roeck 06 Jun '18

06 Jun '18

From: Guenter Roeck <groeck(a)chromium.org> Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE DAI") introduced sound topology files version 5. Initially, this change made the topology code incompatible with v4 topology files. Backwards compatibility with v4 configuration files was subsequently added with commit 288b8da7e992 ("ASoC: topology: Support topology file of ABI v4"). Unfortunately, backwards compatibility was never fully implemented. First, the manifest size in (Skylake) v4 configuration files is set to 0, which causes manifest_new_ver() to bail out with error messages similar to the following. snd_soc_skl 0000:00:1f.3: ASoC: invalid manifest size snd_soc_skl 0000:00:1f.3: tplg component load failed-22 snd_soc_skl 0000:00:1f.3: Failed to init topology! snd_soc_skl 0000:00:1f.3: ASoC: failed to probe component -22 skl_n88l25_m98357a skl_n88l25_m98357a: ASoC: failed to instantiate card -22 skl_n88l25_m98357a: probe of skl_n88l25_m98357a failed with error -22 After this problem is fixed, the following error message is seen instead. snd_soc_skl 0000:00:1f.3: ASoC: old version of manifest snd_soc_skl 0000:00:1f.3: Invalid descriptor token 1093938482 snd_soc_skl 0000:00:1f.3: ASoC: failed to load widget media0_in cpr 0 snd_soc_skl 0000:00:1f.3: tPlg component load failed-22 This message is seen because backwards compatibility for loading widgets was never implemented. The lack of audio support when running the upstream kernel on recent Chromebooks has been reported in various forums, and can be traced back to this problem. Attempts to fix the problem, usually by providing v5 configuration files, were only partially successful. Let's implement backward compatibility properly to solve the problem for good. Signed-off-by: Guenter Roeck <groeck(a)chromium.org> --- Tested on Caroline (Samsung Chromebook Pro) and Chell (HP Chromebook 13 G1) running v4.17-rc6 plus this patch, with original (v4) configuration files. Also tested on several other Chromebooks with this patch on top of chromeos-4.14. v2: - Move on from RFC/RFT to real patch - Move v4 structure definitions into header file - Add support for copying private capabilities - Declare skl_dfw_v4_module_caps as __packed - Drop duplicate assignment of mconfig->pipe->state sound/soc/intel/skylake/skl-topology.c | 169 +++++++++++++++++++ sound/soc/intel/skylake/skl-tplg-interface.h | 74 ++++++++ sound/soc/soc-topology.c | 7 +- 3 files changed, 248 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 3b1dca419883..9e4c2cb88dea 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/types.h> #include <linux/firmware.h> +#include <linux/uuid.h> #include <sound/soc.h> #include <sound/soc-topology.h> #include <uapi/sound/snd_sst_tokens.h> @@ -2724,6 +2725,167 @@ static int skl_tplg_get_desc_blocks(struct device *dev, return -EINVAL; } +/* Functions to parse private data from configuration file format v4 */ + +/* + * Add pipeline from topology binary into driver pipeline list + * + * If already added we return that instance + * Otherwise we create a new instance and add into driver list + */ +static int skl_tplg_add_pipe_v4(struct device *dev, + struct skl_module_cfg *mconfig, struct skl *skl, + struct skl_dfw_v4_pipe *dfw_pipe) +{ + struct skl_pipeline *ppl; + struct skl_pipe *pipe; + struct skl_pipe_params *params; + + list_for_each_entry(ppl, &skl->ppl_list, node) { + if (ppl->pipe->ppl_id == dfw_pipe->pipe_id) { + mconfig->pipe = ppl->pipe; + return 0; + } + } + + ppl = devm_kzalloc(dev, sizeof(*ppl), GFP_KERNEL); + if (!ppl) + return -ENOMEM; + + pipe = devm_kzalloc(dev, sizeof(*pipe), GFP_KERNEL); + if (!pipe) + return -ENOMEM; + + params = devm_kzalloc(dev, sizeof(*params), GFP_KERNEL); + if (!params) + return -ENOMEM; + + pipe->ppl_id = dfw_pipe->pipe_id; + pipe->memory_pages = dfw_pipe->memory_pages; + pipe->pipe_priority = dfw_pipe->pipe_priority; + pipe->conn_type = dfw_pipe->conn_type; + pipe->state = SKL_PIPE_INVALID; + pipe->p_params = params; + INIT_LIST_HEAD(&pipe->w_list); + + ppl->pipe = pipe; + list_add(&ppl->node, &skl->ppl_list); + + mconfig->pipe = pipe; + + return 0; +} + +static void skl_fill_module_pin_info_v4(struct skl_dfw_v4_module_pin *dfw_pin, + struct skl_module_pin *m_pin, + bool is_dynamic, int max_pin) +{ + int i; + + for (i = 0; i < max_pin; i++) { + m_pin[i].id.module_id = dfw_pin[i].module_id; + m_pin[i].id.instance_id = dfw_pin[i].instance_id; + m_pin[i].in_use = false; + m_pin[i].is_dynamic = is_dynamic; + m_pin[i].pin_state = SKL_PIN_UNBIND; + } +} + +static void skl_tplg_fill_fmt_v4(struct skl_module_pin_fmt *dst_fmt, + struct skl_dfw_v4_module_fmt *src_fmt, + int pins) +{ + int i; + + for (i = 0; i < pins; i++) { + dst_fmt[i].fmt.channels = src_fmt[i].channels; + dst_fmt[i].fmt.s_freq = src_fmt[i].freq; + dst_fmt[i].fmt.bit_depth = src_fmt[i].bit_depth; + dst_fmt[i].fmt.valid_bit_depth = src_fmt[i].valid_bit_depth; + dst_fmt[i].fmt.ch_cfg = src_fmt[i].ch_cfg; + dst_fmt[i].fmt.ch_map = src_fmt[i].ch_map; + dst_fmt[i].fmt.interleaving_style = + src_fmt[i].interleaving_style; + dst_fmt[i].fmt.sample_type = src_fmt[i].sample_type; + } +} + +static int skl_tplg_get_pvt_data_v4(struct snd_soc_tplg_dapm_widget *tplg_w, + struct skl *skl, struct device *dev, + struct skl_module_cfg *mconfig) +{ + struct skl_dfw_v4_module *dfw = + (struct skl_dfw_v4_module *)tplg_w->priv.data; + int ret; + + dev_dbg(dev, "Parsing Skylake v4 widget topology data\n"); + + ret = guid_parse(dfw->uuid, (guid_t *)mconfig->guid); + if (ret) + return ret; + mconfig->id.module_id = -1; + mconfig->id.instance_id = dfw->instance_id; + mconfig->module->resources[0].cps = dfw->max_mcps; + mconfig->module->resources[0].ibs = dfw->ibs; + mconfig->module->resources[0].obs = dfw->obs; + mconfig->core_id = dfw->core_id; + mconfig->module->max_input_pins = dfw->max_in_queue; + mconfig->module->max_output_pins = dfw->max_out_queue; + mconfig->module->loadable = dfw->is_loadable; + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].inputs, dfw->in_fmt, + MAX_IN_QUEUE); + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].outputs, dfw->out_fmt, + MAX_OUT_QUEUE); + + mconfig->params_fixup = dfw->params_fixup; + mconfig->converter = dfw->converter; + mconfig->m_type = dfw->module_type; + mconfig->vbus_id = dfw->vbus_id; + mconfig->module->resources[0].is_pages = dfw->mem_pages; + + ret = skl_tplg_add_pipe_v4(dev, mconfig, skl, &dfw->pipe); + if (ret) + return ret; + + mconfig->dev_type = dfw->dev_type; + mconfig->hw_conn_type = dfw->hw_conn_type; + mconfig->time_slot = dfw->time_slot; + mconfig->formats_config.caps_size = dfw->caps.caps_size; + + mconfig->m_in_pin = devm_kzalloc(dev, + MAX_IN_QUEUE * sizeof(*mconfig->m_in_pin), + GFP_KERNEL); + if (!mconfig->m_in_pin) + return -ENOMEM; + + mconfig->m_out_pin = devm_kzalloc(dev, + MAX_OUT_QUEUE * sizeof(*mconfig->m_out_pin), + GFP_KERNEL); + if (!mconfig->m_out_pin) + return -ENOMEM; + + skl_fill_module_pin_info_v4(dfw->in_pin, mconfig->m_in_pin, + dfw->is_dynamic_in_pin, + mconfig->module->max_input_pins); + skl_fill_module_pin_info_v4(dfw->out_pin, mconfig->m_out_pin, + dfw->is_dynamic_out_pin, + mconfig->module->max_output_pins); + + if (mconfig->formats_config.caps_size) { + mconfig->formats_config.set_params = dfw->caps.set_params; + mconfig->formats_config.param_id = dfw->caps.param_id; + mconfig->formats_config.caps = + devm_kzalloc(dev, mconfig->formats_config.caps_size, + GFP_KERNEL); + if (!mconfig->formats_config.caps) + return -ENOMEM; + memcpy(mconfig->formats_config.caps, dfw->caps.caps, + dfw->caps.caps_size); + } + + return 0; +} + /* * Parse the private data for the token and corresponding value. * The private data can have multiple data blocks. So, a data block @@ -2739,6 +2901,13 @@ static int skl_tplg_get_pvt_data(struct snd_soc_tplg_dapm_widget *tplg_w, char *data; int ret; + /* + * v4 configuration files have a valid UUID at the start of + * the widget's private data. + */ + if (uuid_is_valid((char *)tplg_w->priv.data)) + return skl_tplg_get_pvt_data_v4(tplg_w, skl, dev, mconfig); + /* Read the NUM_DATA_BLOCKS descriptor */ array = (struct snd_soc_tplg_vendor_array *)tplg_w->priv.data; ret = skl_tplg_get_desc_blocks(dev, array); diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h index f8d1749a2e0c..b0e3d376594c 100644 --- a/sound/soc/intel/skylake/skl-tplg-interface.h +++ b/sound/soc/intel/skylake/skl-tplg-interface.h @@ -169,4 +169,78 @@ enum skl_tuple_type { SKL_TYPE_DATA }; +/* v4 configuration data */ + +struct skl_dfw_v4_module_pin { + u16 module_id; + u16 instance_id; +} __packed; + +struct skl_dfw_v4_module_fmt { + u32 channels; + u32 freq; + u32 bit_depth; + u32 valid_bit_depth; + u32 ch_cfg; + u32 interleaving_style; + u32 sample_type; + u32 ch_map; +} __packed; + +struct skl_dfw_v4_module_caps { + u32 set_params:2; + u32 rsvd:30; + u32 param_id; + u32 caps_size; + u32 caps[HDA_SST_CFG_MAX]; +} __packed; + +struct skl_dfw_v4_pipe { + u8 pipe_id; + u8 pipe_priority; + u16 conn_type:4; + u16 rsvd:4; + u16 memory_pages:8; +} __packed; + +struct skl_dfw_v4_module { + char uuid[SKL_UUID_STR_SZ]; + + u16 module_id; + u16 instance_id; + u32 max_mcps; + u32 mem_pages; + u32 obs; + u32 ibs; + u32 vbus_id; + + u32 max_in_queue:8; + u32 max_out_queue:8; + u32 time_slot:8; + u32 core_id:4; + u32 rsvd1:4; + + u32 module_type:8; + u32 conn_type:4; + u32 dev_type:4; + u32 hw_conn_type:4; + u32 rsvd2:12; + + u32 params_fixup:8; + u32 converter:8; + u32 input_pin_type:1; + u32 output_pin_type:1; + u32 is_dynamic_in_pin:1; + u32 is_dynamic_out_pin:1; + u32 is_loadable:1; + u32 rsvd3:11; + + struct skl_dfw_v4_pipe pipe; + struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE]; + struct skl_dfw_v4_module_fmt out_fmt[MAX_OUT_QUEUE]; + struct skl_dfw_v4_module_pin in_pin[MAX_IN_QUEUE]; + struct skl_dfw_v4_module_pin out_pin[MAX_OUT_QUEUE]; + struct skl_dfw_v4_module_caps caps; +} __packed; + #endif diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 986b8b2f90fb..d66b2e5ccd67 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2293,8 +2293,11 @@ static int manifest_new_ver(struct soc_tplg *tplg, *manifest = NULL; if (src->size != sizeof(*src_v4)) { - dev_err(tplg->dev, "ASoC: invalid manifest size\n"); - return -EINVAL; + dev_warn(tplg->dev, "ASoC: invalid manifest size %d\n", + src->size); + if (src->size) + return -EINVAL; + src->size = sizeof(*src_v4); } dev_warn(tplg->dev, "ASoC: old version of manifest\n"); -- 2.17.0.441.gb46fe60e1d-goog

6 16

[alsa-devel] [RFC PATCH] ASoC: pcm512x: enable set_sysclk callback
by Pierre-Louis Bossart 06 Jun '18

06 Jun '18

For codec master mode, the current pcm512x code relies on the clock API. Simple boards such as Hifiberry DAC+ PRO rely on 2 local oscillators to generate 44.1 or 48kHz multiples, with the clock selection being handled by the machine driver toggling GPIOS. The RaspberryPi kernel exposes a "hifiberry,dacpro-clk" clock driver which does nothing but tell the codec driver what rate is set by the machine driver [1][2] This patch suggests an alternate fallback solution to let the codec driver know what the sysclk is based on the existing .set_sysclk callback. [1] https://github.com/raspberrypi/linux/blob/rpi-4.14.y/sound/soc/bcm/hifiberr… [2] https://github.com/raspberrypi/linux/blob/rpi-4.14.y/drivers/clk/clk-hifibe… Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/pcm512x.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index f0f2d4fd3769..8d6c173c1e25 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -40,6 +40,7 @@ static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { struct pcm512x_priv { struct regmap *regmap; struct clk *sclk; + int sysclk; struct regulator_bulk_data supplies[PCM512x_NUM_SUPPLIES]; struct notifier_block supply_nb[PCM512x_NUM_SUPPLIES]; int fmt; @@ -519,6 +520,29 @@ static int pcm512x_hw_rule_rate(struct snd_pcm_hw_params *params, ARRAY_SIZE(ranges), ranges, 0); } +static int sclk_get_rate(struct pcm512x_priv *pcm512x) +{ + if (!IS_ERR(pcm512x->sclk)) + return clk_get_rate(pcm512x->sclk); + else + return pcm512x->sysclk; +} + +static int pcm512x_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_component *component = dai->component; + struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component); + + switch (freq) { + case 22579200: + case 24576000: + pcm512x->sysclk = freq; + return 0; + } + return -EINVAL; +} + static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -528,7 +552,7 @@ static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream, struct snd_pcm_hw_constraint_ratnums *constraints_no_pll; struct snd_ratnum *rats_no_pll; - if (IS_ERR(pcm512x->sclk)) { + if (IS_ERR(pcm512x->sclk) && !pcm512x->sysclk) { dev_err(dev, "Need SCLK for master mode: %ld\n", PTR_ERR(pcm512x->sclk)); return PTR_ERR(pcm512x->sclk); @@ -551,7 +575,7 @@ static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream, if (!rats_no_pll) return -ENOMEM; constraints_no_pll->rats = rats_no_pll; - rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64; + rats_no_pll->num = sclk_get_rate(pcm512x) / 64; rats_no_pll->den_min = 1; rats_no_pll->den_max = 128; rats_no_pll->den_step = 1; @@ -858,7 +882,7 @@ static int pcm512x_set_dividers(struct snd_soc_dai *dai, } if (!pcm512x->pll_out) { - sck_rate = clk_get_rate(pcm512x->sclk); + sck_rate = sclk_get_rate(pcm512x); bclk_div = params->rate_den * 64 / lrclk_div; bclk_rate = DIV_ROUND_CLOSEST(sck_rate, bclk_div); @@ -875,7 +899,7 @@ static int pcm512x_set_dividers(struct snd_soc_dai *dai, } bclk_rate = ret; - pllin_rate = clk_get_rate(pcm512x->sclk); + pllin_rate = sclk_get_rate(pcm512x); sck_rate = pcm512x_find_sck(dai, bclk_rate); if (!sck_rate) @@ -1323,6 +1347,7 @@ static const struct snd_soc_dai_ops pcm512x_dai_ops = { .startup = pcm512x_dai_startup, .hw_params = pcm512x_hw_params, .set_fmt = pcm512x_set_fmt, + .set_sysclk = pcm512x_set_sysclk, }; static struct snd_soc_dai_driver pcm512x_dai = { -- 2.14.1

2 5

[alsa-devel] unnecessary test?
by Julia Lawall 06 Jun '18

06 Jun '18

In the file sound/pci/ctxfi/cthw20k1.c, the function daio_mgr_dao_init contains: set_field(&ctl->spoctl, SPOCTL_OS << (idx*8), ((conf >> 3) & 0x1) ? 2 : 2); /* Raw */ Could the second argument just be 2? It's true that the preceeding call contains conf >> ..., but in a more useful way, so perhaps it could be useful for uniformity? thanks, julia

2 4

[alsa-devel] [PATCH 0/6] soundwire: Add multi link support
by Shreyas NC 06 Jun '18

06 Jun '18

Currently, in the SoundWire subsystem, the concept of stream is limited to a Master and one or more Slaves(Codecs). This series aims to add support for multiple Master(s) sharing the same reference clock and synchronized in the hardware. This patch series adds: - Helpers to lock bus instances part of the stream - Boiler plate conversion of code to support a list of Master runtime - Support multi link bank switch to support synchronization between multiple masters - Add Intel platform ops for pre/post bank switch Sanyog Kale (2): Documentation: soundwire: Add documentation for Multi link soundwire: Add support to lock across bus instances Shreyas NC (3): soundwire: Initialize completion for defer messages soundwire: Add support for multilink bank switch soundwire: intel: Add pre/post bank switch ops Vinod Koul (1): soundwire: Handle multiple master instances in a stream Documentation/driver-api/soundwire/stream.rst | 30 +- drivers/soundwire/bus.c | 1 + drivers/soundwire/bus.h | 4 + drivers/soundwire/intel.c | 54 ++++ drivers/soundwire/stream.c | 429 ++++++++++++++++++-------- include/linux/soundwire/sdw.h | 6 +- 6 files changed, 390 insertions(+), 134 deletions(-) -- 2.7.4

3 10

[alsa-devel] [PATCH] ASoC: ssm2602: Fix ADC powerup sequencing
by Marco Felsch 05 Jun '18

05 Jun '18

From: Philipp Zabel <p.zabel(a)pengutronix.de> According to the ssm2603 data sheet (control register sequencing), the digital core should be activated only after all necessary bits in the power register are enabled, and a delay determined by the decoupling capacitor on the VMID pin has passed. If the digital core is activated too early, or even before the ADC is powered up, audible artifacts appear at the beginning of the recorded signal. The digital core is also needed for playback, so when recording starts it may already be enabled. This means we cannot get the power sequence correct when we want to be able to start recording after playback. As a workaround put the MIC mute switch into the DAPM routes. This way we can keep the recording disabled until the MIC Bias has settled and thus get rid of audible artifacts. The delay we have to wait depends on a board specific capacitor connected to the VMID pins, so make the delay configurable in the device tree. Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> --- .../devicetree/bindings/sound/adi,ssm2602.txt | 7 +++++ sound/soc/codecs/ssm2602.c | 30 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,ssm2602.txt b/Documentation/devicetree/bindings/sound/adi,ssm2602.txt index 3b3302fe399b..9334d48c0462 100644 --- a/Documentation/devicetree/bindings/sound/adi,ssm2602.txt +++ b/Documentation/devicetree/bindings/sound/adi,ssm2602.txt @@ -11,9 +11,16 @@ Required properties: - reg : the I2C address of the device for I2C, the chip select number for SPI. +Optional properties: + + - startup-delay-us : delay between powering on and activating the digital + core, determined by the decoupling capacitor C on the + VMID pin: delay [µs] = C [µF] * 25000 / 3.5 + Example: ssm2602: ssm2602@1a { compatible = "adi,ssm2602"; reg = <0x1a>; + startup-delay-us = <34000>; /* 4.7 µF * 25000 / 3.5 -> ~34 ms */ }; diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 501a4e73b185..1b99f5d44f8d 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -26,9 +26,11 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <linux/delay.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/of.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -46,6 +48,7 @@ struct ssm2602_priv { enum ssm2602_type type; unsigned int clk_out_pwr; + u32 startup_delay_us; }; /* @@ -111,7 +114,6 @@ SOC_SINGLE_TLV("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1, SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0), SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 8, 1, 0), -SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1), }; /* Output Mixer */ @@ -121,10 +123,26 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", SSM2602_APANA, 4, 1, 0), SOC_DAPM_SINGLE("Mic Sidetone Switch", SSM2602_APANA, 5, 1, 0), }; +static const struct snd_kcontrol_new mic_ctl = + SOC_DAPM_SINGLE("Switch", SSM2602_APANA, 1, 1, 1); + /* Input mux */ static const struct snd_kcontrol_new ssm2602_input_mux_controls = SOC_DAPM_ENUM("Input Select", ssm2602_enum[0]); +static int ssm2602_mic_switch_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); + + if (ssm2602->startup_delay_us) + usleep_range(ssm2602->startup_delay_us, + ssm2602->startup_delay_us * 2); + + return 0; +} + static const struct snd_soc_dapm_widget ssm260x_dapm_widgets[] = { SND_SOC_DAPM_DAC("DAC", "HiFi Playback", SSM2602_PWR, 3, 1), SND_SOC_DAPM_ADC("ADC", "HiFi Capture", SSM2602_PWR, 2, 1), @@ -146,6 +164,9 @@ SND_SOC_DAPM_MIXER("Output Mixer", SSM2602_PWR, 4, 1, SND_SOC_DAPM_MUX("Input Mux", SND_SOC_NOPM, 0, 0, &ssm2602_input_mux_controls), SND_SOC_DAPM_MICBIAS("Mic Bias", SSM2602_PWR, 1, 1), +SND_SOC_DAPM_SWITCH_E("Mic Switch", SSM2602_APANA, 1, 1, &mic_ctl, + ssm2602_mic_switch_event, SND_SOC_DAPM_PRE_PMU), + SND_SOC_DAPM_OUTPUT("LHPOUT"), SND_SOC_DAPM_OUTPUT("RHPOUT"), SND_SOC_DAPM_INPUT("MICIN"), @@ -178,9 +199,11 @@ static const struct snd_soc_dapm_route ssm2602_routes[] = { {"LHPOUT", NULL, "Output Mixer"}, {"Input Mux", "Line", "Line Input"}, - {"Input Mux", "Mic", "Mic Bias"}, + {"Input Mux", "Mic", "Mic Switch"}, {"ADC", NULL, "Input Mux"}, + {"Mic Switch", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "MICIN"}, }; @@ -645,6 +668,9 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type, if (ssm2602 == NULL) return -ENOMEM; + of_property_read_u32(dev->of_node, "startup-delay-us", + &ssm2602->startup_delay_us); + dev_set_drvdata(dev, ssm2602); ssm2602->type = type; ssm2602->regmap = regmap; -- 2.17.0

5 12

[alsa-devel] [GIT PULL] ASoC updates for v4.18
by Mark Brown 05 Jun '18

05 Jun '18

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.18 for you to fetch changes up to aac521e880f221e6d4e67b7061022dbecace0df0: Merge branch 'asoc-4.17' into asoc-4.18 merge window (2018-06-05 15:25:41 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.18 This is a very big update, mainly due to a huge set of new drivers some of which are individually very large. We also have a lot of fixes for the topology stuff, several of the users have stepped up and fixed some the serious issues there, and continued progress on the transition away from CODEC specific drivers to generic component drivers. - Many fixes for the topology code, including fixes for the half done v4 ABI compatibility from Guenter Roeck and other ABI fixes from Kirill Marinushkin. - Lots of cleanup for Intel platforms based on Realtek CODECs from Hans de Goode. - More followups on removing legacy CODEC things and transitioning to components from Morimoto-san. - Conversion of OMAP DMA to the new, more standard SDMA-PCM driver. - A series of fixes and updates to the rather elderly Cirrus Logic SoC drivers from Alexander Sverdlin. - Qualcomm DSP support from Srinivas Kandagatla. - New drivers for Analog SSM2305, Atmel I2S controllers, Mediatek MT6351, MT6797 and MT7622, Qualcomm DSPs, Realtek RT1305, RT1306 and RT5668 and TI TSCS454 ---------------------------------------------------------------- Agrawal, Akshu (2): ASoC: AMD: Support headset button on Stoney DA7219 ASoC: AMD: make channel 1 dma as circular Akshu Agrawal (3): ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown ASoC: AMD: Fix clocks in CZ DA7219 machine driver ASoC: AMD: Add const to snd_soc_ops instances Alexander Sverdlin (5): ASoC: cirrus: i2s: Fix LRCLK configuration ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup ASoC: cirrus: i2s: Stop enabling I2S2 and I2S3 FIFOs ARM: ep93xx: i2s: Add IRQ to platform device resources ASoC: cirrus: i2s: IRQ-based stream watchdog Andy Shevchenko (1): ASoC: rt5677: Convert I2C driver to ->probe_new() Arnd Bergmann (4): ASoC: rsnd: mark PM functions __maybe_unused ASoC: omap: fix compile-test building ASoC: codecs: PCM1789: include gpio/consumer.h ASoC: mediatek: export mtk-afe symbols as needed Bard Liao (2): ASoC: rt5668: add rt5668B codec driver ASoC: rt5670: improve PLL function's stability Charles Keepax (7): ASoC: wm_adsp: Account for name prefixes when toggling preloader ASoC: compress: Only call free for components which have been opened ASoC: Remove platform code now everything is componentised ASoC: compress: Add helper functions for component open/free ASoC: core: Allow codec_conf DT lookups to match parent of_node ASoC: compress: Only assign compr->ops->copy once ASoC: compress: Fix up some trivial formatting issues Colin Ian King (10): ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping" ASoC: rt5668: fix incorrect 'and' operator ASoC: amd: fix spelling mistake: "failer" -> "failure" ASoC: Intel: bytcr_rt565: fix missing assignment to ret_val ASoC: nau8824: fix spelling mistake: "semaphone" -> "semaphore" ASoC: zx-i2s: fix spelling mistake: "timeing" -> "timing" ASoC: hisilicon: fix spelling mistake: "uknown" -> "unknown" ASoC: wm8904: fix spelling mistake: "Caputure" -> "Capture" ASoC: wm2200,wm5100: fix spelling mistake: "Coefficeints" -> "Coefficients" ASoC: intel: skylake: fix spelling mistake: "Homogenous" -> "Homogeneous" Cyrille Pitchen (2): ASoC: atmel-i2s: dt-bindings: add DT bindings for I2S controller ASoC: atmel-i2s: add driver for the new Atmel I2S controller Dan Carpenter (1): ASoC: topology: fix some tiny memory leaks Daniel Mack (6): ASoC: core: fix return code in error message ASoC: pxa-ssp: allow more flexible setup order ASoC: pxa-ssp: simplify pxa_ssp_set_dai_sysclk() ASoC: wm8782: add device-tree matching table ASoC: make wm8782 codec selectable in Kconfig ASoC: simple-card: set cpu dai clk in hw_params Danny Smith (2): ASoC: adau17x1: Handling of DSP_RUN register during fw setup ASoC: adau17x1: Do not reload dsp-fw if samplerate has not changed Divya Prakash (1): ASoC: Intel: Skylake: Reset DSP pipe in skl_pcm_hw_free Fabio Estevam (14): ASoC: sgtl5000: Fix the spelling of 'exceed' ASoC: sgtl5000: Switch to SPDX identifier ASoC: fsl_ssi: Use u32 variable type when using regmap_read() ASoC: fsl_ssi: Switch to SPDX identifier ASoC: fsl_sai: Switch to SPDX identifier ASoC: fsl_esai: Switch to SPDX identifier ASoC: fsl_spdif: Switch to SPDX identifier ASoC: sgtl5000: Make the node name generic ASoC: wm8962: Make the node name generic ASoC: wm8960: Make the node name generic ASoC: cs42xx8: Make the node name generic ASoC: fsl: Mark 'big-endian' property as optional ASoC: codec: wolfson: Make the node name generic ASoC: codec: realtek: Make the node name generic Fengguang Wu (1): ASoC: rt1305: fix platform_no_drv_owner.cocci warnings Geert Uytterhoeven (3): ASoC: Remove depends on HAS_DMA in case of platform dependency ASoC: sh: Drop SUPERH platform dependency ASoC: sh: Update menu title and platform dependency Guenter Roeck (3): ASoC: topology: Improve backwards compatibility with v4 topology files ASoC: topology: Move v4 manifest header data structures to uapi ASoC: topology: Move skl-tplg-interface.h to uapi Hans de Goede (26): ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled ASoC: rt5640: Remove is_sys_clk_from_pll, it has ordering issues ASoC: rt5640: Add devicetree-bindings for dmic, jack-detect ASoC: rt5640: Remove unused rt5640_platform_data ASoC: rt5640: Move checking of device-properties to component probe callback ASoC: rt5640: Allow specifying dmic data pins through device-properties ASoC: rt5640: Add jack-detect support ASoC: rt5640: Add button press support ASoC: Intel: bytcr_rt5640: Configure PLL1 before using it ASoC: Intel: bytcr_rt5640: Use device-property for differential mics ASoC: rt5645: Add platform-data for Lenovo Ideapad Mixx 310 ASoC: rt5645: Add platform-data for Lenovo Ideapad Mixx 320 ASoC: Intel: bytcr_rt5640: Fix compile error ASoC: Intel: bytcr_rt5640: Use device properties for setting up dmic ASoC: Intel: bytcr_rt5640: Fix Dell Venue 8 5830 Pro quirk ASoC: Intel: bytcr_rt5640: Enable jack detection ASoC: Intel: bytcr_rt5640: Change BYTCR default input to IN3 ASoC: Intel: bytcr_rt5640: Unify BYTCR input defaults ASoC: Intel: bytcr_rt5640: Add default jack-detect settings ASoC: Intel: bytcr_rt5640: Sort DMI quirk list alphabetically ASoC: Intel: bytcr_rt5640: Use dmi_first_match() for DMI quirk handling ASoC: Intel: bytcr_rt5640: Add quirks for various devices ASoC: Intel: bytcr_rt5640: Set card long_name based on quirks ASoC: Intel: cht_bsw_nau8824: Fix jack_type to include SND_JACK_MICROPHONE ASoC: Intel: bytcr_rt5640: Add quirk for the ARCHOS 80 Cesium 8" windows tablet ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks Jarkko Nikula (1): ASoC: omap: Remove OMAP_MUX dependency from Nokia N810 audio support Jean-Jacques Hiblot (3): ASoC: tas6424: Add support for the standby pin ASoC: tas6424: Add support for the mute pin ASoC: tas6424: Allow disabling auto diagnostics for faster power-on Jerome Brunet (1): ASoC: dai playback and capture active may be greater than 1 Jia-Ju Bai (8): ASoC: intel: bxt_da7219_max98357a: Replace GFP_ATOMIC with GFP_KERNEL in broxton_audio_probe ASoC: intel: bxt_rt298: Replace GFP_ATOMIC with GFP_KERNEL in broxton_audio_probe ASoC: intel: bytcr_rt5640: Replace GFP_ATOMIC with GFP_KERNEL in snd_byt_rt5640_mc_probe ASoC: intel: cht_bsw_max98090_ti: Replace GFP_ATOMIC with GFP_KERNEL in snd_cht_mc_probe ASoC: intel: cht_bsw_rt5645: Replace GFP_ATOMIC with GFP_KERNEL in snd_cht_mc_probe ASoC: intel: skl_nau88l25_max98357a: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe ASoC: intel: skl_nau88l25_ssm4567: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe ASoC: intel: skl_rt286: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe John Hsu (2): ASoC: nau8824: user configuration of key detection ASoC: nau8810: change input PGA mixer stage Jon Hunter (1): ASoC: core: Fix return code shown on error for hw_params Kai Chieh Chuang (15): ASoC: mt6797: add mt6797 platform driver ASoC: mediatek: add documents for mt6797 ASoC: add mt6351 codec driver ASoC: mt6351 switch to SPDX license tag ASoC: add mt6797-mt6351 driver and config option ASoC: mt6797: add structure define and clock control function for 6797 ASoC: mt6797: switch to SPDX license tag ASoC: mediatek: preallocate pages use platform device ASoC: mediatek: preallocate pages use platform device ASoC: mediatek: avoid using snd_soc_platform ASoC: dpcm: fix BE dai not hw_free and shutdown ASoC: dpcm: symmetry constraint on FE substream ASoC: mt6797: add PCM interface ASoC: mt6797: add Hostless DAI ASoC: mt6797-mt6351: add hostless phone call path KaiChieh Chuang (3): ASoC: mediatek: add sub dai to mtk_base_afe ASoC: mt6797: extract DAI adda in separate file ASoC: mt6797: combine DAI to register component Katsuhiro Suzuki (3): ASoC: uniphier: remove boilerplate from lisence comment ASoC: uniphier: evea: use DAPM to change source of line-in ASoC: uniphier: add digital output volume for UniPhier sound system Kirill Marinushkin (4): ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() ASoC: topology: Add missing clock gating parameter when parsing hw_configs ASoC: topology: Add definitions for mclk_direction values ASoC: topology: Modify clock gating parameter parsing to switch Kuninori Morimoto (19): ASoC: doc: replace codec to component ASoC: trace: remove snd_soc_codec ASoC: wm8350: remove snd_soc_codec ASoC: rsnd: makes rsnd_cmd_mod_get() static ASoC: rsnd: add RSND_GEN3 for R-Car Gen3 ASoC: rsnd: don't assume node full path name for HDMI probing ASoC: rsnd: Enable IPMMU v2 ASoC: rsnd: ssi: wait maximum 5ms for status check media: i2c: tda1997: replace codec to component ASoC: remove codec hw_write/control_data ASoC: remove codec reg_cache ASoC: remove .get_regmap ASoC: remove unneeded .pcm_new/free ASoC: remove Codec related code ASoC: add component_list_show() ASoC: convert platform explanation to component ASoC: soc.h: merge CONFIG_DEBUG_FS ASoC: soc-core: remove snd_soc_component_add_unlocked() ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais() Liam Girdwood (6): ASoC: topology: Check widget kcontrols before deref ASoC: core: Allow topology to override machine driver FE DAI link config. ASoC: core: Add name prefix for machines with topology rewrites ASoC: topology: Give more data to clients via callbacks ASoC: topology: Add callback for DAPM route load/unload ASoC: topology: Add support for compressed PCMs Lin Huang (1): ASoC: rockchip: cdn-dp sound output use spdif Mac Chiang (1): ASoC: Intel: kbl: Move codec sysclk config to codec_init function Marco Felsch (2): ASoC: ssm2305: Add amplifier driver ASoC: ssm2305: fix header layout Mark Brown (7): Merge branch 'asoc-4.17' into asoc-4.18 to get adau17x1 changes so further patches can be applied. ASoC: topology: Fix build errors ASoC: topology: Revert recent changes while boot errors are investigated Merge branch 'asoc-4.17' into asoc-4.18 for compress dependencies Merge branch 'asoc-4.17' into asoc-4.18 n810 dependencies Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a conflict between a fix and new development in mtk Merge branch 'asoc-4.17' into asoc-4.18 merge window Mukunda, Vijendar (6): ASoC: amd: fixed checkpatch pl warnings ASoC: amd: rename audio_substream_data variable ASoC: amd: pte offset related dma driver changes ASoC: amd: sram bank update changes ASoC: amd: memory release for rtd structure ASoC: amd: dma driver changes for bt i2s instance Nicolin Chen (3): ASoC: fsl_esai: Fix divisor calculation failure at lower ratio ASoC: fsl_ssi: Fix mode setting when changing channel number ASoC: fsl_esai: Add freq check in set_dai_sysclk() Oder Chiou (1): ASoC: rt5663: Use the set_jack() instead of the export function Pardha Saradhi K (1): ASoC: Intel: Skylake: Reset DSP Pipelines in prepare Paul Handrigan (1): ASoC: cs35l35: Add use_single_rw to regmap config Peter Rosin (6): ASoC: max9860: switch to using .probe_new ASoC: max9860: fix whitespace issues caused by mindless conversion ASoC: tfa9879: fix whitespace issues caused by mindless conversion ASoC: tfa9879: switch to using .probe_new ASoC: tfa9879: switch to SPDX license tag ASoC: max9860: switch to SPDX license tag Peter Ujfalusi (12): ASoC: omap: n810: Correct the card level dapm_route ASoC: omap: n810: Correct the cpu_dai, platform and codec name ASoC: omap: n810: HS mic is not working, add a widget for it with comment ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap: Delete the obsolete omap-pcm ASoC: omap: sdma-pcm: Fix modpost warning ASoC: omap: sdma-pcm: Correction for the include files Philipp Zabel (1): ASoC: imx-audmux: add RXFS/RXCLK defines for 6-wire connections Pierre-Louis Bossart (5): ASoC: Intel: atom: fix ACPI/PCI Kconfig ASoC: Intel: cht-bsw-rt5672: allow for topology-defined codec-dai setup MAINTAINERS: update sound/soc/intel maintainers ASoC: pcm512x: Add ACPI support ASoC: fix 0-day warnings with snd_soc_new_compress() Pradeep Tewani (1): ASoC: Intel: Skylake: Unify the fw ops for SKL and KBL Pravin Shedge (1): ASoC: zte: remove duplicate includes Rakesh Ughreja (1): ASoC: Intel: Skylake: Reset stream to link mapping Ryder Lee (7): ASoC: mediatek: use snd_soc_dai_get_drvdata() to get the private data ASoC: mediatek: simplify the control logic of MT2701 I2S ASoC: mediatek: Add MTK_STREAM_NUM to mtk-base-afe.h ASoC: mediatek: add MT7622 AFE support ASoC: mediatek: add MT7622 AFE compatible in documentation ASoC: mediatek: switch to SPDX license tag ASoC: mediatek: add the .probe() callback in mt2701_afe_pcm_dai_component Shuming Fan (2): ASoC: rt1305: Add RT1305/RT1306 amplifier driver ASoC: rt1305: fix ACPI_PTR compile error Srinivas Kandagatla (32): ASoC: msm8916-wcd-analog: use threaded context for mbhc events soc: qcom dt-bindings: Add APR bus bindings soc: qcom: Add APR bus driver ASoC: qdsp6: dt-bindings: Add q6core dt bindings ASoC: qdsp6: dt-bindings: Add q6afe dt bindings ASoC: qdsp6: dt-bindings: Add q6adm dt bindings ASoC: qdsp6: dt-bindings: Add q6asm dt bindings ASoC: qdsp6: q6common: Add qdsp6 helper functions ASoC: qdsp6: q6core: Add q6core driver soc: qcom: apr: fix invalid msg_type check ASoC: qdsp6: q6afe: Add q6afe driver ASoC: qdsp6: qdafe: Add SLIMBus port Support ASoC: qdsp6: q6afe: Add support to MI2S ports ASoC: qdsp6: q6afe: Add support to MI2S sysclks ASoC: qdsp6: q6adm: Add q6adm driver ASoC: qdsp6: q6asm: Add q6asm driver ASoC: qdsp6: q6asm: Add support to memory map and unmap ASoC: qdsp6: q6asm: Add support to audio stream apis ASoC: qdsp6: q6routing: Add q6routing driver ASoC: qdsp6: q6routing: Add support to all SLIMBus Mixers ASoC: qdsp6: q6routing: Add support to MI2S Mixers ASoC: qdsp6: q6afe: Add q6afe dai driver ASoC: qdsp6: q6asm: Add q6asm dai driver ASoC: qdsp6: dt-bindings: Add apq8096 machine bindings ASoC: qcom: apq8096: Add db820c machine driver ASoC: qdsp6: dt-bindings: Add q6afe tdm dt binding ASoC: qdsp6: qdafe: add support to tdm ports ASoC: qdsp6: q6afe-dai: use q6afe_dai_prepare() for MI2S ASoC: qdsp6: q6afe-dai: add support to tdm dais ASoC: qdsp6: q6routing: Add macros for mixers ASoC: qdsp6: q6routing: Add support to all TDM Mixers ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it Steven Eckhoff (4): ASoC: TSCS42xx: Shorten lines and other cleanup ASoC: TSCS42xx: Cleanup private data members ASoC: TSCS42xx: Add CCF support to get sysclk ASoC: TSCS454: Add Support Tero Kristo (1): ASoC: dmic: Fix clock parenting Vijendar Mukunda (3): ASoC: amd: dma config parameters changes ASoC: amd: added byte count register offset variables to rtd ASoC: amd: removed separate byte count variables for playback and capture Vinod Koul (8): ASoC: Intel: byt-max98090: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcht_es8316: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcr_rt5651: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: cht_bsw_nau8824: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_da7219_max98357a: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_max98927: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_rt5514_max98927: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Update email address for Vinod Vishal Thanki (1): ASoC: davinci-mcasp: Only disable inactive serializer Wei Yongjun (3): ASoC: amd: acp-da7219-max98357: Make symbol da7219_dai_clk static ASoC: amd: acp-da7219-max98357: Make symbol da7219_dai_clk static ASoC: fix return value check in mt6351_codec_driver_probe() Wolfram Sang (1): ASoC: atmel: simplify getting .drvdata Xie Yisheng (3): ASoC: max98088: use match_string() helper ASoC: max98095: use match_string() helper ASoC: dapm: use match_string() helper Yan Wang (1): ASoC: topology: Fix bugs of freeing soc topology kbuild test robot (1): ASoC: rt5663: rt5663_set_jack_detect() can be static oder_chiou(a)realtek.com (2): ASoC: rt5514: Add the missing register in the readable table ASoC: rt5663: Optimize the power consumption .mailmap | 3 + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 84 + .../devicetree/bindings/sound/adi,ssm2305.txt | 14 + .../devicetree/bindings/sound/atmel-i2s.txt | 47 + .../devicetree/bindings/sound/cs42xx8.txt | 2 +- .../devicetree/bindings/sound/fsl,asrc.txt | 10 +- .../devicetree/bindings/sound/fsl,esai.txt | 2 + .../devicetree/bindings/sound/fsl,spdif.txt | 2 + .../devicetree/bindings/sound/fsl-sai.txt | 8 +- .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 4 +- Documentation/devicetree/bindings/sound/mt6351.txt | 16 + .../devicetree/bindings/sound/mt6797-afe-pcm.txt | 42 + .../devicetree/bindings/sound/mt6797-mt6351.txt | 14 + .../devicetree/bindings/sound/qcom,apq8096.txt | 109 + .../devicetree/bindings/sound/qcom,q6adm.txt | 33 + .../devicetree/bindings/sound/qcom,q6afe.txt | 172 + .../devicetree/bindings/sound/qcom,q6asm.txt | 33 + .../devicetree/bindings/sound/qcom,q6core.txt | 21 + Documentation/devicetree/bindings/sound/rt274.txt | 2 +- Documentation/devicetree/bindings/sound/rt5514.txt | 2 +- Documentation/devicetree/bindings/sound/rt5616.txt | 2 +- Documentation/devicetree/bindings/sound/rt5640.txt | 35 + Documentation/devicetree/bindings/sound/rt5645.txt | 2 +- Documentation/devicetree/bindings/sound/rt5651.txt | 2 +- Documentation/devicetree/bindings/sound/rt5663.txt | 2 +- Documentation/devicetree/bindings/sound/rt5668.txt | 50 + .../devicetree/bindings/sound/sgtl5000.txt | 2 +- .../devicetree/bindings/sound/simple-card.txt | 5 + .../devicetree/bindings/sound/ti,tas6424.txt | 2 + .../devicetree/bindings/sound/tscs42xx.txt | 6 + .../devicetree/bindings/sound/tscs454.txt | 23 + Documentation/devicetree/bindings/sound/wm8510.txt | 2 +- Documentation/devicetree/bindings/sound/wm8523.txt | 2 +- Documentation/devicetree/bindings/sound/wm8524.txt | 2 +- Documentation/devicetree/bindings/sound/wm8580.txt | 2 +- Documentation/devicetree/bindings/sound/wm8711.txt | 2 +- Documentation/devicetree/bindings/sound/wm8728.txt | 2 +- Documentation/devicetree/bindings/sound/wm8731.txt | 2 +- Documentation/devicetree/bindings/sound/wm8737.txt | 2 +- Documentation/devicetree/bindings/sound/wm8741.txt | 2 +- Documentation/devicetree/bindings/sound/wm8750.txt | 2 +- Documentation/devicetree/bindings/sound/wm8753.txt | 2 +- Documentation/devicetree/bindings/sound/wm8770.txt | 2 +- Documentation/devicetree/bindings/sound/wm8776.txt | 2 +- Documentation/devicetree/bindings/sound/wm8804.txt | 2 +- Documentation/devicetree/bindings/sound/wm8903.txt | 2 +- Documentation/devicetree/bindings/sound/wm8960.txt | 2 +- Documentation/devicetree/bindings/sound/wm8962.txt | 2 +- Documentation/devicetree/bindings/sound/wm8994.txt | 2 +- Documentation/sound/soc/codec.rst | 8 +- Documentation/sound/soc/platform.rst | 30 +- MAINTAINERS | 11 +- arch/arm/mach-ep93xx/core.c | 1 + drivers/media/i2c/tda1997x.c | 25 +- drivers/soc/qcom/Kconfig | 9 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/apr.c | 378 +++ include/dt-bindings/soc/qcom,apr.h | 28 + include/dt-bindings/sound/fsl-imx-audmux.h | 7 + include/dt-bindings/sound/qcom,q6afe.h | 111 + include/dt-bindings/sound/qcom,q6asm.h | 22 + include/dt-bindings/sound/rt5640.h | 25 + include/linux/mfd/wm8350/audio.h | 3 - include/linux/mod_devicetable.h | 11 + include/linux/soc/qcom/apr.h | 128 + include/sound/omap-pcm.h | 30 - include/sound/rt5640.h | 27 - include/sound/rt5668.h | 40 + include/sound/soc-dai.h | 5 +- include/sound/soc.h | 397 +-- include/trace/events/asoc.h | 1 - include/uapi/sound/asoc.h | 86 +- .../uapi/sound}/skl-tplg-interface.h | 85 +- sound/soc/Makefile | 2 +- sound/soc/amd/acp-da7219-max98357a.c | 92 +- sound/soc/amd/acp-pcm-dma.c | 623 ++-- sound/soc/amd/acp.h | 97 +- sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-i2s.c | 765 +++++ sound/soc/atmel/atmel_ssc_dai.c | 8 +- sound/soc/bcm/Kconfig | 3 +- sound/soc/cirrus/Kconfig | 17 + sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 106 +- sound/soc/cirrus/snappercl15.c | 2 +- sound/soc/codecs/Kconfig | 33 +- sound/soc/codecs/Makefile | 10 + sound/soc/codecs/adau17x1.c | 35 +- sound/soc/codecs/adau17x1.h | 3 +- sound/soc/codecs/cs35l35.c | 1 + sound/soc/codecs/max98088.c | 13 +- sound/soc/codecs/max98095.c | 13 +- sound/soc/codecs/max9860.c | 44 +- sound/soc/codecs/max9860.h | 10 +- sound/soc/codecs/msm8916-wcd-analog.c | 9 +- sound/soc/codecs/mt6351.c | 1505 +++++++++ sound/soc/codecs/mt6351.h | 105 + sound/soc/codecs/nau8810.c | 19 +- sound/soc/codecs/nau8824.c | 13 +- sound/soc/codecs/pcm1789.c | 2 +- sound/soc/codecs/pcm512x-i2c.c | 17 +- sound/soc/codecs/rt1305.c | 1191 +++++++ sound/soc/codecs/rt1305.h | 276 ++ sound/soc/codecs/rt5514.c | 3 + sound/soc/codecs/rt5640.c | 553 +++- sound/soc/codecs/rt5640.h | 46 +- sound/soc/codecs/rt5645.c | 23 + sound/soc/codecs/rt5663.c | 55 +- sound/soc/codecs/rt5663.h | 2 - sound/soc/codecs/rt5668.c | 2639 +++++++++++++++ sound/soc/codecs/rt5668.h | 1318 ++++++++ sound/soc/codecs/rt5670.c | 2 +- sound/soc/codecs/rt5677.c | 13 +- sound/soc/codecs/sgtl5000.c | 18 +- sound/soc/codecs/sgtl5000.h | 5 +- sound/soc/codecs/ssm2305.c | 104 + sound/soc/codecs/tas6424.c | 72 +- sound/soc/codecs/tas6424.h | 4 + sound/soc/codecs/tfa9879.c | 48 +- sound/soc/codecs/tfa9879.h | 7 +- sound/soc/codecs/tscs42xx.c | 203 +- sound/soc/codecs/tscs42xx.h | 2 +- sound/soc/codecs/tscs454.c | 3497 ++++++++++++++++++++ sound/soc/codecs/tscs454.h | 2323 +++++++++++++ sound/soc/codecs/wm2200.c | 4 +- sound/soc/codecs/wm5100.c | 8 +- sound/soc/codecs/wm8782.c | 9 + sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm_adsp.c | 8 +- sound/soc/davinci/Kconfig | 2 +- sound/soc/davinci/davinci-mcasp.c | 10 +- sound/soc/fsl/fsl_esai.c | 27 +- sound/soc/fsl/fsl_esai.h | 5 +- sound/soc/fsl/fsl_sai.c | 16 +- sound/soc/fsl/fsl_sai.h | 5 +- sound/soc/fsl/fsl_spdif.c | 24 +- sound/soc/fsl/fsl_spdif.h | 5 +- sound/soc/fsl/fsl_ssi.c | 74 +- sound/soc/fsl/fsl_ssi.h | 6 +- sound/soc/fsl/fsl_ssi_dbg.c | 18 +- sound/soc/generic/simple-card.c | 21 + sound/soc/hisilicon/hi6210-i2s.c | 2 +- sound/soc/intel/Kconfig | 24 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/byt-max98090.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 568 +++- sound/soc/intel/boards/bytcr_rt5651.c | 18 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 19 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 5 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- sound/soc/intel/skylake/skl-debug.c | 6 +- sound/soc/intel/skylake/skl-messages.c | 4 +- sound/soc/intel/skylake/skl-pcm.c | 36 +- sound/soc/intel/skylake/skl-sst-dsp.h | 3 - sound/soc/intel/skylake/skl-sst.c | 34 +- sound/soc/intel/skylake/skl-topology.c | 171 +- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl.c | 7 + sound/soc/kirkwood/Kconfig | 1 - sound/soc/mediatek/Kconfig | 20 + sound/soc/mediatek/Makefile | 2 + sound/soc/mediatek/common/Makefile | 14 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 30 +- sound/soc/mediatek/common/mtk-afe-fe-dai.h | 10 +- .../soc/mediatek/common/mtk-afe-platform-driver.c | 103 +- .../soc/mediatek/common/mtk-afe-platform-driver.h | 22 +- sound/soc/mediatek/common/mtk-base-afe.h | 30 +- sound/soc/mediatek/mt2701/Makefile | 14 +- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 66 +- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 23 +- sound/soc/mediatek/mt2701/mt2701-afe-common.h | 38 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 349 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +- sound/soc/mediatek/mt2701/mt2701-reg.h | 11 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 10 +- sound/soc/mediatek/mt6797/Makefile | 14 + sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 123 + sound/soc/mediatek/mt6797/mt6797-afe-clk.h | 17 + sound/soc/mediatek/mt6797/mt6797-afe-common.h | 58 + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 914 +++++ sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 396 +++ sound/soc/mediatek/mt6797/mt6797-dai-hostless.c | 112 + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 312 ++ sound/soc/mediatek/mt6797/mt6797-interconnection.h | 33 + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 223 ++ sound/soc/mediatek/mt6797/mt6797-reg.h | 1015 ++++++ sound/soc/mediatek/mt8173/mt8173-afe-common.h | 10 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 38 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- sound/soc/omap/Kconfig | 28 +- sound/soc/omap/Makefile | 4 +- sound/soc/omap/n810.c | 21 +- sound/soc/omap/omap-dmic.c | 18 +- sound/soc/omap/omap-hdmi-audio.c | 5 +- sound/soc/omap/omap-mcbsp.c | 4 +- sound/soc/omap/omap-mcpdm.c | 4 +- sound/soc/omap/omap-pcm.c | 262 -- sound/soc/omap/sdma-pcm.c | 74 + sound/soc/omap/sdma-pcm.h | 21 + sound/soc/pxa/Kconfig | 1 - sound/soc/pxa/pxa-ssp.c | 88 +- sound/soc/qcom/Kconfig | 57 +- sound/soc/qcom/Makefile | 5 + sound/soc/qcom/apq8096.c | 255 ++ sound/soc/qcom/qdsp6/Makefile | 8 + sound/soc/qcom/qdsp6/q6adm.c | 646 ++++ sound/soc/qcom/qdsp6/q6adm.h | 27 + sound/soc/qcom/qdsp6/q6afe-dai.c | 1303 ++++++++ sound/soc/qcom/qdsp6/q6afe.c | 1495 +++++++++ sound/soc/qcom/qdsp6/q6afe.h | 211 ++ sound/soc/qcom/qdsp6/q6asm-dai.c | 624 ++++ sound/soc/qcom/qdsp6/q6asm.c | 1399 ++++++++ sound/soc/qcom/qdsp6/q6asm.h | 69 + sound/soc/qcom/qdsp6/q6core.c | 380 +++ sound/soc/qcom/qdsp6/q6core.h | 15 + sound/soc/qcom/qdsp6/q6dsp-common.c | 66 + sound/soc/qcom/qdsp6/q6dsp-common.h | 24 + sound/soc/qcom/qdsp6/q6dsp-errno.h | 51 + sound/soc/qcom/qdsp6/q6routing.c | 1006 ++++++ sound/soc/qcom/qdsp6/q6routing.h | 9 + sound/soc/rockchip/rk3399_gru_sound.c | 46 +- sound/soc/sh/Kconfig | 6 +- sound/soc/sh/rcar/cmd.c | 15 +- sound/soc/sh/rcar/core.c | 53 +- sound/soc/sh/rcar/dma.c | 11 +- sound/soc/sh/rcar/gen.c | 3 +- sound/soc/sh/rcar/rsnd.h | 4 +- sound/soc/sh/rcar/ssi.c | 13 +- sound/soc/soc-cache.c | 53 - sound/soc/soc-compress.c | 385 +-- sound/soc/soc-core.c | 794 +---- sound/soc/soc-dapm.c | 20 +- sound/soc/soc-devres.c | 35 - sound/soc/soc-io.c | 83 - sound/soc/soc-jack.c | 22 - sound/soc/soc-pcm.c | 147 +- sound/soc/soc-topology.c | 107 +- sound/soc/uniphier/aio-compress.c | 13 - sound/soc/uniphier/aio-core.c | 71 +- sound/soc/uniphier/aio-cpu.c | 153 +- sound/soc/uniphier/aio-dma.c | 13 - sound/soc/uniphier/aio-ld11.c | 13 - sound/soc/uniphier/aio-reg.h | 46 +- sound/soc/uniphier/aio.h | 20 +- sound/soc/uniphier/evea.c | 55 +- sound/soc/zte/zx-i2s.c | 5 +- 259 files changed, 29849 insertions(+), 3997 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2305.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6351.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6797-mt6351.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8096.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt create mode 100644 Documentation/devicetree/bindings/sound/tscs454.txt create mode 100644 drivers/soc/qcom/apr.c create mode 100644 include/dt-bindings/soc/qcom,apr.h create mode 100644 include/dt-bindings/sound/qcom,q6afe.h create mode 100644 include/dt-bindings/sound/qcom,q6asm.h create mode 100644 include/dt-bindings/sound/rt5640.h create mode 100644 include/linux/soc/qcom/apr.h delete mode 100644 include/sound/omap-pcm.h delete mode 100644 include/sound/rt5640.h create mode 100644 include/sound/rt5668.h rename {sound/soc/intel/skylake => include/uapi/sound}/skl-tplg-interface.h (71%) create mode 100644 sound/soc/atmel/atmel-i2s.c create mode 100644 sound/soc/codecs/mt6351.c create mode 100644 sound/soc/codecs/mt6351.h create mode 100644 sound/soc/codecs/rt1305.c create mode 100644 sound/soc/codecs/rt1305.h create mode 100644 sound/soc/codecs/rt5668.c create mode 100644 sound/soc/codecs/rt5668.h create mode 100644 sound/soc/codecs/ssm2305.c create mode 100644 sound/soc/codecs/tscs454.c create mode 100644 sound/soc/codecs/tscs454.h create mode 100644 sound/soc/mediatek/mt6797/Makefile create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-common.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-adda.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-hostless.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-pcm.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-interconnection.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-mt6351.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-reg.h delete mode 100644 sound/soc/omap/omap-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.h create mode 100644 sound/soc/qcom/apq8096.c create mode 100644 sound/soc/qcom/qdsp6/Makefile create mode 100644 sound/soc/qcom/qdsp6/q6adm.c create mode 100644 sound/soc/qcom/qdsp6/q6adm.h create mode 100644 sound/soc/qcom/qdsp6/q6afe-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.h create mode 100644 sound/soc/qcom/qdsp6/q6asm-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.h create mode 100644 sound/soc/qcom/qdsp6/q6core.c create mode 100644 sound/soc/qcom/qdsp6/q6core.h create mode 100644 sound/soc/qcom/qdsp6/q6dsp-common.c create mode 100644 sound/soc/qcom/qdsp6/q6dsp-common.h create mode 100644 sound/soc/qcom/qdsp6/q6dsp-errno.h create mode 100644 sound/soc/qcom/qdsp6/q6routing.c create mode 100644 sound/soc/qcom/qdsp6/q6routing.h delete mode 100644 sound/soc/soc-cache.c

2 1

[alsa-devel] Control that can't be set on Arturia AudioFuse
by Ricard Wanderlof 05 Jun '18

05 Jun '18

Hi, We recently purchased an Arturia AudioFuse USB sound card, and one thing is strange on this device. It exposes a single mixer control called 'ARTURIA Clock Selector Clock Source': $ amixer -c 4 Simple mixer control 'ARTURIA Clock Selector Clock Source',0 Capabilities: enum Items: 'ARTURIA Internal Clock' 'ARTURIA S/PDIF Clock' 'ARTURIA ADAT Clock' 'ARTURIA WORD Clock' Item0: 'ARTURIA Internal Clock' However, attempting to set the control to any value has no effect; when reading using sget the original value is always returned. $ amixer -c 4 sset 'ARTURIA Clock Selector Clock Source' 'ARTURIA S/PDIF Clock' Simple mixer control 'ARTURIA Clock Selector Clock Source',0 Capabilities: enum Items: 'ARTURIA Internal Clock' 'ARTURIA S/PDIF Clock' 'ARTURIA ADAT Clock' 'ARTURIA WORD Clock' Item0: 'ARTURIA Internal Clock' There is no error message (which there is if for instance attempting to set the control to an invalid value), it just doesn't 'stick'. By using the proprietary configuration software in [a virtual] MS Windows I can change the value and also see the new value in Linux using amixer. I've had the same problem with a completely different USB soundcard (minidsp USB streamer), so I'm suspecting it's a Linux thing rather than something specific for this soundcard. Is there something I'm missing here from a Linux point of view? /Ricard -- 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

1 0

[alsa-devel] [PATCH v2] DMA: OMAP: fix OMAP1510 incorrect residue_granularity
by Janusz Krzysztofik 05 Jun '18

05 Jun '18

Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm") resulted in broken audio playback on OMAP1510 (discovered on Amstrad Delta). When running on OMAP1510, omap-pcm used to obtain DMA offset from snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered software calculations instead of snd_dmaengine_pcm_pointer() which depended on residue value calculated from omap_dma_get_src_pos(). Similar code path is still available in now used sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered. It was verified already before that omap_get_dma_src_pos() from arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer callback") for details. Apparently the same applies to its successor, omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c. On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described as depreciated and discouraged for use in new drivers because of its unreliable accuracy. However, it seems the only working option for OPAM1510 now, as long as a software calculated residue is not implemented as OMAP1510 fallback in omap-dma. Using snd_dmaengine_pcm_pointer_no_residue() code path instead of snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c can be triggered in two ways: - by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from sound/soc/omap/sdma-pcm.c, - by passing dma_caps.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine. Let's do the latter. Created and tested against next-20180531 tag from linux-next tree. Signed-off-by: Janusz Krzysztofik <jmkrzyszt(a)gmail.com> --- Changelog: v2: apply the patch against omap-dma.c moved to drivers/dma/ti/ drivers/dma/ti/omap-dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index b73fb51fbc81..96b5096c26dd 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); - od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + if (__dma_omap15xx(od->plat->dma_attr)) + od->ddev.residue_granularity = + DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + else + od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev; INIT_LIST_HEAD(&od->ddev.channels); -- 2.16.1

2 1

[alsa-devel] [PATCH v2] ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it
by Srinivas Kandagatla 04 Jun '18

04 Jun '18

dapm_kcontrol_data is freed as part of dapm_kcontrol_free(), leaving the paths pointer dangling in the list. This leads to system crash when we try to unload and reload sound card. I hit this bug during ADSP crash/reboot test case on Dragon board DB410c. Without this patch, on SLAB Poisoning enabled build, kernel crashes with "BUG kmalloc-128 (Tainted: G W ): Poison overwritten" Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: -remove unnecessary very long bug trace. sound/soc/soc-dapm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1e9a36389667..36a39ba30226 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -433,6 +433,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, static void dapm_kcontrol_free(struct snd_kcontrol *kctl) { struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl); + + list_del(&data->paths); kfree(data->wlist); kfree(data); } -- 2.16.2

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: remove redundant check on err
by Colin King 04 Jun '18

04 Jun '18

From: Colin Ian King <colin.king(a)canonical.com> The check on err is redundant as both the true and false paths end up on a break statement. Remove the redundant check. Detected by CoverityScan, CID#1268773 ("Identical code for different branches") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/usb/mixer_quirks.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 4149543f613e..e82a72fea9a1 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -1849,8 +1849,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) /* EMU0204 */ case USB_ID(0x041e, 0x3f19): err = snd_emu0204_controls_create(mixer); - if (err < 0) - break; break; case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ -- 2.17.0

2 1