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

[alsa-devel] [PATCH v4] ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
by Kuninori Morimoto 07 Dec '17

07 Dec '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Power Down Release Command (PMVR, PMDAC, RSTN, PMDA1-PMDA6) which are located on PW_MGMT1 / PW_MGMT3 register must be write again after at least 5 LRCK cycle or later on each command. Otherwise, Playback volume will be 0dB. Basically, it should be 1. PowerDownRelease by Power Management1 <= call 1.x after 5LRCK 1.x Dummy write to Power Management1 2. PowerDownRelease by Power Management3 <= call 2.x after 5LRCK 2.x Dummy write to Power Management3 To avoid too many dummy write, this patch is merging these. 1. PowerDownRelease by Power Management1 2. PowerDownRelease by Power Management3 <= call after 5LRCK 2.x Dummy write to Power Management1/3 <= merge dummy write This patch adds dummy write when Playback Start timing. Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v3 -> v4 - use schedule_work() instead of schedule_delayed_work() sound/soc/codecs/ak4613.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index ee9e822..8d2c90b 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -15,6 +15,7 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/of_device.h> @@ -95,6 +96,9 @@ struct ak4613_priv { struct mutex lock; const struct ak4613_interface *iface; struct snd_pcm_hw_constraint_list constraint; + struct work_struct dummy_write_work; + struct snd_soc_component *component; + unsigned int rate; unsigned int sysclk; unsigned int fmt; @@ -392,6 +396,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } + priv->rate = rate; /* * FIXME @@ -467,11 +472,65 @@ static int ak4613_set_bias_level(struct snd_soc_component *component, return 0; } +static void ak4613_dummy_write(struct work_struct *work) +{ + struct ak4613_priv *priv = container_of(work, + struct ak4613_priv, + dummy_write_work); + struct snd_soc_component *component = priv->component; + unsigned int mgmt1; + unsigned int mgmt3; + + /* wait 5 LR clocks */ + udelay(5000000 / priv->rate); + + snd_soc_component_read(component, PW_MGMT1, &mgmt1); + snd_soc_component_read(component, PW_MGMT3, &mgmt3); + + snd_soc_component_write(component, PW_MGMT1, mgmt1); + snd_soc_component_write(component, PW_MGMT3, mgmt3); +} + +static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak4613_priv *priv = snd_soc_codec_get_drvdata(codec); + + /* + * FIXME + * + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * from Power Down Release. Otherwise, Playback volume will be 0dB. + * To avoid complex multiple delay/dummy_write method from + * ak4613_set_bias_level() / SND_SOC_DAPM_DAC_E("DACx", ...), + * call it once here. + * + * But, unfortunately, we can't "write" here because here is atomic + * context (It uses I2C access for write). + * Thus, use delayed work with 0 delay to switch to normal context + * immediately, and wait 5 LR clocks and do dummy_write there. + */ + + if ((cmd != SNDRV_PCM_TRIGGER_START) && + (cmd != SNDRV_PCM_TRIGGER_RESUME)) + return 0; + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return 0; + + priv->component = &codec->component; + schedule_work(&priv->dummy_write_work); + + return 0; +} + static const struct snd_soc_dai_ops ak4613_dai_ops = { .startup = ak4613_dai_startup, .shutdown = ak4613_dai_shutdown, .set_sysclk = ak4613_dai_set_sysclk, .set_fmt = ak4613_dai_set_fmt, + .trigger = ak4613_dai_trigger, .hw_params = ak4613_dai_hw_params, }; @@ -591,6 +650,7 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, priv->iface = NULL; priv->cnt = 0; priv->sysclk = 0; + INIT_WORK(&priv->dummy_write_work, ak4613_dummy_write); mutex_init(&priv->lock); -- 1.9.1

2 4

[alsa-devel] [PATCH V2] ARM: dts: bcm283x: Fix probing of bcm2835-i2s
by Stefan Wahren 06 Dec '17

06 Dec '17

Since 517e7a1537a ("ASoC: bcm2835: move to use the clock framework") the bcm2835-i2s requires a clock as DT property. Unfortunately the necessary DT change has never been applied. While we are at it also fix the first PCM register range to cover the PCM_GRAY register. This patch also fixes the dt-bindings accordlingly. Fixes: 517e7a1537a ("ASoC: bcm2835: move to use the clock framework") Signed-off-by: Stefan Wahren <stefan.wahren(a)i2se.com> Reviewed-by: Eric Anholt <eric(a)anholt.net> Tested-by: Matthias Reichl <hias(a)horus.com> --- Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++-- Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 ++++----- arch/arm/boot/dts/bcm283x.dtsi | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) Changes in V2: * add Fixes, Reviewed-by and Tested-by tags diff --git a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt index baf9b34..b6a8cc0 100644 --- a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt +++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt @@ -74,8 +74,8 @@ Example: bcm2835_i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = < 0x7e203000 0x20>, - < 0x7e101098 0x02>; + reg = < 0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>; diff --git a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt index 65783de..7bb0362 100644 --- a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt +++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt @@ -2,9 +2,8 @@ Required properties: - compatible: "brcm,bcm2835-i2s" -- reg: A list of base address and size entries: - * The first entry should cover the PCM registers - * The second entry should cover the PCM clock registers +- reg: Should contain PCM registers location and length. +- clocks: the (PCM) clock to use - dmas: List of DMA controller phandle and DMA request line ordered pairs. - dma-names: Identifier string for each DMA request line in the dmas property. These strings correspond 1:1 with the ordered pairs in dmas. @@ -16,8 +15,8 @@ Example: bcm2835_i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = <0x7e203000 0x20>, - <0x7e101098 0x02>; + reg = <0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index dcde93c..f493761 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -396,8 +396,8 @@ i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = <0x7e203000 0x20>, - <0x7e101098 0x02>; + reg = <0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>; -- 2.7.4

2 1

[alsa-devel] [RFC PATCH 0/3] Add ASoC platforms directory
by Andrew F. Davis 06 Dec '17

06 Dec '17

Hello all, The first patch, I think, sums up well what I'm trying to do here with this series. The last two are a couple examples of what the moving would look like. The very end result would look something like: soc/ |_codecs/ |_codecs*.c |_platforms/ |_adi/ |_adi_i2s.c |_... |_amd/ |_.../ |_machines/ |_amd/ |_acp-rt5645.c |_... |_atmel/ |_.../ |_core_files*.c I would like to think the churn is minimal for this as git seems to handles renaming like this rather well, but I guess that is up to the maintainers. :) Thanks for your comments, Andrew Andrew F. Davis (3): ASoC: Add platforms directory ASoC: Platforms: Move Davinci platform drivers into platforms directory ASoC: Platforms: Move OMAP platform drivers into platforms directory MAINTAINERS | 1 + sound/soc/Kconfig | 3 ++ sound/soc/Makefile | 1 + sound/soc/davinci/Kconfig | 37 ----------------------- sound/soc/davinci/Makefile | 21 +++---------- sound/soc/omap/Kconfig | 29 ------------------ sound/soc/omap/Makefile | 13 -------- sound/soc/omap/am3517evm.c | 2 +- sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/n810.c | 2 +- sound/soc/omap/omap-abe-twl6040.c | 4 +-- sound/soc/omap/omap-twl4030.c | 2 +- sound/soc/omap/omap3pandora.c | 2 +- sound/soc/omap/osk5912.c | 2 +- sound/soc/omap/rx51.c | 2 +- sound/soc/platforms/Kconfig | 10 ++++++ sound/soc/platforms/Makefile | 4 +++ sound/soc/platforms/davinci/Kconfig | 36 ++++++++++++++++++++++ sound/soc/{ => platforms}/davinci/Makefile | 5 --- sound/soc/{ => platforms}/davinci/davinci-i2s.c | 0 sound/soc/{ => platforms}/davinci/davinci-i2s.h | 0 sound/soc/{ => platforms}/davinci/davinci-mcasp.c | 0 sound/soc/{ => platforms}/davinci/davinci-mcasp.h | 0 sound/soc/{ => platforms}/davinci/davinci-vcif.c | 0 sound/soc/{ => platforms}/davinci/edma-pcm.c | 0 sound/soc/{ => platforms}/davinci/edma-pcm.h | 0 sound/soc/platforms/omap/Kconfig | 28 +++++++++++++++++ sound/soc/platforms/omap/Makefile | 13 ++++++++ sound/soc/{ => platforms}/omap/mcbsp.c | 0 sound/soc/{ => platforms}/omap/mcbsp.h | 0 sound/soc/{ => platforms}/omap/omap-dmic.c | 0 sound/soc/{ => platforms}/omap/omap-dmic.h | 0 sound/soc/{ => platforms}/omap/omap-hdmi-audio.c | 0 sound/soc/{ => platforms}/omap/omap-mcbsp.c | 0 sound/soc/{ => platforms}/omap/omap-mcbsp.h | 0 sound/soc/{ => platforms}/omap/omap-mcpdm.c | 0 sound/soc/{ => platforms}/omap/omap-mcpdm.h | 0 sound/soc/{ => platforms}/omap/omap-pcm.c | 0 38 files changed, 110 insertions(+), 109 deletions(-) rewrite sound/soc/davinci/Makefile (71%) create mode 100644 sound/soc/platforms/Kconfig create mode 100644 sound/soc/platforms/Makefile create mode 100644 sound/soc/platforms/davinci/Kconfig copy sound/soc/{ => platforms}/davinci/Makefile (76%) rename sound/soc/{ => platforms}/davinci/davinci-i2s.c (100%) rename sound/soc/{ => platforms}/davinci/davinci-i2s.h (100%) rename sound/soc/{ => platforms}/davinci/davinci-mcasp.c (100%) rename sound/soc/{ => platforms}/davinci/davinci-mcasp.h (100%) rename sound/soc/{ => platforms}/davinci/davinci-vcif.c (100%) rename sound/soc/{ => platforms}/davinci/edma-pcm.c (100%) rename sound/soc/{ => platforms}/davinci/edma-pcm.h (100%) create mode 100644 sound/soc/platforms/omap/Kconfig create mode 100644 sound/soc/platforms/omap/Makefile rename sound/soc/{ => platforms}/omap/mcbsp.c (100%) rename sound/soc/{ => platforms}/omap/mcbsp.h (100%) rename sound/soc/{ => platforms}/omap/omap-dmic.c (100%) rename sound/soc/{ => platforms}/omap/omap-dmic.h (100%) rename sound/soc/{ => platforms}/omap/omap-hdmi-audio.c (100%) rename sound/soc/{ => platforms}/omap/omap-mcbsp.c (100%) rename sound/soc/{ => platforms}/omap/omap-mcbsp.h (100%) rename sound/soc/{ => platforms}/omap/omap-mcpdm.c (100%) rename sound/soc/{ => platforms}/omap/omap-mcpdm.h (100%) rename sound/soc/{ => platforms}/omap/omap-pcm.c (100%) -- 2.15.0

2 11

[alsa-devel] [PATCH 00/11] ASoC: Intel: Skylake: Bug fixes for skylake driver
by Guneshwor Singh 06 Dec '17

06 Dec '17

This series include couple of bug fixes which include memory leak fixes, null pointer dereference fixes, fixes for errors generated by static checker, updown mixer module ipc format fix and use module uuid instead of module id which is required for module pins. Guneshwor Singh (2): ASoC: Intel: Skylake: Fix updown mixer module format ASoC: Intel: Skylake: Add channel map in updown mixer module IPC Pankaj Bharadiya (3): ASoC: Intel: Skylake: Fix potential NULL pointer dereference ASoC: Intel: Skylake: Fix uuid_module memory leak in failure case ASoC: Intel: Skylake: Check for NHLT ACPI header signature Sriram Periyasamy (2): ASoC: Intel: Skylake: Optimize UUID handling to fill pin info ASoC: Intel: Skylake: Add dynamic module id support Subhransu S. Prusty (4): ASoC: Intel: Skylake: Remove second shim read in register_poll ASoC: hdac_hdmi: Fix static checker warning for sprintf usage ASoC: hdac_hdmi: Fix possible NULL pointer dereference ASoC: hdac_hdmi: Fix possible memory leak on parse and map nid failure sound/soc/codecs/hdac_hdmi.c | 51 ++++++++++++++++++++++---- sound/soc/intel/common/sst-dsp.c | 4 +- sound/soc/intel/skylake/skl-messages.c | 9 +---- sound/soc/intel/skylake/skl-nhlt.c | 9 +++++ sound/soc/intel/skylake/skl-pcm.c | 3 +- sound/soc/intel/skylake/skl-sst-utils.c | 15 ++++++-- sound/soc/intel/skylake/skl-topology.c | 65 +++++++++++++++++++++------------ sound/soc/intel/skylake/skl-topology.h | 3 +- 8 files changed, 112 insertions(+), 47 deletions(-) -- 2.14.2

3 23

[alsa-devel] [PATCH 0/4] ASoC: Intel: Skylake: Skylake driver updates
by Guneshwor Singh 06 Dec '17

06 Dec '17

This series includes fixes for HDMI widgets sysfs not updating, shim read optimization and feature to configure DSP clock source. Pradeep Tewani (2): ASoC: Intel: Skylake: Parse vendor tokens to build A-State table ASoC: Intel: Skylake: Configure DSP clock source Puneeth Prabhu (1): ASoC: hdac_hdmi: Refresh sysfs during hdmi device probe Subhransu S. Prusty (1): ASoC: Intel: Skylake: Remove second shim read in register_poll include/uapi/sound/snd_sst_tokens.h | 17 ++++++++++++- sound/soc/codecs/hdac_hdmi.c | 1 + sound/soc/intel/common/sst-dsp.c | 4 +--- sound/soc/intel/skylake/skl-messages.c | 18 ++++++++++++++ sound/soc/intel/skylake/skl-pcm.c | 6 +++++ sound/soc/intel/skylake/skl-sst-dsp.h | 3 +++ sound/soc/intel/skylake/skl-topology.c | 44 +++++++++++++++++++++++++++++++++- sound/soc/intel/skylake/skl.h | 17 +++++++++++++ 8 files changed, 105 insertions(+), 5 deletions(-) -- 2.15.0

3 7

[alsa-devel] Applied "ASoC: hisilicon: remove duplicate includes" to the asoc tree
by Mark Brown 06 Dec '17

06 Dec '17

The patch ASoC: hisilicon: remove duplicate includes has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 769e40f0c17df53bac8999939993a280c1ea3dbd Mon Sep 17 00:00:00 2001 From: Pravin Shedge <pravin.shedge4linux(a)gmail.com> Date: Wed, 6 Dec 2017 23:09:00 +0530 Subject: [PATCH] ASoC: hisilicon: remove duplicate includes These duplicate includes have been found with scripts/checkincludes.pl but they have been removed manually to avoid removing false positives. Signed-off-by: Pravin Shedge <pravin.shedge4linux(a)gmail.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/hisilicon/hi6210-i2s.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 0c8f86d4020e..07a57209e055 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -36,7 +36,6 @@ #include <linux/of_irq.h> #include <linux/mfd/syscon.h> #include <linux/reset-controller.h> -#include <linux/clk.h> #include "hi6210-i2s.h" -- 2.15.0

1 0

[alsa-devel] [PATCH 30/45] sound: soc: hisilicon: remove duplicate includes
by Pravin Shedge 06 Dec '17

06 Dec '17

These duplicate includes have been found with scripts/checkincludes.pl but they have been removed manually to avoid removing false positives. Signed-off-by: Pravin Shedge <pravin.shedge4linux(a)gmail.com> --- sound/soc/hisilicon/hi6210-i2s.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 0c8f86d..07a5720 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -36,7 +36,6 @@ #include <linux/of_irq.h> #include <linux/mfd/syscon.h> #include <linux/reset-controller.h> -#include <linux/clk.h> #include "hi6210-i2s.h" -- 2.7.4

2 1

[alsa-devel] [PATCH v3 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer
by Anna-Maria Gleixner 06 Dec '17

06 Dec '17

From: Thomas Gleixner <tglx(a)linutronix.de> The tasklet is used to defer the execution of snd_pcm_period_elapsed() to the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer callback in softirq context as well which renders the tasklet useless. [o-takashi: avoid stall due to a call of hrtimer_cancel() on a callback of hrtimer] Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-maria(a)linutronix.de> Cc: alsa-devel(a)alsa-project.org Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Link: http://lkml.kernel.org/r/20170905161820.jtysvxtfleunbbmf@breakpoint.cc --- sound/drivers/dummy.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 7b2b1f766b00..6ad2ff57833d 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -375,17 +375,9 @@ struct dummy_hrtimer_pcm { ktime_t period_time; atomic_t running; struct hrtimer timer; - struct tasklet_struct tasklet; struct snd_pcm_substream *substream; }; -static void dummy_hrtimer_pcm_elapsed(unsigned long priv) -{ - struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv; - if (atomic_read(&dpcm->running)) - snd_pcm_period_elapsed(dpcm->substream); -} - static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) { struct dummy_hrtimer_pcm *dpcm; @@ -393,7 +385,14 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer); if (!atomic_read(&dpcm->running)) return HRTIMER_NORESTART; - tasklet_schedule(&dpcm->tasklet); + /* + * In cases of XRUN and draining, this calls .trigger to stop PCM + * substream. + */ + snd_pcm_period_elapsed(dpcm->substream); + if (!atomic_read(&dpcm->running)) + return HRTIMER_NORESTART; + hrtimer_forward_now(timer, dpcm->period_time); return HRTIMER_RESTART; } @@ -403,7 +402,7 @@ static int dummy_hrtimer_start(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer); - hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL); + hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL_SOFT); atomic_set(&dpcm->running, 1); return 0; } @@ -413,14 +412,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; atomic_set(&dpcm->running, 0); - hrtimer_cancel(&dpcm->timer); + if (!hrtimer_callback_running(&dpcm->timer)) + hrtimer_cancel(&dpcm->timer); return 0; } static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm) { hrtimer_cancel(&dpcm->timer); - tasklet_kill(&dpcm->tasklet); } static snd_pcm_uframes_t @@ -465,12 +464,10 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream) if (!dpcm) return -ENOMEM; substream->runtime->private_data = dpcm; - hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT); dpcm->timer.function = dummy_hrtimer_callback; dpcm->substream = substream; atomic_set(&dpcm->running, 0); - tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed, - (unsigned long)dpcm); return 0; } -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: fsl_asrc: protect macro argument
by Stefan Agner 06 Dec '17

06 Dec '17

Protect macro argument with parentheses to avoid ambiguity. This fixes a warning seen with clang: warning: logical not is only applied to the left hand side of this comparison Signed-off-by: Stefan Agner <stefan(a)agner.ch> --- sound/soc/fsl/fsl_asrc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h index 0f163abe4ba3..ec33dab4b909 100644 --- a/sound/soc/fsl/fsl_asrc.h +++ b/sound/soc/fsl/fsl_asrc.h @@ -57,7 +57,7 @@ #define REG_ASRDOC 0x74 #define REG_ASRDI(i) (REG_ASRDIA + (i << 3)) #define REG_ASRDO(i) (REG_ASRDOA + (i << 3)) -#define REG_ASRDx(x, i) (x == IN ? REG_ASRDI(i) : REG_ASRDO(i)) +#define REG_ASRDx(x, i) ((x) == IN ? REG_ASRDI(i) : REG_ASRDO(i)) #define REG_ASRIDRHA 0x80 #define REG_ASRIDRLA 0x84 -- 2.13.3

3 7

[alsa-devel] Applied "ASoC: rockchip: disable clock on error" to the asoc tree
by Mark Brown 06 Dec '17

06 Dec '17

The patch ASoC: rockchip: disable clock on error has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c7b92172a61b91936be985cb9bc499a4ebc6489b Mon Sep 17 00:00:00 2001 From: Stefan Potyra <Stefan.Potyra(a)elektrobit.com> Date: Wed, 6 Dec 2017 16:03:24 +0100 Subject: [PATCH] ASoC: rockchip: disable clock on error Disable the clocks in rk_spdif_probe when an error occurs after one of the clocks has been enabled previously. Found by Linux Driver Verification project (linuxtesting.org). Fixes: f874b80e1571 ASoC: rockchip: Add rockchip SPDIF transceiver driver Signed-off-by: Stefan Potyra <Stefan.Potyra(a)elektrobit.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/rockchip/rockchip_spdif.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index ee5055d47d13..a89fe9b6463b 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -322,26 +322,30 @@ static int rk_spdif_probe(struct platform_device *pdev) spdif->mclk = devm_clk_get(&pdev->dev, "mclk"); if (IS_ERR(spdif->mclk)) { dev_err(&pdev->dev, "Can't retrieve rk_spdif master clock\n"); - return PTR_ERR(spdif->mclk); + ret = PTR_ERR(spdif->mclk); + goto err_disable_hclk; } ret = clk_prepare_enable(spdif->mclk); if (ret) { dev_err(spdif->dev, "clock enable failed %d\n", ret); - return ret; + goto err_disable_clocks; } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(regs)) - return PTR_ERR(regs); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); + goto err_disable_clocks; + } spdif->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "hclk", regs, &rk_spdif_regmap_config); if (IS_ERR(spdif->regmap)) { dev_err(&pdev->dev, "Failed to initialise managed register map\n"); - return PTR_ERR(spdif->regmap); + ret = PTR_ERR(spdif->regmap); + goto err_disable_clocks; } spdif->playback_dma_data.addr = res->start + SPDIF_SMPDR; @@ -373,6 +377,10 @@ static int rk_spdif_probe(struct platform_device *pdev) err_pm_runtime: pm_runtime_disable(&pdev->dev); +err_disable_clocks: + clk_disable_unprepare(spdif->mclk); +err_disable_hclk: + clk_disable_unprepare(spdif->hclk); return ret; } -- 2.15.0

1 0