From 2aae83af4864f79206022af176539418f58ce0f2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Oct 2019 20:20:38 +0200 Subject: [PATCH] drop soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch --- queue-5.2/series | 1 - ...utils-set-0hz-to-sysclk-when-shutdow.patch | 70 ------------------- queue-5.3/series | 1 - ...utils-set-0hz-to-sysclk-when-shutdow.patch | 70 ------------------- 4 files changed, 142 deletions(-) delete mode 100644 queue-5.2/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch delete mode 100644 queue-5.3/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch diff --git a/queue-5.2/series b/queue-5.2/series index 930a30afb07..f4c029c5ae9 100644 --- a/queue-5.2/series +++ b/queue-5.2/series @@ -180,7 +180,6 @@ s390-crypto-xts-aes-s390-fix-extra-run-time-crypto-s.patch irqchip-gic-v3-its-fix-lpi-release-for-multi-msi-dev.patch x86-cpu-add-tiger-lake-to-intel-family.patch platform-x86-intel_pmc_core-do-not-ioremap-ram.patch -soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch asoc-dmaengine-make-the-pcm-name-equal-to-pcm-id-if-.patch io_uring-fix-wrong-sequence-setting-logic.patch block-make-rq-sector-size-accessible-for-block-stats.patch diff --git a/queue-5.2/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch b/queue-5.2/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch deleted file mode 100644 index 87daf63768d..00000000000 --- a/queue-5.2/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bd95a27e2b19e9cf665dba9e7e96b0317c4f4c51 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 8 Sep 2019 02:45:01 +0900 -Subject: SoC: simple-card-utils: set 0Hz to sysclk when shutdown - -From: Katsuhiro Suzuki - -[ Upstream commit 2458adb8f92ad4d07ef7ab27c5bafa1d3f4678d6 ] - -This patch set 0Hz to sysclk when shutdown the card. - -Some codecs set rate constraints that derives from sysclk. This -mechanism works correctly if machine drivers give fixed frequency. - -But simple-audio and audio-graph card set variable clock rate if -'mclk-fs' property exists. In this case, rate constraints will go -bad scenario. For example a codec accepts three limited rates -(mclk / 256, mclk / 384, mclk / 512). - -Bad scenario as follows (mclk-fs = 256): - - Initialize sysclk by correct value (Ex. 12.288MHz) - - Codec set constraints of PCM rate by sysclk - 48kHz (1/256), 32kHz (1/384), 24kHz (1/512) - - Play 48kHz sound, it's acceptable - - Sysclk is not changed - - - Play 32kHz sound, it's acceptable - - Set sysclk to 8.192MHz (= fs * mclk-fs = 32k * 256) - - Codec set constraints of PCM rate by sysclk - 32kHz (1/256), 21.33kHz (1/384), 16kHz (1/512) - - - Play 48kHz again, but it's NOT acceptable because constraints - do not allow 48kHz - -So codecs treat 0Hz sysclk as signal of applying no constraints to -avoid this problem. - -Signed-off-by: Katsuhiro Suzuki -Link: https://lore.kernel.org/r/20190907174501.19833-1-katsuhiro@katsuster.net -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/generic/simple-card-utils.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c -index f4c6375d11c7a..ef1adf87cbc8b 100644 ---- a/sound/soc/generic/simple-card-utils.c -+++ b/sound/soc/generic/simple-card-utils.c -@@ -224,10 +224,17 @@ EXPORT_SYMBOL_GPL(asoc_simple_startup); - void asoc_simple_shutdown(struct snd_pcm_substream *substream) - { - struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *codec_dai = rtd->codec_dai; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); - struct simple_dai_props *dai_props = - simple_priv_to_props(priv, rtd->num); - -+ if (dai_props->mclk_fs) { -+ snd_soc_dai_set_sysclk(codec_dai, 0, 0, SND_SOC_CLOCK_IN); -+ snd_soc_dai_set_sysclk(cpu_dai, 0, 0, SND_SOC_CLOCK_OUT); -+ } -+ - asoc_simple_clk_disable(dai_props->cpu_dai); - - asoc_simple_clk_disable(dai_props->codec_dai); --- -2.20.1 - diff --git a/queue-5.3/series b/queue-5.3/series index 2e257f8aa66..07af4f58f82 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -200,7 +200,6 @@ irqchip-gic-v3-its-fix-lpi-release-for-multi-msi-dev.patch x86-cpu-add-tiger-lake-to-intel-family.patch platform-x86-intel_pmc_core-do-not-ioremap-ram.patch platform-x86-intel_pmc_core_pltdrv-module-removal-wa.patch -soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch asoc-dmaengine-make-the-pcm-name-equal-to-pcm-id-if-.patch tools-power-x86-intel-speed-select-fix-memory-leak.patch spi-bcm2835-work-around-done-bit-erratum.patch diff --git a/queue-5.3/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch b/queue-5.3/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch deleted file mode 100644 index d2faaee577f..00000000000 --- a/queue-5.3/soc-simple-card-utils-set-0hz-to-sysclk-when-shutdow.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 4c8a6792f8e7955caa33fe44868df43cf782805d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 8 Sep 2019 02:45:01 +0900 -Subject: SoC: simple-card-utils: set 0Hz to sysclk when shutdown - -From: Katsuhiro Suzuki - -[ Upstream commit 2458adb8f92ad4d07ef7ab27c5bafa1d3f4678d6 ] - -This patch set 0Hz to sysclk when shutdown the card. - -Some codecs set rate constraints that derives from sysclk. This -mechanism works correctly if machine drivers give fixed frequency. - -But simple-audio and audio-graph card set variable clock rate if -'mclk-fs' property exists. In this case, rate constraints will go -bad scenario. For example a codec accepts three limited rates -(mclk / 256, mclk / 384, mclk / 512). - -Bad scenario as follows (mclk-fs = 256): - - Initialize sysclk by correct value (Ex. 12.288MHz) - - Codec set constraints of PCM rate by sysclk - 48kHz (1/256), 32kHz (1/384), 24kHz (1/512) - - Play 48kHz sound, it's acceptable - - Sysclk is not changed - - - Play 32kHz sound, it's acceptable - - Set sysclk to 8.192MHz (= fs * mclk-fs = 32k * 256) - - Codec set constraints of PCM rate by sysclk - 32kHz (1/256), 21.33kHz (1/384), 16kHz (1/512) - - - Play 48kHz again, but it's NOT acceptable because constraints - do not allow 48kHz - -So codecs treat 0Hz sysclk as signal of applying no constraints to -avoid this problem. - -Signed-off-by: Katsuhiro Suzuki -Link: https://lore.kernel.org/r/20190907174501.19833-1-katsuhiro@katsuster.net -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/generic/simple-card-utils.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c -index 556b1a789629d..9b794775df537 100644 ---- a/sound/soc/generic/simple-card-utils.c -+++ b/sound/soc/generic/simple-card-utils.c -@@ -213,10 +213,17 @@ EXPORT_SYMBOL_GPL(asoc_simple_startup); - void asoc_simple_shutdown(struct snd_pcm_substream *substream) - { - struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *codec_dai = rtd->codec_dai; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); - struct simple_dai_props *dai_props = - simple_priv_to_props(priv, rtd->num); - -+ if (dai_props->mclk_fs) { -+ snd_soc_dai_set_sysclk(codec_dai, 0, 0, SND_SOC_CLOCK_IN); -+ snd_soc_dai_set_sysclk(cpu_dai, 0, 0, SND_SOC_CLOCK_OUT); -+ } -+ - asoc_simple_clk_disable(dai_props->cpu_dai); - - asoc_simple_clk_disable(dai_props->codec_dai); --- -2.20.1 - -- 2.47.2