October 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/6] ALSA: firewire: handle several IR/IT context in callback of the IT context
by Takashi Sakamoto 21 Oct '19

21 Oct '19

Hi, This patchset is a part of my continuous work to improve ALSA IEC 61883-1/6 packet streaming engine for clock-recovery, addressed in my previous message: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-August/153388.ht… For the clock-recovery, information in the sequence of tx packet from device should be used to generate the sequence of rx packet to the device. In current implementation of the engine, the packets are processed in different tasklet contexts for each IR/IT context. This is inconvenient to bypass information between these IR/IT contexts. In this patchset, the engine is improved to process all of IR/IT contexts in the same domain by a tasklet context for one of IT context. For convenience, the IT context is called as 'IRQ target'. As a result, 1394 OHCI controller is managed to generate hardware IRQ just for the IRQ target. All of rx/tx packets are processed in tasklet for the hardware IRQ. Takashi Sakamoto (6): ALSA: firewire-lib: add irq_target member into amdtp_domain struct ALSA: firewire-lib: replace pointer callback to flush isoc contexts in AMDTP domain ALSA: firewire-lib: replace ack callback to flush isoc contexts in AMDTP domain ALSA: firewire-lib: cancel flushing isoc context in the laste step to process context callback ALSA: firewire-lib: handle several AMDTP streams in callback handler of IRQ target ALSA: firewire-lib: postpone to start IR context sound/firewire/amdtp-stream.c | 329 +++++++++++++++----- sound/firewire/amdtp-stream.h | 17 +- sound/firewire/bebob/bebob_pcm.c | 18 +- sound/firewire/bebob/bebob_stream.c | 10 +- sound/firewire/dice/dice-pcm.c | 8 +- sound/firewire/dice/dice-stream.c | 2 +- sound/firewire/digi00x/digi00x-pcm.c | 8 +- sound/firewire/digi00x/digi00x-stream.c | 2 +- sound/firewire/fireface/ff-pcm.c | 8 +- sound/firewire/fireface/ff-stream.c | 10 +- sound/firewire/fireworks/fireworks_pcm.c | 10 +- sound/firewire/fireworks/fireworks_stream.c | 2 +- sound/firewire/motu/motu-pcm.c | 8 +- sound/firewire/motu/motu-stream.c | 2 +- sound/firewire/oxfw/oxfw-pcm.c | 8 +- sound/firewire/oxfw/oxfw-stream.c | 2 +- sound/firewire/tascam/tascam-pcm.c | 8 +- sound/firewire/tascam/tascam-stream.c | 2 +- 18 files changed, 325 insertions(+), 129 deletions(-) -- 2.20.1

2 9

[alsa-devel] [sound:for-next 37/38] include/linux/pci.h:2317:13: error: 'pci_pr3_present' defined but not used
by kbuild test robot 21 Oct '19

21 Oct '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: bacd861452d2be86a4df341b12e32db7dac8021e commit: 52525b7a3cf82adec5c6cf0ecbd23ff228badc94 [37/38] PCI: Add a helper to check Power Resource Requirements _PR3 existence config: sparc64-allmodconfig (attached as .config) compiler: sparc64-linux-gcc (GCC) 7.4.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 52525b7a3cf82adec5c6cf0ecbd23ff228badc94 # save the attached .config to linux build tree GCC_VERSION=7.4.0 make.cross ARCH=sparc64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): In file included from arch/sparc/kernel/iommu.c:20:0: >> include/linux/pci.h:2317:13: error: 'pci_pr3_present' defined but not used [-Werror=unused-function] static bool pci_pr3_present(struct pci_dev *pdev) { return false; } ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors vim +/pci_pr3_present +2317 include/linux/pci.h 2310 2311 void 2312 pci_msi_register_fwnode_provider(struct fwnode_handle *(*fn)(struct device *)); 2313 bool pci_pr3_present(struct pci_dev *pdev); 2314 #else 2315 static inline struct irq_domain * 2316 pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) { return NULL; } > 2317 static bool pci_pr3_present(struct pci_dev *pdev) { return false; } 2318 #endif 2319 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [GIT PULL] ASoC fixes for 5.4
by Mark Brown 21 Oct '19

21 Oct '19

The following changes since commit 147162f575152db80000fb3de26358264768ee9f: ASoC: ti: fix SND_SOC_DM365_VOICE_CODEC dependencies (2019-09-20 12:06:48 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.4-rc4 for you to fetch changes up to 95a32c98055f664f9b3f34c41e153d4dcedd0eff: ASoC: SOF: control: return true when kcontrol values change (2019-10-18 18:09:22 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.4 A collection of fixes that have arrived since the merge window. There are a small number of core fixes here but they are smaller ones around error handling. ---------------------------------------------------------------- Bard Liao (1): ASoC: intel: sof_rt5682: use separate route map for dmic Chuhong Yuan (1): ASoC: Intel: sof-rt5682: add a check for devm_clk_get Dan Carpenter (2): ASoC: soc-component: fix a couple missing error assignments ASoC: topology: Fix a signedness bug in soc_tplg_dapm_widget_create() Daniel Baluta (1): ASoC: simple_card_utils.h: Fix potential multiple redefinition error Dragos Tarcatu (1): ASoC: SOF: control: return true when kcontrol values change Hans de Goede (1): ASoC: core: Fix pcm code debugfs error Jaska Uimonen (3): ASoC: rt5682: add NULL handler to set_jack function ASoC: intel: sof_rt5682: add remove function to disable jack ASoC: intel: bytcr_rt5651: add null check to support_button_press Junya Monden (1): ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting Kai Vehmanen (2): ASoC: SOF: pcm: fix resource leak in hw_free ASoC: SOF: Intel: hda: fix warnings during FW load Keyon Jie (1): ASoC: SOF: topology: fix parse fail issue for byte/bool tuple types Li Xu (1): ASoC: wm_adsp: Fix theoretical NULL pointer for alg_region Liam Girdwood (1): ASoC: SOF: Intel: initialise and verify FW crash dump data. Olivier Moysan (1): ASoC: stm32: sai: fix sysclk management on shutdown Pan Xiuli (1): ASoC: SOF: pcm: harden PCM STOP sequence Pierre-Louis Bossart (1): ASoC: SOF: loader: fix kernel oops on firmware boot failure Ranjani Sridharan (1): ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture Robin Murphy (1): ASoc: rockchip: i2s: Fix RPM imbalance Sathyanarayana Nujella (1): ASoC: max98373: check for device node before parsing Srinivas Kandagatla (1): ASoC: msm8916-wcd-digital: add missing MIX2 path for RX1/2 Stuart Henderson (1): ASoC: wm_adsp: Don't generate kcontrols without READ flags Sylwester Nawrocki (2): ASoC: samsung: arndale: Add missing OF node dereferencing ASoC: wm8994: Do not register inapplicable controls for WM1811 include/sound/simple_card_utils.h | 8 ++--- sound/soc/codecs/max98373.c | 20 +++++++----- sound/soc/codecs/msm8916-wcd-digital.c | 22 +++++++++++++ sound/soc/codecs/rt5651.c | 3 ++ sound/soc/codecs/rt5682.c | 12 +++++-- sound/soc/codecs/wm8994.c | 43 ++++++++++++++---------- sound/soc/codecs/wm_adsp.c | 10 ++++-- sound/soc/intel/boards/sof_rt5682.c | 60 +++++++++++++++++++++++++++++++--- sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++--- sound/soc/sh/rcar/core.c | 1 + sound/soc/soc-pcm.c | 17 +++++++--- sound/soc/soc-topology.c | 2 +- sound/soc/sof/control.c | 26 ++++++++++----- sound/soc/sof/intel/Kconfig | 10 ++++++ sound/soc/sof/intel/bdw.c | 7 ++++ sound/soc/sof/intel/byt.c | 6 ++++ sound/soc/sof/intel/hda-ctrl.c | 12 +++---- sound/soc/sof/intel/hda-loader.c | 1 + sound/soc/sof/intel/hda-stream.c | 45 +++++++++++++++++++++---- sound/soc/sof/intel/hda.c | 7 ++++ sound/soc/sof/intel/hda.h | 5 ++- sound/soc/sof/loader.c | 4 +-- sound/soc/sof/pcm.c | 35 +++++++++++++------- sound/soc/sof/topology.c | 4 ++- sound/soc/stm/stm32_sai_sub.c | 21 ++++++------ 26 files changed, 320 insertions(+), 97 deletions(-)

2 1

[alsa-devel] ALC711 support
by Kailang 21 Oct '19

21 Oct '19

Hi Takashi, Attach patch was support ALC711 HDA mode. BR, Kailang

2 1

[alsa-devel] Question about "957ce0c6b8a1 ASoC: soc-pcm: check symmetry after hw_params"
by S.j. Wang 21 Oct '19

21 Oct '19

Hi Jiada, Mark After this commit "957ce0c6b8a1 ASoC: soc-pcm: check symmetry after hw_params" The soc_pcm_params_symmetry can't take effect, because its position is after the change of cpu_dai->rate. The code of soc_pcm_params_symmetry is: static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { ... if (symmetry && cpu_dai->rate && cpu_dai->rate != rate) { dev_err(rtd->dev, "ASoC: unmatched rate symmetry: %d - %d\n", cpu_dai->rate, rate); return -EINVAL; } ... } This code soc_pcm_hw_params of is: static int soc_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { ... /* store the parameters for each DAIs */ cpu_dai->rate = params_rate(params); cpu_dai->channels = params_channels(params); cpu_dai->sample_bits = snd_pcm_format_physical_width(params_format(params)); snd_soc_dapm_update_dai(substream, params, cpu_dai); ... ret = soc_pcm_params_symmetry(substream, params); if (ret) goto component_err; ... } Is this an issue? Best regards Wang shengjiu

2 1

[alsa-devel] [PATCH v2] dt-bindings: sound: Convert Samsung Exynos Odroid XU3/XU4 audio complex to dt-schema
by Marek Szyprowski 21 Oct '19

21 Oct '19

From: Maciej Falkowski <m.falkowski(a)samsung.com> Convert Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec to newer dt-schema format. 'clocks' property is unneeded in the bindings and is left undefined in 'properties'. 'samsung,audio-widgets' and 'samsung,audio-routing' are optional from driver perspective and they are set as unrequired. Signed-off-by: Maciej Falkowski <m.falkowski(a)samsung.com> [mszyprow: reordered non-standard properties] Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- .../bindings/sound/samsung,odroid.txt | 54 ----------- .../bindings/sound/samsung,odroid.yaml | 91 +++++++++++++++++++ 2 files changed, 91 insertions(+), 54 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.yaml diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.txt b/Documentation/devicetree/bindings/sound/samsung,odroid.txt deleted file mode 100644 index e9da2200e173..000000000000 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.txt +++ /dev/null @@ -1,54 +0,0 @@ -Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec - -Required properties: - - - compatible - "hardkernel,odroid-xu3-audio" - for Odroid XU3 board, - "hardkernel,odroid-xu4-audio" - for Odroid XU4 board (deprecated), - "samsung,odroid-xu3-audio" - for Odroid XU3 board (deprecated), - "samsung,odroid-xu4-audio" - for Odroid XU4 board (deprecated) - - model - the user-visible name of this sound complex - - clocks - should contain entries matching clock names in the clock-names - property - - samsung,audio-widgets - this property specifies off-codec audio elements - like headphones or speakers, for details see widgets.txt - - samsung,audio-routing - a list of the connections between audio - components; each entry is a pair of strings, the first being the - connection's sink, the second being the connection's source; - valid names for sources and sinks are the MAX98090's pins (as - documented in its binding), and the jacks on the board - - For Odroid X2: - "Headphone Jack", "Mic Jack", "DMIC" - - For Odroid U3, XU3: - "Headphone Jack", "Speakers" - - For Odroid XU4: - no entries - -Required sub-nodes: - - - 'cpu' subnode with a 'sound-dai' property containing the phandle of the I2S - controller - - 'codec' subnode with a 'sound-dai' property containing list of phandles - to the CODEC nodes, first entry must be corresponding to the MAX98090 - CODEC and the second entry must be the phandle of the HDMI IP block node - -Example: - -sound { - compatible = "hardkernel,odroid-xu3-audio"; - model = "Odroid-XU3"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "IN1", "Mic Jack", - "Mic Jack", "MICBIAS"; - - cpu { - sound-dai = <&i2s0 0>; - }; - codec { - sound-dai = <&hdmi>, <&max98090>; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml new file mode 100644 index 000000000000..c6b244352d05 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml @@ -0,0 +1,91 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/samsung,odroid.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec + +maintainers: + - Krzysztof Kozlowski <krzk(a)kernel.org> + - Sylwester Nawrocki <s.nawrocki(a)samsung.com> + +properties: + compatible: + oneOf: + - const: hardkernel,odroid-xu3-audio + + - const: hardkernel,odroid-xu4-audio + deprecated: true + + - const: samsung,odroid-xu3-audio + deprecated: true + + - const: samsung,odroid-xu4-audio + deprecated: true + + model: + $ref: /schemas/types.yaml#/definitions/string + description: The user-visible name of this sound complex. + + cpu: + type: object + properties: + sound-dai: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: phandles to the I2S controllers + + codec: + type: object + properties: + sound-dai: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: | + List of phandles to the CODEC nodes, + first entry must be corresponding to the MAX98090 CODEC and + the second entry must be the phandle of the HDMI IP block node. + + samsung,audio-routing: + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + description: | + List of the connections between audio + components; each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source; + valid names for sources and sinks are the MAX98090's pins (as + documented in its binding), and the jacks on the board. + For Odroid X2: "Headphone Jack", "Mic Jack", "DMIC" + For Odroid U3, XU3: "Headphone Jack", "Speakers" + For Odroid XU4: no entries + + samsung,audio-widgets: + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + description: | + This property specifies off-codec audio elements + like headphones or speakers, for details see widgets.txt + +required: + - compatible + - model + - cpu + - codec + +examples: + - | + sound { + compatible = "hardkernel,odroid-xu3-audio"; + model = "Odroid-XU3"; + samsung,audio-routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&hdmi>, <&max98090>; + }; + }; + -- 2.17.1

4 3

[alsa-devel] [PATCH 0/6] soundwire: intel/cadence: simplify PDI handling
by Pierre-Louis Bossart 21 Oct '19

21 Oct '19

These patches were originally submitted as '[RFC PATCH 00/11] soundwire: intel: simplify DAI/PDI handling'. There were no comments received. This series only provides the PDI changes, which makes it simpler to review. The DAI changes will be provided with the complete series for ASoC/SOF integration, which is a larger change. Bard Liao (3): soundwire: intel: fix intel_register_dai PDI offsets and numbers soundwire: intel: remove playback/capture stream_name soundwire: cadence_master: improve PDI allocation Pierre-Louis Bossart (3): soundwire: remove DAI_ID_RANGE definitions soundwire: cadence/intel: simplify PDI/port mapping soundwire: intel: don't filter out PDI0/1 drivers/soundwire/cadence_master.c | 158 +++++++---------------------- drivers/soundwire/cadence_master.h | 34 ++----- drivers/soundwire/intel.c | 155 ++++++---------------------- include/linux/soundwire/sdw.h | 3 - 4 files changed, 73 insertions(+), 277 deletions(-) -- 2.20.1

2 8

[alsa-devel] Fwd: [PATCH 29/46] Input: touchscreen: use wrapper for pxa2xx ac97 registers
by Arnd Bergmann 18 Oct '19

18 Oct '19

On Fri, Oct 18, 2019 at 8:48 PM Dmitry Torokhov <dmitry.torokhov(a)gmail.com> wrote: > > On Fri, Oct 18, 2019 at 05:41:44PM +0200, Arnd Bergmann wrote: > > To avoid a dependency on the pxa platform header files with > > hardcoded registers, change the driver to call a wrapper > > in the pxa2xx-ac97-lib that encapsulates all the other > > ac97 stuff. > > Not supper happy about adding module dependencies. Can we include > mach/regs-ac97.h from include/sound/pxa2xx-lib.h and use static inlines? > Someone needs to include mach/regs-ac97.h in the end... > > Or there is something later in the series that needs it? One of the goals of the series is to completely remove all mach/*.h headers and place them somewhere else, ideally inaccessible to device drivers. In case of mach/regs-ac97.h, the later patch "ASoC: pxa: ac97: use normal MMIO accessors" passes the physical register base address as a platform device resource that gets ioremapped in the ac97 driver, rather than hardcoding the virtual address in a global header. I agree that the exported function is still ugly, but I hope it's enough of an improvement over the previous state that we can do it anyway. If you have any better ideas though, I can give that a try, too. One possibility would be a higher-level interface exported on top of 'struct snd_ac97', but I could not figure out how to do this. Arnd

2 1

[alsa-devel] [PATCH v4 00/10] ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: support WoV
by Tzung-Bi Shih 18 Oct '19

18 Oct '19

This series makes mt6358, cros_ec_codec, and mt8183-mt6358-ts3a227-max98357 support WoV (wake on voice). The first 3 commits are some cleanups and refactors. It looks like breaking the existing interface. But please be noticed that, the cros_ec_codec has not used by any real device yet. The refactor is very necessary to keep the style consistent and for easier to further extend and maintain. platform/chrome: cros_ec: remove unused EC feature ASoC: cros_ec_codec: refactor I2S RX ASoC: cros_ec_codec: extract DMIC EC command from I2S RX The 4th commit extends the feature offered from EC codec. platform/chrome: cros_ec: add common commands for EC codec The 5th commit changes the behavior of setting and getting DMIC gains. ASoC: cros_ec_codec: read max DMIC gain from EC codec The 6th and 7th commit make cros_ec_codec support WoV. ASoC: dt-bindings: cros_ec_codec: add SHM bindings ASoC: cros_ec_codec: support WoV The 8th commit sets necessary registers on mt6358 to support WoV. ASoC: mediatek: mt6358: support WoV The last 2 commit make machine driver mt8183-mt6358-ts3a227-max98357 support WoV if ec-codec is in DTS. ASoC: dt-bindings: mt8183: add ec-codec ASoC: mediatek: mt8183: support WoV Changes from v3: - fix a compile error by adding ifdef https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156750.h… - fix a coccinelle warning https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156754.h… Changes from v2: - rebase upon to "don't use snd_pcm_ops" series https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156170.h… - fix sparse errors https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156328.h… - use "reg" for SHM binding https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156657.h… Changes from v1: - fix a compile error and make kbuild bot happy https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/156315.h… Tzung-Bi Shih (10): platform/chrome: cros_ec: remove unused EC feature ASoC: cros_ec_codec: refactor I2S RX ASoC: cros_ec_codec: extract DMIC EC command from I2S RX platform/chrome: cros_ec: add common commands for EC codec ASoC: cros_ec_codec: read max DMIC gain from EC codec ASoC: dt-bindings: cros_ec_codec: add SHM bindings ASoC: cros_ec_codec: support WoV ASoC: mediatek: mt6358: support WoV ASoC: dt-bindings: mt8183: add ec-codec ASoC: mediatek: mt8183: support WoV .../bindings/sound/google,cros-ec-codec.txt | 24 +- .../sound/mt8183-mt6358-ts3a227-max98357.txt | 3 + drivers/platform/chrome/cros_ec_trace.c | 5 +- .../linux/platform_data/cros_ec_commands.h | 285 ++++- sound/soc/codecs/cros_ec_codec.c | 1128 +++++++++++++---- sound/soc/codecs/mt6358.c | 105 ++ sound/soc/mediatek/Kconfig | 1 + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 70 +- 8 files changed, 1296 insertions(+), 325 deletions(-) -- 2.23.0.700.g56cf767bdb-goog

2 16

[alsa-devel] [PATCH] ASoC: stm32: sai: fix sysclk management on shutdown
by Olivier Moysan 18 Oct '19

18 Oct '19

The commit below, adds a call to sysclk callback on shutdown. This introduces a regression in stm32 SAI driver, as some clock services are called twice, leading to unbalanced calls. Move processing related to mclk from shutdown to sysclk callback. When requested frequency is 0, assume shutdown and release mclk. Fixes: 2458adb8f92a ("SoC: simple-card-utils: set 0Hz to sysclk when shutdown") Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- sound/soc/stm/stm32_sai_sub.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index d7501f88aaa6..a4060813bc74 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -505,10 +505,20 @@ static int stm32_sai_set_sysclk(struct snd_soc_dai *cpu_dai, if (dir == SND_SOC_CLOCK_OUT && sai->sai_mclk) { ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV, - (unsigned int)~SAI_XCR1_NODIV); + freq ? 0 : SAI_XCR1_NODIV); if (ret < 0) return ret; + /* Assume shutdown if requested frequency is 0Hz */ + if (!freq) { + /* Release mclk rate only if rate was actually set */ + if (sai->mclk_rate) { + clk_rate_exclusive_put(sai->sai_mclk); + sai->mclk_rate = 0; + } + return 0; + } + /* If master clock is used, set parent clock now */ ret = stm32_sai_set_parent_clock(sai, freq); if (ret) @@ -1093,15 +1103,6 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, STM_SAI_IMR_REGX, SAI_XIMR_MASK, 0); - regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV, - SAI_XCR1_NODIV); - - /* Release mclk rate only if rate was actually set */ - if (sai->mclk_rate) { - clk_rate_exclusive_put(sai->sai_mclk); - sai->mclk_rate = 0; - } - clk_disable_unprepare(sai->sai_ck); spin_lock_irqsave(&sai->irq_lock, flags); -- 2.17.1

2 1