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

[alsa-devel] [PATCH 0/4] ASoC: simple-card-utils: share same dev_dbg()
by Kuninori Morimoto 06 Jun '17

06 Jun '17

Hi Mark These are cleanup patches for simple-card/audio-graph-card Kuninori Morimoto (4): ASoC: simple-card-utils: share same dev_dbg() for Card Name ASoC: simple-card-utils: share same dev_dbg() for DAI format ASoC: simple-card-utils: share same dev_dbg() for Dai Name ASoC: simple-card-utils: share same dev_dbg() for sysclk include/sound/simple_card_utils.h | 9 ++++++--- sound/soc/generic/audio-graph-card.c | 9 --------- sound/soc/generic/audio-graph-scu-card.c | 7 ------- sound/soc/generic/simple-card-utils.c | 11 ++++++++++- sound/soc/generic/simple-card.c | 9 --------- sound/soc/generic/simple-scu-card.c | 7 ------- 6 files changed, 16 insertions(+), 36 deletions(-) -- 1.9.1

2 8

[alsa-devel] [PATCH] ASoC: rsnd: Document optional reset properties
by Geert Uytterhoeven 06 Jun '17

06 Jun '17

Document the optional properties for describing module resets, to support resetting these modules on R-Car Gen2 and Gen3. Note that the audio module has resets for the Serial Sound Interfaces only. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index 13cb21d53b8bdf5c..7246bb268bf9bab6 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -379,6 +379,9 @@ Optional properties: - clock-frequency : for all audio_clkout0/1/2/3 - clkout-lr-asynchronous : boolean property. it indicates that audio_clkoutn is asynchronizes with lr-clock. +- resets : References to SSI resets. +- reset-names : List of valid reset names. + "ssi-all", "ssi.X" SSI subnode properties: - interrupts : Should contain SSI interrupt for PIO transfer -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
by Peter Rosin 06 Jun '17

06 Jun '17

At some point I added the "Low" entry at the beginning of the array without bumping the enumeration count from 9 to 10. Fix this. While at it, fix the anti-pattern for the other enumeration (used by MUX{1,2}). Fixes: aa43112445f0 ("ASoC: atmel: tse850: add ASoC driver for the Axentia TSE-850") Signed-off-by: Peter Rosin <peda(a)axentia.se> --- sound/soc/atmel/tse850-pcm5142.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index a72c7d642026..3a1393283156 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -227,7 +227,7 @@ int tse850_put_ana(struct snd_kcontrol *kctrl, static const char * const mux_text[] = { "Mixer", "Loop" }; static const struct soc_enum mux_enum = - SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 2, mux_text); + SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(mux_text), mux_text); static const struct snd_kcontrol_new mux1 = SOC_DAPM_ENUM_EXT("MUX1", mux_enum, tse850_get_mux1, tse850_put_mux1); @@ -252,7 +252,7 @@ static const char * const ana_text[] = { }; static const struct soc_enum ana_enum = - SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 9, ana_text); + SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(ana_text), ana_text); static const struct snd_kcontrol_new out = SOC_DAPM_ENUM_EXT("ANA", ana_enum, tse850_get_ana, tse850_put_ana); -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: cs35l35: Add additional delay for reset
by Charles Keepax 06 Jun '17

06 Jun '17

Very fast systems may violate the minimum constraints for time the reset line needs to remain low, or communicate with the device too soon after releasing the reset. Fix this by adding some delays in to allow the chip to properly reset, also factor out the reset into a function as it is likely it will be re-used in later additions to the driver. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/cs35l35.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c index 375be49..f1ee184 100644 --- a/sound/soc/codecs/cs35l35.c +++ b/sound/soc/codecs/cs35l35.c @@ -162,6 +162,14 @@ static bool cs35l35_precious_register(struct device *dev, unsigned int reg) } } +static void cs35l35_reset(struct cs35l35_private *cs35l35) +{ + gpiod_set_value_cansleep(cs35l35->reset_gpio, 0); + usleep_range(2000, 2100); + gpiod_set_value_cansleep(cs35l35->reset_gpio, 1); + usleep_range(1000, 1100); +} + static int cs35l35_wait_for_pdn(struct cs35l35_private *cs35l35) { int ret; @@ -1536,7 +1544,7 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client, } } - gpiod_set_value_cansleep(cs35l35->reset_gpio, 1); + cs35l35_reset(cs35l35); init_completion(&cs35l35->pdn_done); -- 2.1.4

3 2

[alsa-devel] [RFC PATCH v2] ASoC: Intel: sst: Delete sst_shim_regs64; saved regs are never used
by Douglas Anderson 06 Jun '17

06 Jun '17

In commit 9a075265c6dc ("ASoC: Intel: sst: Remove unused function sst_restore_shim64()"), we deleted the sst_restore_shim64() since it was never used. ...but a quick look at the code shows that we should also be able to remove the sst_save_shim64() function and the structure members we were storing data in. Once we delete sst_save_shim64() there are no longer any users of the 'sst_shim_regs64' structure. That means we can delete it completely and also avoid allocating memory for it. This saves a whopping 136 bytes of devm allocated memory. We also get the nice benefit of avoiding an error path in the init code. Note that the saving code that we're removing (and the comments talking about how important it is to do the save) has been around since commit 336cfbb05edf ("ASoC: Intel: mrfld- add ACPI module"). Signed-off-by: Douglas Anderson <dianders(a)chromium.org> --- This problem was found only by code inspection and only compile tested. Hence, RFC. Changes in v2: - Fully delete the structure. sound/soc/intel/atom/sst/sst.c | 19 ------------------- sound/soc/intel/atom/sst/sst.h | 22 ---------------------- sound/soc/intel/atom/sst/sst_acpi.c | 14 -------------- 3 files changed, 55 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index 2d43b8693c0c..5ee92257ca85 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -382,21 +382,6 @@ void sst_context_cleanup(struct intel_sst_drv *ctx) } EXPORT_SYMBOL_GPL(sst_context_cleanup); -static inline void sst_save_shim64(struct intel_sst_drv *ctx, - void __iomem *shim, - struct sst_shim_regs64 *shim_regs) -{ - unsigned long irq_flags; - - spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); - - shim_regs->imrx = sst_shim_read64(shim, SST_IMRX); - shim_regs->csr = sst_shim_read64(shim, SST_CSR); - - - spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); -} - void sst_configure_runtime_pm(struct intel_sst_drv *ctx) { pm_runtime_set_autosuspend_delay(ctx->dev, SST_SUSPEND_DELAY); @@ -416,8 +401,6 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx) pm_runtime_set_active(ctx->dev); else pm_runtime_put_noidle(ctx->dev); - - sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); } EXPORT_SYMBOL_GPL(sst_configure_runtime_pm); @@ -441,8 +424,6 @@ static int intel_sst_runtime_suspend(struct device *dev) flush_workqueue(ctx->post_msg_wq); ctx->ops->reset(ctx); - /* save the shim registers because PMC doesn't save state */ - sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); return ret; } diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h index 5c9a51cc77aa..1693befa455a 100644 --- a/sound/soc/intel/atom/sst/sst.h +++ b/sound/soc/intel/atom/sst/sst.h @@ -317,26 +317,6 @@ struct sst_ipc_reg { int ipcd; }; -struct sst_shim_regs64 { - u64 csr; - u64 pisr; - u64 pimr; - u64 isrx; - u64 isrd; - u64 imrx; - u64 imrd; - u64 ipcx; - u64 ipcd; - u64 isrsc; - u64 isrlpesc; - u64 imrsc; - u64 imrlpesc; - u64 ipcsc; - u64 ipclpesc; - u64 clkctl; - u64 csr2; -}; - struct sst_fw_save { void *iram; void *dram; @@ -356,7 +336,6 @@ struct sst_fw_save { * @dram : SST DRAM pointer * @pdata : SST info passed as a part of pci platform data * @shim_phy_add : SST shim phy addr - * @shim_regs64: Struct to save shim registers * @ipc_dispatch_list : ipc messages dispatched * @rx_list : to copy the process_reply/process_msg from DSP * @ipc_post_msg_wq : wq to post IPC messages context @@ -398,7 +377,6 @@ struct intel_sst_drv { unsigned int ddr_end; unsigned int ddr_base; unsigned int mailbox_recv_offset; - struct sst_shim_regs64 *shim_regs64; struct list_head block_list; struct list_head ipc_dispatch_list; struct sst_platform_info *pdata; diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 592f6afaf2a5..cf88cd1865fb 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -358,23 +358,9 @@ static int sst_acpi_probe(struct platform_device *pdev) if (ret < 0) return ret; - /* need to save shim registers in BYT */ - ctx->shim_regs64 = devm_kzalloc(ctx->dev, sizeof(*ctx->shim_regs64), - GFP_KERNEL); - if (!ctx->shim_regs64) { - ret = -ENOMEM; - goto do_sst_cleanup; - } - sst_configure_runtime_pm(ctx); platform_set_drvdata(pdev, ctx); return ret; - -do_sst_cleanup: - sst_context_cleanup(ctx); - platform_set_drvdata(pdev, NULL); - dev_err(ctx->dev, "failed with %d\n", ret); - return ret; } /** -- 2.13.0.219.gdb65acc882-goog

5 4

[alsa-devel] [PATCH v3 0/3] ASoC: Intel: Skylake: Add Support for MIC select module
by Subhransu S. Prusty 06 Jun '17

06 Jun '17

This series adds support in DSP to add support for MIC select module which allows user to select 1 to N channels from DMIC channel input. Further it also adds support in bxt-rt298 machine for such a module. Changes in v2: - check for index in array range Changes in v3: - Use enumerated value instead of integer - Use c99 style initialization for kcontrol ops Dharageswari R (3): ASoC: Intel: Skylake: Add mic-select module type ASoC: Intel: Skylake: Add enum control for mic selection ASoC: Intel: Boards: Add 4-channel DMIC fixup. sound/soc/intel/boards/bxt_rt298.c | 7 +- sound/soc/intel/skylake/skl-messages.c | 2 + sound/soc/intel/skylake/skl-topology.c | 159 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 20 ++++ sound/soc/intel/skylake/skl-tplg-interface.h | 2 + 5 files changed, 185 insertions(+), 5 deletions(-) -- 1.9.1

2 4

[alsa-devel] [PATCH 0/3] ASoC: Intel: Skylake: Add Support for MIC select module
by Vinod Koul 06 Jun '17

06 Jun '17

This series adds support in DSP to add support for MIC select module which allows user to select 1 to N channels from DMIC channel input. Further it also adds support in bxt-rt298 machine for such a module. Kranthikumar, GudishaX (3): ASoC: Intel: Skylake: Add mic-select module type ASoC: Intel: Skylake: Add enum control for mic selection ASoC: Intel: Boards: Add 4-channel DMIC fixup. sound/soc/intel/boards/bxt_rt298.c | 7 +- sound/soc/intel/skylake/skl-messages.c | 2 + sound/soc/intel/skylake/skl-topology.c | 143 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 20 ++++ sound/soc/intel/skylake/skl-tplg-interface.h | 2 + 5 files changed, 169 insertions(+), 5 deletions(-) -- 1.9.1

4 10

[alsa-devel] [GIT PULL] ASoC fixes for v4.12
by Mark Brown 06 Jun '17

06 Jun '17

The following changes since commit 08332893e37af6ae779367e78e444f8f9571511d: Linux 4.12-rc2 (2017-05-21 19:30:23 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-fix-v4.12-rc4 for you to fetch changes up to 7327a946a3b921d60d48924d34ac99eae2fae57d: Merge remote-tracking branch 'asoc/fix/rt286' into asoc-linus (2017-05-26 12:42:28 +0100) ---------------------------------------------------------------- ASoC: Fixes for v4.12 This is the usual collection of device specific fixes, all accumilated since the merge window, plus one fix from Takashi for a nasty use after free bug that bit some things with deferred probe and an update to the maintainer address for the former Wolfson parts. ---------------------------------------------------------------- Adam Thomson (1): ASoC: da7213: Fix incorrect usage of bitwise '&' operator for SRM check Charles Keepax (1): MAINTAINERS: Update email address for patches to Wolfson parts Kuninori Morimoto (4): ASoC: rsnd: don't use PDTA bit for 24bit on SSI ASoC: rsnd: don't call free_irq() on Parent SSI ASoC: rsnd: SSI PIO adjust to 24bit mode ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx Mark Brown (4): Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/cirrus', 'asoc/fix/da7213', 'asoc/fix/free' and 'asoc/fix/jack' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt286' into asoc-linus Pardha Saradhi K (1): ASoC: Intel: Skylake: Fix IPC rx_list corruption Quentin Schulz (1): ASoC: atmel-classd: sync regcache when resuming Shreyas NC (1): ASoC: Intel: Skylake: Fix to parse consecutive string tkns in manifest Stefan Agner (1): ASoC: simple-card: fix mic jack initialization Takashi Iwai (1): ASoC: Fix use-after-free at card unregistration Vinod Koul (1): ASoC: Intel: Skylake: Move i915 registration to worker thread Yifeng Li (1): rt286: add Thinkpad Helix 2 to force_combo_jack_table MAINTAINERS | 2 +- sound/soc/atmel/atmel-classd.c | 9 ++ sound/soc/codecs/da7213.c | 2 +- sound/soc/codecs/rt286.c | 7 ++ sound/soc/generic/simple-card.c | 2 +- sound/soc/intel/skylake/skl-sst-ipc.c | 5 + sound/soc/intel/skylake/skl-topology.c | 2 +- sound/soc/intel/skylake/skl.c | 162 ++++++++++++++++++--------------- sound/soc/intel/skylake/skl.h | 4 +- sound/soc/sh/rcar/adg.c | 6 +- sound/soc/sh/rcar/cmd.c | 1 + sound/soc/sh/rcar/core.c | 51 +++++++++++ sound/soc/sh/rcar/gen.c | 1 + sound/soc/sh/rcar/rsnd.h | 2 + sound/soc/sh/rcar/src.c | 12 ++- sound/soc/sh/rcar/ssi.c | 18 +++- sound/soc/sh/rcar/ssiu.c | 3 +- sound/soc/soc-core.c | 5 +- 18 files changed, 205 insertions(+), 89 deletions(-)

2 1

[alsa-devel] [PATCH 0/4] Yet another fixes for ALSA timer info leaks
by Takashi Iwai 06 Jun '17

06 Jun '17

Hi, this is a patchset to paper over a bug in ALSA timer core code about the race between read and ioctl. As a side-effect of the race, it may allow to read some uninitialized kmalloced memory. The first two patches cover the issue, so marked as stable, while the rest two patches are rather cleanups and more hardening. I'm going to queue the first to for-linus for 4.12-rc, and the latter two to for-next, for 4.13. thanks, Takashi === Takashi Iwai (4): ALSA: timer: Fix race between read and ioctl ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT ALSA: timer: Improve user queue reallocation ALSA: timer: Wrap with spinlock for queue access sound/core/timer.c | 103 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 52 deletions(-) -- 2.13.0

1 4

[alsa-devel] [PATCH] alsatplg: fix topology compiler long option parsing
by Liam Girdwood 06 Jun '17

06 Jun '17

verbose, compile and output options all have a parameter. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/topology.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/topology.c b/topology/topology.c index 33c3276..6d876ee 100644 --- a/topology/topology.c +++ b/topology/topology.c @@ -54,10 +54,10 @@ int main(int argc, char *argv[]) snd_tplg_t *snd_tplg; static const char short_options[] = "hc:v:o:"; static const struct option long_options[] = { - {"help", 0, 0, 'h'}, - {"verbose", 0, 0, 'v'}, - {"compile", 0, 0, 'c'}, - {"output", 0, 0, 'o'}, + {"help", 0, NULL, 'h'}, + {"verbose", 1, NULL, 'v'}, + {"compile", 1, NULL, 'c'}, + {"output", 1, NULL, 'o'}, {0, 0, 0, 0}, }; char *source_file = NULL, *output_file = NULL; -- 2.11.0

1 0