From: Greg Kroah-Hartman Date: Mon, 6 May 2019 08:36:36 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.9.174~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c770b3c321cb11631014fb40aec5c901caca5e7;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch asoc-stm32-fix-sai-driver-name-initialisation.patch asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch --- diff --git a/queue-4.19/asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch b/queue-4.19/asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch new file mode 100644 index 00000000000..06b1038b11b --- /dev/null +++ b/queue-4.19/asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch @@ -0,0 +1,42 @@ +From aee48a9ffa5a128bf4e433c57c39e015ea5b0208 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sun, 30 Dec 2018 00:00:22 +0100 +Subject: ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping" + +From: Hans de Goede + +commit aee48a9ffa5a128bf4e433c57c39e015ea5b0208 upstream. + +Commit 37c7401e8c1f ("ASoC: Intel: bytcr_rt5651: Fix DMIC map +headsetmic mapping"), changed the headsetmic mapping from IN3P to IN2P, +this was based on the observation that all bytcr_rt5651 devices I have +access to (7 devices) where all using IN3P for the headsetmic. This was +an attempt to unifify / simplify the mapping, but it was wrong. + +None of those devices was actually using a digital internal mic. Now I've +access to a Point of View TAB-P1006W-232 (v1.0) tabler, which does use a +DMIC and it does have its headsetmic connected to IN2P, showing that the +original mapping was correct, so this commit reverts the change changing +the mapping back to IN2P. + +Fixes: 37c7401e8c1f ("ASoC: Intel: bytcr_rt5651: Fix DMIC map ... mapping") +Acked-by: Pierre-Louis Bossart +Signed-off-by: Hans de Goede +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/intel/boards/bytcr_rt5651.c ++++ b/sound/soc/intel/boards/bytcr_rt5651.c +@@ -267,7 +267,7 @@ static const struct snd_soc_dapm_route b + static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { + {"DMIC L1", NULL, "Internal Mic"}, + {"DMIC R1", NULL, "Internal Mic"}, +- {"IN3P", NULL, "Headset Mic"}, ++ {"IN2P", NULL, "Headset Mic"}, + }; + + static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { diff --git a/queue-4.19/asoc-stm32-fix-sai-driver-name-initialisation.patch b/queue-4.19/asoc-stm32-fix-sai-driver-name-initialisation.patch new file mode 100644 index 00000000000..6f050280b1f --- /dev/null +++ b/queue-4.19/asoc-stm32-fix-sai-driver-name-initialisation.patch @@ -0,0 +1,40 @@ +From 17d3069ccf06970e2db3f7cbf4335f207524279e Mon Sep 17 00:00:00 2001 +From: Arnaud Pouliquen +Date: Fri, 5 Apr 2019 11:19:11 +0200 +Subject: ASoC: stm32: fix sai driver name initialisation + +From: Arnaud Pouliquen + +commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream. + +This patch fixes the sai driver structure overwriting which results in +a cpu dai name equal NULL. + +Fixes: 3e086ed ("ASoC: stm32: add SAI driver") + +Signed-off-by: Arnaud Pouliquen +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/stm/stm32_sai_sub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/stm/stm32_sai_sub.c ++++ b/sound/soc/stm/stm32_sai_sub.c +@@ -1194,7 +1194,6 @@ static int stm32_sai_sub_dais_init(struc + if (!sai->cpu_dai_drv) + return -ENOMEM; + +- sai->cpu_dai_drv->name = dev_name(&pdev->dev); + if (STM_SAI_IS_PLAYBACK(sai)) { + memcpy(sai->cpu_dai_drv, &stm32_sai_playback_dai, + sizeof(stm32_sai_playback_dai)); +@@ -1204,6 +1203,7 @@ static int stm32_sai_sub_dais_init(struc + sizeof(stm32_sai_capture_dai)); + sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; + } ++ sai->cpu_dai_drv->name = dev_name(&pdev->dev); + + return 0; + } diff --git a/queue-4.19/asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch b/queue-4.19/asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch new file mode 100644 index 00000000000..74b9ea81107 --- /dev/null +++ b/queue-4.19/asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch @@ -0,0 +1,46 @@ +From 639e5eb3c7d67e407f2a71fccd95323751398f6f Mon Sep 17 00:00:00 2001 +From: Charles Keepax +Date: Tue, 19 Mar 2019 11:52:04 +0000 +Subject: ASoC: wm_adsp: Correct handling of compressed streams that restart + +From: Charles Keepax + +commit 639e5eb3c7d67e407f2a71fccd95323751398f6f upstream. + +Previously support was added to allow streams to be stopped and +started again without the DSP being power cycled and this was done +by clearing the buffer state in trigger start. Another supported +use-case is using the DSP for a trigger event then opening the +compressed stream later to receive the audio, unfortunately clearing +the buffer state in trigger start destroys the data received +from such a trigger. Correct this issue by moving the call to +wm_adsp_buffer_clear to be in trigger stop instead. + +Fixes: 61fc060c40e6 ("ASoC: wm_adsp: Support streams which can start/stop with DSP active") +Signed-off-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm_adsp.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm_adsp.c ++++ b/sound/soc/codecs/wm_adsp.c +@@ -3441,8 +3441,6 @@ int wm_adsp_compr_trigger(struct snd_com + } + } + +- wm_adsp_buffer_clear(compr->buf); +- + /* Trigger the IRQ at one fragment of data */ + ret = wm_adsp_buffer_write(compr->buf, + HOST_BUFFER_FIELD(high_water_mark), +@@ -3454,6 +3452,7 @@ int wm_adsp_compr_trigger(struct snd_com + } + break; + case SNDRV_PCM_TRIGGER_STOP: ++ wm_adsp_buffer_clear(compr->buf); + break; + default: + ret = -EINVAL; diff --git a/queue-4.19/series b/queue-4.19/series index 398cb71ddf1..34260a778cc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -75,3 +75,6 @@ staging-iio-adt7316-allow-adt751x-to-use-internal-vref-for-all-dacs.patch staging-iio-adt7316-fix-the-dac-read-calculation.patch staging-iio-adt7316-fix-the-dac-write-calculation.patch scsi-rdma-srpt-fix-a-credit-leak-for-aborted-commands.patch +asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch +asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch +asoc-stm32-fix-sai-driver-name-initialisation.patch