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

[PATCH v2 00/21] ASoC: replace dpcm_playback/capture to playback/capture_only
by Kuninori Morimoto 05 Jun '23

05 Jun '23

Hi Mark This is v2 patch-set of dpcm_playback/capture flag cleanup. Current ASoC DPCM need dpcm_playback/capture flags to use it. But we are using playback/capture_only flag on Normal/Codec2Codec case. I think these are duplicated, we can share same flags for all cases. On v1 patch-set, we noticed that some DPCM BE Codec valid check breaks compatibility. static int soc_get_playback_capture(...) { ... (A) if (dai_link->dynamic || dai_link->no_pcm) { ... if (dai_link->dpcm_playback) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { (C) if (snd_soc_dai_stream_valid(cpu_dai, stream)) { has_playback = 1; break; } } ... } (A) is for DPCM case, and "dai_link->no_pcm" means BE, (B)/(C) means CPU validation check. In many case, DPCM is like this. FE (dynamic) BE (no_pcm) [CPU/dummy-Codec] - [dummy-CPU/Codec] DPCM FE (dynamic) Codec no check is no problem, because it is dummy DAI. DPCM BE (no_pcm) Codec no check is not good, but checking it might breaks compatibility, because some Codec doesn't have necessary settings (= channels_min). Solving this issue seems not easy, because it is using very complex setting timing. v2 ignores DPCM BE Codec check, same as before, but added comment for it. I hope we can valid check for all cases in some day. v1 -> v2 - Add Reviewed-by - Separate Intel patch - tidyup playback/capture_only flags conversion Link: https://lore.kernel.org/r/87353uqjiu.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/ab3f0c0a-62fd-a468-b3cf-0e4b59bac6ae@linux.intel.… Kuninori Morimoto (21): ASoC: soc-pcm.c: indicate error if stream has no playback no capture ASoC: soc-pcm.c: use dai_link on soc_get_playback_capture() ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture() ASoC: soc-pcm.c: tidyup playback/capture_only at soc_get_playback_capture() ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part1 ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part2 ASoC: soc-pcm.c: cleanup soc_get_playback_capture() ASoC: amd: replace dpcm_playback/capture to playback/capture_only ASoC: fsl: replace dpcm_playback/capture to playback/capture_only ASoC: sof: replace dpcm_playback/capture to playback/capture_only ASoC: meson: replace dpcm_playback/capture to playback/capture_only ASoC: Intel: replace dpcm_playback/capture to playback/capture_only ASoC: samsung: replace dpcm_playback/capture to playback/capture_only ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only ASoC: Intel/avs: replace dpcm_playback/capture to playback/capture_only ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only ASoC: soc-pcm.c: remove dpcm_playback/capture include/sound/soc.h | 4 - sound/soc/amd/acp-da7219-max98357a.c | 20 +-- sound/soc/amd/acp-es8336.c | 2 - sound/soc/amd/acp/acp-mach-common.c | 20 +-- sound/soc/amd/acp3x-rt5682-max9836.c | 6 +- sound/soc/amd/vangogh/acp5x-mach.c | 3 - sound/soc/fsl/fsl-asoc-card.c | 16 +-- sound/soc/fsl/imx-audmix.c | 6 +- sound/soc/fsl/imx-card.c | 4 +- sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 4 - sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 - sound/soc/intel/boards/bdw-rt5677.c | 4 - sound/soc/intel/boards/bdw_rt286.c | 10 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 +++-- sound/soc/intel/boards/bxt_rt298.c | 26 ++-- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +- sound/soc/intel/boards/bytcht_da7213.c | 6 +- sound/soc/intel/boards/bytcht_es8316.c | 6 +- sound/soc/intel/boards/bytcht_nocodec.c | 6 +- sound/soc/intel/boards/bytcr_rt5640.c | 6 +- sound/soc/intel/boards/bytcr_rt5651.c | 6 +- sound/soc/intel/boards/bytcr_wm5102.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 +-- sound/soc/intel/boards/ehl_rt5660.c | 14 +-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++-- sound/soc/intel/boards/hsw_rt5640.c | 10 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 ++-- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 ++++----- sound/soc/intel/boards/kbl_rt5660.c | 18 ++- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 +++---- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++-- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 +-- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 ++-- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 ++-- sound/soc/intel/boards/skl_rt286.c | 26 ++-- sound/soc/intel/boards/sof_cs42l42.c | 12 +- sound/soc/intel/boards/sof_da7219_max98373.c | 16 +-- sound/soc/intel/boards/sof_es8336.c | 8 +- sound/soc/intel/boards/sof_nau8825.c | 12 +- sound/soc/intel/boards/sof_pcm512x.c | 8 +- sound/soc/intel/boards/sof_rt5682.c | 12 +- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_ssp_amp.c | 11 +- sound/soc/intel/boards/sof_wm8804.c | 2 - sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 +-- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++-- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++--- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++--- .../mt8186/mt8186-mt6366-da7219-max98357.c | 86 +++++-------- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 86 +++++-------- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 48 ++++---- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++------ sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++---- sound/soc/meson/axg-card.c | 8 +- sound/soc/meson/meson-card-utils.c | 4 +- sound/soc/samsung/odroid.c | 10 +- sound/soc/soc-compress.c | 11 +- sound/soc/soc-core.c | 20 +-- sound/soc/soc-dai.c | 6 +- sound/soc/soc-pcm.c | 114 +++++++----------- sound/soc/soc-topology-test.c | 2 - sound/soc/soc-topology.c | 4 +- sound/soc/sof/nocodec.c | 4 - 84 files changed, 511 insertions(+), 842 deletions(-) -- 2.25.1

3 28

[PATCH v1 00/43] ep93xx device tree conversion
by Nikita Shubin 04 Jun '23

04 Jun '23

This series aims to convert ep93xx from platform to full device tree support. Alexander, Kris - there are some significant changes in clk and pinctrl so can i ask you to tests all once again. So i am not applying: Tested-by: Michael Peters <mpeters(a)embeddedTS.com> Reviewed-by: Kris Bahnsen <kris(a)embeddedTS.com> Tags yet. Major changes from v0 to v1: - I totally forgot to include dts bindings for USB, they are working, including in this version - retinkered ep93xx keypad, the stange thing about it that it always used zeroed platform data from the very beginning - my first impulse was to remove it entirely, espesially it's ep9307+ variant, which Alexander and me doesn't have - major YAML bindings overhaul according to Krzysztof comments - nand helper converted to LEGACY nand controller - cleanup clk - cleanup pinctrl Sorry if i missed something, first time handling such a big (at least for me) chunk of patches. Next version should be much faster spin. Alexandre Belloni: st,m48t86 is totally trivial, but it has 2 regs instead of one, so dt_binding_check doesn't allow it in trivial.yaml, regs should be increased to "maxItems: 2" Miquel Raynal: Currently made it LEGACY as a more easier way for now, as this series will merge - it will be much easier to cleanup the rest one by one, i hope it's ok. Stephen Boyd: Majory of issues fixed, but: - removing dma from init section requires converting it from half dt/platform monstrosity into fully dt compatible - i would like to have ep93xx_clk_data and ep93xx_map global for now - they can be removed once dma subsys_initcall removed Andrew Lunn: I've tinkered with the preferred way, however this involves turning on - CONFIG_PHYLIB - CONFIG_MDIO_DEVICE And maybe CONFIG_MICREL_PHY (at least for me, unless i can use some common phy driver) which implies a kernel size increase - which is undesirable for us. Can we slip by getting phyid directly from device tree in ep93xx_eth ? Link: https://lore.kernel.org/all/20230424123522.18302-1-nikita.shubin@maquefel.m… Cc: kris(a)embeddedTS.com Alexander Sverdlin (3): ARM: dts: ep93xx: Add I2S and AC97 nodes ARM: dts: ep93xx: Add EDB9302 DT ASoC: cirrus: edb93xx: Delete driver Nikita Shubin (40): gpio: ep93xx: split device in multiple dt-bindings: soc: Add Cirrus EP93xx soc: Add SoC driver for Cirrus ep93xx dt-bindings: clock: Add Cirrus EP93xx clk: ep93xx: add DT support for Cirrus EP93xx dt-bindings: pinctrl: Add Cirrus EP93xx pinctrl: add a Cirrus ep93xx SoC pin controller dt-bindings: timers: Add Cirrus EP93xx clocksource: ep93xx: Add driver for Cirrus Logic EP93xx dt-bindings: rtc: Add Cirrus EP93xx rtc: ep93xx: add DT support for Cirrus EP93xx dt-bindings: watchdog: Add Cirrus EP93x watchdog: ep93xx: add DT support for Cirrus EP93xx power: reset: Add a driver for the ep93xx reset dt-bindings: pwm: Add Cirrus EP93xx pwm: ep93xx: add DT support for Cirrus EP93xx dt-bindings: spi: Add Cirrus EP93xx spi: ep93xx: add DT support for Cirrus EP93xx dt-bindings: net: Add Cirrus EP93xx net: cirrus: add DT support for Cirrus EP93xx dt-bindings: dma: Add Cirrus EP93xx dma: cirrus: add DT support for Cirrus EP93xx dt-bindings: mtd: Add ts7250 nand-controller mtd: nand: add support for ts72xx dt-bindings: ata: Add Cirrus EP93xx pata: cirrus: add DT support for Cirrus EP93xx dt-bindings: input: Add Cirrus EP93xx keypad input: keypad: ep93xx: add DT support for Cirrus EP93xx dt-bindings: rtc: Add ST M48T86 rtc: m48t86: add DT support for m48t86 dt-bindings: wdt: Add ts72xx wdt: ts72xx: add DT support for ts72xx dt-bindings: gpio: Add Cirrus EP93xx gpio: ep93xx: add DT support for gpio-ep93xx ARM: dts: add device tree for ep93xx Soc ARM: ep93xx: DT for the Cirrus ep93xx SoC platforms pwm: ep93xx: drop legacy pinctrl pata: cirrus: drop legacy pinctrl ARM: ep93xx: delete all boardfiles ARM: ep93xx: soc: drop defines .../devicetree/bindings/arm/ep93xx.yaml | 107 ++ .../bindings/ata/cirrus,ep9312-pata.yaml | 44 + .../bindings/clock/cirrus,ep9301.yaml | 64 + .../bindings/dma/cirrus,ep9301-dma-m2m.yaml | 72 + .../bindings/dma/cirrus,ep9301-dma-m2p.yaml | 124 ++ .../devicetree/bindings/gpio/gpio-ep9301.yaml | 154 ++ .../bindings/input/cirrus,ep9307-keypad.yaml | 86 + .../bindings/mtd/technologic,nand.yaml | 47 + .../bindings/net/cirrus,ep9301-eth.yaml | 61 + .../pinctrl/cirrus,ep9301-pinctrl.yaml | 66 + .../bindings/pwm/cirrus,ep9301-pwm.yaml | 48 + .../bindings/rtc/cirrus,ep9301-rtc.yaml | 40 + .../bindings/rtc/st,m48t86-rtc.yaml | 38 + .../devicetree/bindings/spi/spi-ep9301.yaml | 69 + .../bindings/timer/cirrus,ep9301-timer.yaml | 49 + .../bindings/watchdog/cirrus,ep9301-wdt.yaml | 46 + .../watchdog/technologic,ts7200-wdt.yaml | 46 + arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/ep93xx-bk3.dts | 119 ++ arch/arm/boot/dts/ep93xx-edb9302.dts | 160 ++ arch/arm/boot/dts/ep93xx-ts7250.dts | 132 ++ arch/arm/boot/dts/ep93xx.dtsi | 477 +++++ arch/arm/mach-ep93xx/Kconfig | 20 +- arch/arm/mach-ep93xx/Makefile | 11 - arch/arm/mach-ep93xx/clock.c | 733 -------- arch/arm/mach-ep93xx/core.c | 1017 ---------- arch/arm/mach-ep93xx/dma.c | 114 -- arch/arm/mach-ep93xx/edb93xx.c | 344 ---- arch/arm/mach-ep93xx/ep93xx-regs.h | 38 - arch/arm/mach-ep93xx/gpio-ep93xx.h | 111 -- arch/arm/mach-ep93xx/hardware.h | 25 - arch/arm/mach-ep93xx/irqs.h | 76 - arch/arm/mach-ep93xx/platform.h | 42 - arch/arm/mach-ep93xx/soc.h | 212 --- arch/arm/mach-ep93xx/ts72xx.c | 422 ----- arch/arm/mach-ep93xx/ts72xx.h | 94 - arch/arm/mach-ep93xx/vision_ep9307.c | 311 --- drivers/ata/pata_ep93xx.c | 33 +- drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk-ep93xx.c | 850 +++++++++ drivers/clocksource/Kconfig | 11 + drivers/clocksource/Makefile | 1 + .../clocksource}/timer-ep93xx.c | 141 +- drivers/dma/ep93xx_dma.c | 136 +- drivers/gpio/gpio-ep93xx.c | 329 ++-- drivers/input/keyboard/ep93xx_keypad.c | 78 +- drivers/mtd/nand/raw/Kconfig | 7 + drivers/mtd/nand/raw/Makefile | 1 + .../nand/raw/technologic-nand-controller.c | 151 ++ drivers/net/ethernet/cirrus/ep93xx_eth.c | 67 +- drivers/pinctrl/Kconfig | 7 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-ep93xx.c | 1672 +++++++++++++++++ drivers/power/reset/Kconfig | 10 + drivers/power/reset/Makefile | 1 + drivers/power/reset/ep93xx-restart.c | 65 + drivers/pwm/pwm-ep93xx.c | 26 +- drivers/rtc/rtc-ep93xx.c | 8 + drivers/rtc/rtc-m48t86.c | 8 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/cirrus/Kconfig | 11 + drivers/soc/cirrus/Makefile | 2 + drivers/soc/cirrus/soc-ep93xx.c | 134 ++ drivers/spi/spi-ep93xx.c | 31 +- drivers/watchdog/ep93xx_wdt.c | 8 + drivers/watchdog/ts72xx_wdt.c | 8 + .../dt-bindings/clock/cirrus,ep93xx-clock.h | 53 + include/linux/platform_data/dma-ep93xx.h | 3 + include/linux/platform_data/eth-ep93xx.h | 10 - include/linux/platform_data/keypad-ep93xx.h | 32 - include/linux/soc/cirrus/ep93xx.h | 40 +- sound/soc/cirrus/Kconfig | 9 - sound/soc/cirrus/Makefile | 4 - sound/soc/cirrus/edb93xx.c | 117 -- 77 files changed, 5575 insertions(+), 4122 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/ep93xx.yaml create mode 100644 Documentation/devicetree/bindings/ata/cirrus,ep9312-pata.yaml create mode 100644 Documentation/devicetree/bindings/clock/cirrus,ep9301.yaml create mode 100644 Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2m.yaml create mode 100644 Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2p.yaml create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ep9301.yaml create mode 100644 Documentation/devicetree/bindings/input/cirrus,ep9307-keypad.yaml create mode 100644 Documentation/devicetree/bindings/mtd/technologic,nand.yaml create mode 100644 Documentation/devicetree/bindings/net/cirrus,ep9301-eth.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,ep9301-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pwm/cirrus,ep9301-pwm.yaml create mode 100644 Documentation/devicetree/bindings/rtc/cirrus,ep9301-rtc.yaml create mode 100644 Documentation/devicetree/bindings/rtc/st,m48t86-rtc.yaml create mode 100644 Documentation/devicetree/bindings/spi/spi-ep9301.yaml create mode 100644 Documentation/devicetree/bindings/timer/cirrus,ep9301-timer.yaml create mode 100644 Documentation/devicetree/bindings/watchdog/cirrus,ep9301-wdt.yaml create mode 100644 Documentation/devicetree/bindings/watchdog/technologic,ts7200-wdt.yaml create mode 100644 arch/arm/boot/dts/ep93xx-bk3.dts create mode 100644 arch/arm/boot/dts/ep93xx-edb9302.dts create mode 100644 arch/arm/boot/dts/ep93xx-ts7250.dts create mode 100644 arch/arm/boot/dts/ep93xx.dtsi delete mode 100644 arch/arm/mach-ep93xx/Makefile delete mode 100644 arch/arm/mach-ep93xx/clock.c delete mode 100644 arch/arm/mach-ep93xx/core.c delete mode 100644 arch/arm/mach-ep93xx/dma.c delete mode 100644 arch/arm/mach-ep93xx/edb93xx.c delete mode 100644 arch/arm/mach-ep93xx/ep93xx-regs.h delete mode 100644 arch/arm/mach-ep93xx/gpio-ep93xx.h delete mode 100644 arch/arm/mach-ep93xx/hardware.h delete mode 100644 arch/arm/mach-ep93xx/irqs.h delete mode 100644 arch/arm/mach-ep93xx/platform.h delete mode 100644 arch/arm/mach-ep93xx/soc.h delete mode 100644 arch/arm/mach-ep93xx/ts72xx.c delete mode 100644 arch/arm/mach-ep93xx/ts72xx.h delete mode 100644 arch/arm/mach-ep93xx/vision_ep9307.c create mode 100644 drivers/clk/clk-ep93xx.c rename {arch/arm/mach-ep93xx => drivers/clocksource}/timer-ep93xx.c (52%) create mode 100644 drivers/mtd/nand/raw/technologic-nand-controller.c create mode 100644 drivers/pinctrl/pinctrl-ep93xx.c create mode 100644 drivers/power/reset/ep93xx-restart.c create mode 100644 drivers/soc/cirrus/Kconfig create mode 100644 drivers/soc/cirrus/Makefile create mode 100644 drivers/soc/cirrus/soc-ep93xx.c create mode 100644 include/dt-bindings/clock/cirrus,ep93xx-clock.h delete mode 100644 include/linux/platform_data/eth-ep93xx.h delete mode 100644 include/linux/platform_data/keypad-ep93xx.h delete mode 100644 sound/soc/cirrus/edb93xx.c -- 2.37.4

2 1

[PATCH] ASoC: simple-card-utils: fix PCM constraint error check
by Robert Hancock 02 Jun '23

02 Jun '23

The code in asoc_simple_startup was treating any non-zero return from snd_pcm_hw_constraint_minmax as an error, when this can return 1 in some normal cases and only negative values indicate an error. When this happened, it caused asoc_simple_startup to disable the clocks it just enabled and return 1, which was not treated as an error by the calling code which only checks for negative return values. Then when the PCM is eventually shut down, it causes the clock framework to complain about disabling clocks that were not enabled. Fix the check for snd_pcm_hw_constraint_minmax return value to only treat negative values as an error. Fixes: 5ca2ab459817 ("ASoC: simple-card-utils: Add new system-clock-fixed flag") Signed-off-by: Robert Hancock <robert.hancock(a)calian.com> --- sound/soc/generic/simple-card-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 467edd96eae5..e5ff61c1e9d1 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -314,7 +314,7 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) } ret = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE, fixed_rate, fixed_rate); - if (ret) + if (ret < 0) goto codec_err; } -- 2.40.1

2 1

[PATCH] ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted
by Chancel Liu 02 Jun '23

02 Jun '23

There's an issue on SAI synchronous mode that TX/RX side can't get BCLK from RX/TX it sync with if BYP bit is asserted. It's a workaround to fix it that enable SION of IOMUX pad control and assert BCI. For example if TX sync with RX which means both TX and RX are using clk form RX and BYP=1. TX can get BCLK only if the following two conditions are valid: 1. SION of RX BCLK IOMUX pad is set to 1 2. BCI of TX is set to 1 Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/fsl/fsl_sai.c | 11 +++++++++-- sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index d9344025dc16..5e09f634c61b 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -491,14 +491,21 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_MSEL_MASK, FSL_SAI_CR2_MSEL(sai->mclk_id[tx])); - if (savediv == 1) + if (savediv == 1) { regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_DIV_MASK | FSL_SAI_CR2_BYP, FSL_SAI_CR2_BYP); - else + if (fsl_sai_dir_is_synced(sai, adir)) + regmap_update_bits(sai->regmap, FSL_SAI_xCR2(tx, ofs), + FSL_SAI_CR2_BCI, FSL_SAI_CR2_BCI); + else + regmap_update_bits(sai->regmap, FSL_SAI_xCR2(tx, ofs), + FSL_SAI_CR2_BCI, 0); + } else { regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_DIV_MASK | FSL_SAI_CR2_BYP, savediv / 2 - 1); + } if (sai->soc_data->max_register >= FSL_SAI_MCTL) { /* SAI is in master mode at this point, so enable MCLK */ diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 3eb994aef36a..8254c3547b87 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -116,6 +116,7 @@ /* SAI Transmit and Receive Configuration 2 Register */ #define FSL_SAI_CR2_SYNC BIT(30) +#define FSL_SAI_CR2_BCI BIT(28) #define FSL_SAI_CR2_MSEL_MASK (0x3 << 26) #define FSL_SAI_CR2_MSEL_BUS 0 #define FSL_SAI_CR2_MSEL_MCLK1 BIT(26) -- 2.25.1

3 2

configure: Update for autoconf 2.71
by GitHub pull_request - opened 02 Jun '23

02 Jun '23

alsa-project/alsa-lib pull request #324 was opened from phodina: Hi, this is an update due to Alpine Linux packaging only `autoconf-2.71-r2` so that the https://github.com/alsa-project/alsa-lib/pull/308 could be tested. Request URL : https://github.com/alsa-project/alsa-lib/pull/324 Patch URL : https://github.com/alsa-project/alsa-lib/pull/324.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: SOF: ipc4-topology: Use size_t for variable passed to kzalloc()
by Christophe JAILLET 02 Jun '23

02 Jun '23

struct_size() checks for overflow, but assigning its result to just a u32 may still overflow after a successful check. Use a size_t instead in order to be cleaner. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- Based on analysis from Dan Carpenter on another patch (see [1]). [1]: https://lore.kernel.org/all/00e84595-e2c9-48ea-8737-18da34eaafbf@kili.mount… --- sound/soc/sof/ipc4-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index db64e0cb8663..50faa4c88b97 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -881,7 +881,7 @@ static int sof_ipc4_widget_setup_comp_process(struct snd_sof_widget *swidget) /* allocate memory for base config extension if needed */ if (process->init_config == SOF_IPC4_MODULE_INIT_CONFIG_TYPE_BASE_CFG_WITH_EXT) { struct sof_ipc4_base_module_cfg_ext *base_cfg_ext; - u32 ext_size = struct_size(base_cfg_ext, pin_formats, + size_t ext_size = struct_size(base_cfg_ext, pin_formats, swidget->num_input_pins + swidget->num_output_pins); base_cfg_ext = kzalloc(ext_size, GFP_KERNEL); -- 2.34.1

3 3

[PATCH 1/4] soundwire: stream: Add missing clear of alloc_slave_rt
by Charles Keepax 02 Jun '23

02 Jun '23

The current path that skips allocating the slave runtime does not clear the alloc_slave_rt flag, this is clearly incorrect. Add the missing clear, so the runtime won't be erroneously cleaned up. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- drivers/soundwire/stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index c2191c07442b0..379228f221869 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -2021,8 +2021,10 @@ int sdw_stream_add_slave(struct sdw_slave *slave, skip_alloc_master_rt: s_rt = sdw_slave_rt_find(slave, stream); - if (s_rt) + if (s_rt) { + alloc_slave_rt = false; goto skip_alloc_slave_rt; + } s_rt = sdw_slave_rt_alloc(slave, m_rt); if (!s_rt) { -- 2.30.2

2 9

GSequencer enters MIDI awards a second time
by Joël Krähemann 02 Jun '23

02 Jun '23

Hi all, Please check and vote for your favorite sequencer: https://www.midi.org/component/zoo/item/advanced-gtk-sequencer-2?Itemid=1423 cheers, Joël http://gsequencer.org

1 0

[PATCH] ALSA: hda/realtek: Add Lenovo P3 Tower platform
by RenHai 02 Jun '23

02 Jun '23

Headset microphone on this platform does not work without ALC897_FIXUP_HEADSET_MIC_PIN fixup. Signed-off-by: RenHai <kean0048(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7b5f194513c7..d0b44cb6f41f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -11715,6 +11715,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x14cd, 0x5003, "USI", ALC662_FIXUP_USI_HEADSET_MODE), SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS), SND_PCI_QUIRK(0x17aa, 0x1057, "Lenovo P360", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x1064, "Lenovo P3 Tower", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32ca, "Lenovo ThinkCentre M80", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), -- 2.25.1

1 0

[PATCH 1/2] ASoC: max98363: Removed 32bit support
by “Ryan 01 Jun '23

01 Jun '23

From: Ryan Lee <ryans.lee(a)analog.com> MAX98363 does not support 32bit depth audio. Removed 32bit from the supported format list. Instead, added 16bit and 24bit to the list. Signed-off-by: Ryan Lee <ryans.lee(a)analog.com> --- sound/soc/codecs/max98363.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/max98363.c b/sound/soc/codecs/max98363.c index 4585ebb1e82c..8aa9d9c67aa2 100644 --- a/sound/soc/codecs/max98363.c +++ b/sound/soc/codecs/max98363.c @@ -211,7 +211,7 @@ static int max98363_io_init(struct sdw_slave *slave) } #define MAX98363_RATES SNDRV_PCM_RATE_8000_192000 -#define MAX98363_FORMATS (SNDRV_PCM_FMTBIT_S32_LE) +#define MAX98363_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) static int max98363_sdw_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, -- 2.34.1

2 2