April 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH 1/2] Revert "ASoC: meson: axg-tdm-interface: manage formatters in trigger"
by Neil Armstrong 22 Apr '22

22 Apr '22

This reverts commit bf5e4887eeddb48480568466536aa08ec7f179a5 because the following and required commit e138233e56e9829e65b6293887063a1a3ccb2d68 causes the following system crash when using audio: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:282 Reported-by: Dmitry Shmidt <dimitrysh(a)google.com> Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> --- sound/soc/meson/axg-tdm-interface.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index 0c31934a9630..e076ced30025 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -351,29 +351,13 @@ static int axg_tdm_iface_hw_free(struct snd_pcm_substream *substream, return 0; } -static int axg_tdm_iface_trigger(struct snd_pcm_substream *substream, - int cmd, +static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct axg_tdm_stream *ts = - snd_soc_dai_get_dma_data(dai, substream); - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - axg_tdm_stream_start(ts); - break; - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - case SNDRV_PCM_TRIGGER_STOP: - axg_tdm_stream_stop(ts); - break; - default: - return -EINVAL; - } + struct axg_tdm_stream *ts = snd_soc_dai_get_dma_data(dai, substream); - return 0; + /* Force all attached formatters to update */ + return axg_tdm_stream_reset(ts); } static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai) @@ -413,8 +397,8 @@ static const struct snd_soc_dai_ops axg_tdm_iface_ops = { .set_fmt = axg_tdm_iface_set_fmt, .startup = axg_tdm_iface_startup, .hw_params = axg_tdm_iface_hw_params, + .prepare = axg_tdm_iface_prepare, .hw_free = axg_tdm_iface_hw_free, - .trigger = axg_tdm_iface_trigger, }; /* TDM Backend DAIs */ -- 2.25.1

3 6

[PATCH V2 1/2] ASoC: dt-bindings: max98396: add amplifier driver
by Ryan Lee 22 Apr '22

22 Apr '22

From: Ryan Lee <ryans.lee(a)analog.com> This patch adds dt-bindings information for Analog Devices MAX98396 and MAX98397 Smart Amplifier. Signed-off-by: Ryan Lee <ryans.lee(a)analog.com> --- Changes from v1: Fixed yamllint/dtschema/dtc warnings and errors .../bindings/sound/adi,max98396.yaml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/adi,max98396.yaml diff --git a/Documentation/devicetree/bindings/sound/adi,max98396.yaml b/Documentation/devicetree/bindings/sound/adi,max98396.yaml new file mode 100644 index 000000000000..ec4c10c2598a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,max98396.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/adi,max98396.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices MAX98396 Speaker Amplifier Device Tree Bindings + +maintainers: + - Ryan Lee <ryans.lee(a)analog.com> + +description: + The MAX98396 is a mono Class-DG speaker amplifier with I/V sense. + The device provides a PCM interface for audio data and a standard + I2C interface for control data communication. + The MAX98397 is a variant of MAX98396 with wide input supply range. + +properties: + compatible: + enum: + - adi,max98396 + - adi,max98397 + reg: + maxItems: 1 + description: I2C address of the device. + + adi,vmon-slot-no: + description: slot number of the voltage sense monitor + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 15 + default: 0 + + adi,imon-slot-no: + description: slot number of the current sense monitor + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 15 + default: 0 + + adi,spkfb-slot-no: + description: slot number of speaker DSP monitor + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 15 + default: 0 + + adi,interleave-mode: + description: + For cases where a single combined channel for the I/V sense data + is not sufficient, the device can also be configured to share + a single data output channel on alternating frames. + In this configuration, the current and voltage data will be frame + interleaved on a single output channel. + type: boolean + + reset-gpios: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + max98396: amplifier@39 { + compatible = "adi,max98396"; + reg = <0x39>; + adi,vmon-slot-no = <0>; + adi,imon-slot-no = <1>; + reset-gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + }; -- 2.25.1

2 2

[PATCH -next V2] sound/oss/dmasound: fix 'dmasound_setup' defined but not used
by Miles Chen 22 Apr '22

22 Apr '22

We observed: 'dmasound_setup' defined but not used error with COMPILER=gcc ARCH=m68k DEFCONFIG=allmodconfig build. Fix it by adding __maybe_unused to dmasound_setup. Error(s): sound/oss/dmasound/dmasound_core.c:1431:12: error: 'dmasound_setup' defined but not used [-Werror=unused-function] Fixes: 9dd7c46346ca ("sound/oss/dmasound: fix build when drivers are mixed =y/=m") Signed-off-by: Miles Chen <miles.chen(a)mediatek.com> Cc: Takashi Iwai <tiwai(a)suse.com> --- Change sinve v1: add fixes tag use __maybe_unused --- sound/oss/dmasound/dmasound_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index 9c48f3a9e3d1..164335d3c200 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -1428,7 +1428,7 @@ void dmasound_deinit(void) unregister_sound_dsp(sq_unit); } -static int dmasound_setup(char *str) +static int __maybe_unused dmasound_setup(char *str) { int ints[6], size; -- 2.18.0

3 4

[PATCH 00/41] OMAP1 full multiplatform conversion
by Arnd Bergmann 22 Apr '22

22 Apr '22

From: Arnd Bergmann <arnd(a)arndb.de> This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining). Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken. The fbdev, mmc and ASoC portion of Janusz' work already went into the corresponding maintainer tree, but I include them here for reference. Unless there are any objections, I would add the entire series to the for-next branch of the soc tree, but only send the first 36 patches early in the merge window. After everything else has made it in, I would rebase the last two patches and send them separately, which may or may not make it in the merge window. Arnd Arnd Bergmann (30): video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning ARM: omap1: innovator: pass lcd control address as pdata ARM: omap1: move lcd_dma code into omapfb driver ARM: omap1: declare a dummy omap_set_dma_priority fbdev: omap: pass irqs as resource ARM: omap1: ams-delta: remove camera leftovers ARM: omap1: move mach/usb.h to include/linux/soc ARM: omap1: move some headers to include/linux/soc ARM: omap1: move perseus spi pinconf to board file ARM: omap1: move CF chipselect setup to board file fbdev: omap: avoid using mach/*.h files usb: omap: avoid mach/*.h headers clocksource: ti-dmtimer: avoid using mach/hardware.h serial: 8250/omap1: include linux/soc/ti/omap1-soc.h input: omap: void using mach/*.h headers ARM: omap1: innovator: move ohci phy power handling to board file ARM: omap1: move 32k counter from plat-omap to mach-omap1 ARM: omap: remove debug-leds driver ARM: omap: dma: make usb support optional dma: omap: hide legacy interface ARM: omap1: dma: remove omap2 specific bits ARM: omap1: move plat/dma.c to mach/omap-dma.c ARM: omap: split up arch/arm/plat-omap/Kconfig ARM: omap: un-merge plat/sram.c ARM: omap: remove empty plat-omap directory ARM: omap1: relocate static I/O mapping ARM: omap1: use pci_remap_iospace() for omap_cf ARM: omap1: move mach/*.h into mach directory ARM: omap1: fix build with no SoC selected [TO BE REBASED] ARM: omap1: enable multiplatform Janusz Krzysztofik (11): ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF ARM: OMAP1: clock: Fix early UART rate issues ARM: OMAP1: clock: Fix UART rate reporting algorithm ARM: OMAP1: clock: Remove unused code ARM: OMAP1: clock: Remove noop code usb: host: ohci-omap: Make it CCF clk API compatible usb: gadget: omap_udc: Make it CCF clk API compatible [MERGED] video: fbdev: omap: Make it CCF clk API compatible [MERGED] mmc: omap: Make it CCF clk API compatible [MERGED] ASoC: ti: osk5912: Make it CCF clk API compatible [TO BE REBASED] ARM: OMAP1: clock: Convert to CCF arch/arm/Kconfig | 16 - arch/arm/Kconfig.debug | 6 +- arch/arm/Makefile | 1 - arch/arm/configs/omap1_defconfig | 3 + arch/arm/mach-omap1/Kconfig | 72 ++ arch/arm/mach-omap1/Makefile | 6 +- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- arch/arm/mach-omap1/ams-delta-fiq.c | 2 + arch/arm/mach-omap1/ams-delta-fiq.h | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 18 +- arch/arm/mach-omap1/board-fsample.c | 10 +- arch/arm/mach-omap1/board-generic.c | 8 +- arch/arm/mach-omap1/board-h2.c | 14 +- arch/arm/mach-omap1/board-h3.c | 16 +- arch/arm/mach-omap1/board-htcherald.c | 10 +- arch/arm/mach-omap1/board-innovator.c | 34 +- arch/arm/mach-omap1/board-nokia770.c | 8 +- arch/arm/mach-omap1/board-osk.c | 49 +- arch/arm/mach-omap1/board-palmte.c | 14 +- arch/arm/mach-omap1/board-palmtt.c | 14 +- arch/arm/mach-omap1/board-palmz71.c | 14 +- arch/arm/mach-omap1/board-perseus2.c | 15 +- arch/arm/mach-omap1/board-sx1-mmc.c | 3 +- arch/arm/mach-omap1/board-sx1.c | 12 +- arch/arm/mach-omap1/clock.c | 797 +++++++----------- arch/arm/mach-omap1/clock.h | 191 ++--- arch/arm/mach-omap1/clock_data.c | 508 +++++------ arch/arm/mach-omap1/common.h | 3 +- arch/arm/mach-omap1/devices.c | 12 +- arch/arm/mach-omap1/dma.c | 2 +- arch/arm/mach-omap1/fb.c | 19 +- arch/arm/mach-omap1/flash.c | 5 +- arch/arm/mach-omap1/fpga.c | 3 +- arch/arm/mach-omap1/gpio15xx.c | 3 +- arch/arm/mach-omap1/gpio16xx.c | 5 +- arch/arm/mach-omap1/gpio7xx.c | 3 +- .../mach-omap1/{include/mach => }/hardware.h | 136 +-- arch/arm/mach-omap1/i2c.c | 3 +- arch/arm/mach-omap1/id.c | 5 +- arch/arm/mach-omap1/include/mach/io.h | 45 - arch/arm/mach-omap1/include/mach/lcdc.h | 44 - arch/arm/mach-omap1/include/mach/memory.h | 12 - arch/arm/mach-omap1/include/mach/uncompress.h | 117 --- arch/arm/mach-omap1/io.c | 12 +- arch/arm/mach-omap1/irq.c | 4 +- arch/arm/mach-omap1/{include/mach => }/irqs.h | 2 - arch/arm/mach-omap1/mcbsp.c | 17 +- .../mach-omap1/{include/mach => }/mtd-xip.h | 3 +- arch/arm/mach-omap1/mux.c | 6 +- arch/arm/mach-omap1/mux.h | 144 ++++ arch/arm/mach-omap1/ocpi.c | 8 +- .../dma.c => mach-omap1/omap-dma.c} | 259 ++---- .../mach-omap1/{include/mach => }/omap1510.h | 0 .../mach-omap1/{include/mach => }/omap16xx.h | 0 .../mach-omap1/{include/mach => }/omap7xx.h | 0 arch/arm/mach-omap1/pm.c | 9 +- arch/arm/mach-omap1/pm.h | 2 + arch/arm/mach-omap1/reset.c | 3 +- arch/arm/mach-omap1/serial.c | 10 +- .../mach-omap1/{include/mach => }/serial.h | 0 arch/arm/mach-omap1/sleep.S | 2 +- arch/arm/mach-omap1/soc.h | 6 +- arch/arm/mach-omap1/sram-init.c | 91 +- arch/arm/mach-omap1/sram.S | 4 +- arch/arm/mach-omap1/sram.h | 4 +- arch/arm/mach-omap1/{include/mach => }/tc.h | 2 - arch/arm/mach-omap1/time.c | 7 +- arch/arm/mach-omap1/timer.c | 1 + arch/arm/mach-omap1/timer32k.c | 100 ++- arch/arm/mach-omap1/usb.c | 8 +- arch/arm/mach-omap1/usb.h | 25 + arch/arm/mach-omap2/Kconfig | 49 ++ arch/arm/mach-omap2/sram.c | 91 +- arch/arm/mach-omap2/sram.h | 5 +- arch/arm/plat-omap/Kconfig | 119 --- arch/arm/plat-omap/Makefile | 13 - arch/arm/plat-omap/counter_32k.c | 114 --- arch/arm/plat-omap/debug-leds.c | 171 ---- arch/arm/plat-omap/include/plat/counter-32k.h | 1 - arch/arm/plat-omap/include/plat/cpu.h | 21 - arch/arm/plat-omap/include/plat/sram.h | 8 - arch/arm/plat-omap/sram.c | 129 --- drivers/clocksource/timer-ti-dm.c | 2 +- drivers/dma/ti/omap-dma.c | 19 +- drivers/input/keyboard/omap-keypad.c | 1 + drivers/mmc/host/omap.c | 23 +- drivers/pcmcia/Kconfig | 3 +- drivers/pcmcia/omap_cf.c | 48 +- drivers/spi/Kconfig | 2 +- drivers/spi/spi-omap-uwire.c | 15 +- drivers/tty/serial/8250/8250.h | 1 + drivers/usb/gadget/udc/omap_udc.c | 19 +- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ohci-omap.c | 60 +- drivers/usb/phy/Kconfig | 3 +- drivers/usb/phy/phy-isp1301-omap.c | 6 +- drivers/video/backlight/Kconfig | 4 +- drivers/video/backlight/omap1_bl.c | 4 +- drivers/video/fbdev/Makefile | 2 +- drivers/video/fbdev/omap/Kconfig | 4 +- drivers/video/fbdev/omap/Makefile | 5 + drivers/video/fbdev/omap/hwa742.c | 6 +- drivers/video/fbdev/omap/lcd_ams_delta.c | 5 +- .../video/fbdev/omap}/lcd_dma.c | 7 +- .../video/fbdev/omap}/lcd_dma.h | 2 - drivers/video/fbdev/omap/lcd_inn1510.c | 9 +- drivers/video/fbdev/omap/lcd_osk.c | 4 +- drivers/video/fbdev/omap/lcdc.c | 16 +- drivers/video/fbdev/omap/lcdc.h | 35 + drivers/video/fbdev/omap/omapfb.h | 2 + drivers/video/fbdev/omap/omapfb_main.c | 19 +- drivers/video/fbdev/omap/sossi.c | 9 +- include/linux/omap-dma.h | 28 +- include/linux/platform_data/usb-omap1.h | 2 + include/linux/soc/ti/omap1-io.h | 143 ++++ .../mux.h => include/linux/soc/ti/omap1-mux.h | 142 +--- .../soc.h => include/linux/soc/ti/omap1-soc.h | 22 - .../usb.h => include/linux/soc/ti/omap1-usb.h | 28 +- sound/soc/ti/osk5912.c | 4 +- 119 files changed, 1809 insertions(+), 2610 deletions(-) rename arch/arm/mach-omap1/{include/mach => }/hardware.h (59%) delete mode 100644 arch/arm/mach-omap1/include/mach/io.h delete mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h delete mode 100644 arch/arm/mach-omap1/include/mach/memory.h delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h rename arch/arm/mach-omap1/{include/mach => }/irqs.h (99%) rename arch/arm/mach-omap1/{include/mach => }/mtd-xip.h (97%) create mode 100644 arch/arm/mach-omap1/mux.h rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (84%) rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (100%) rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%) rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%) rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%) rename arch/arm/mach-omap1/{include/mach => }/tc.h (98%) create mode 100644 arch/arm/mach-omap1/usb.h delete mode 100644 arch/arm/plat-omap/Kconfig delete mode 100644 arch/arm/plat-omap/Makefile delete mode 100644 arch/arm/plat-omap/counter_32k.c delete mode 100644 arch/arm/plat-omap/debug-leds.c delete mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h delete mode 100644 arch/arm/plat-omap/include/plat/cpu.h delete mode 100644 arch/arm/plat-omap/include/plat/sram.h delete mode 100644 arch/arm/plat-omap/sram.c rename {arch/arm/mach-omap1 => drivers/video/fbdev/omap}/lcd_dma.c (98%) rename {arch/arm/mach-omap1/include/mach => drivers/video/fbdev/omap}/lcd_dma.h (98%) create mode 100644 include/linux/soc/ti/omap1-io.h rename arch/arm/mach-omap1/include/mach/mux.h => include/linux/soc/ti/omap1-mux.h (53%) rename arch/arm/mach-omap1/include/mach/soc.h => include/linux/soc/ti/omap1-soc.h (90%) rename arch/arm/mach-omap1/include/mach/usb.h => include/linux/soc/ti/omap1-usb.h (86%) -- 2.29.2 Cc: Russell King <linux(a)armlinux.org.uk> Cc: Aaro Koskinen <aaro.koskinen(a)iki.fi> Cc: Tony Lindgren <tony(a)atomide.com> Cc: Paul Walmsley <paul(a)pwsan.com> Cc: Kevin Hilman <khilman(a)kernel.org> Cc: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> Cc: Vinod Koul <vkoul(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Ulf Hansson <ulf.hansson(a)linaro.org> Cc: Dominik Brodowski <linux(a)dominikbrodowski.net> Cc: Mark Brown <broonie(a)kernel.org> Cc: Felipe Balbi <balbi(a)kernel.org> Cc: Alan Stern <stern(a)rowland.harvard.edu> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Daniel Thompson <daniel.thompson(a)linaro.org> Cc: Jingoo Han <jingoohan1(a)gmail.com> Cc: Helge Deller <deller(a)gmx.de> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: Janusz Krzysztofik <jmkrzyszt(a)gmail.com> Cc: Krzysztof Kozlowski <krzk(a)kernel.org> Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-omap(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: dmaengine(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-mmc(a)vger.kernel.org Cc: linux-serial(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-fbdev(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org

8 58

[PATCH 1/2] ASoC: dt-bindings: max98396: add amplifier driver
by Ryan Lee 22 Apr '22

22 Apr '22

From: Ryan Lee <ryans.lee(a)analog.com> This patch adds dt-bindings information for Analog Devices MAX98396 and MAX98397 Smart Amplifier. Signed-off-by: Ryan Lee <ryans.lee(a)analog.com> --- .../bindings/sound/adi,max98396.yaml | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/adi,max98396.yaml diff --git a/Documentation/devicetree/bindings/sound/adi,max98396.yaml b/Documentation/devicetree/bindings/sound/adi,max98396.yaml new file mode 100644 index 000000000000..4aee32f43ad1 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,max98396.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/adi,max98396.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices MAX98396 Speaker Amplifier Device Tree Bindings + +maintainers: + - Ryan Lee <ryans.lee(a)analog.com> + +description: + The MAX98396 is a mono Class-DG speaker amplifier with I/V sense. + The device provides a PCM interface for audio data and a standard + I2C interface for control data communication. + The MAX98397 is a variant of MAX98396 with wide input supply range. + +properties: + compatible: + enum: + - adi,max98396 + - adi,max98397 + reg: + maxItems: 1 + description: I2C address of the device. + + adi,vmon-slot-no: + description: slot number of the voltage sense monitor + minimum: 0 + maximum: 15 + default: 0 + + adi,imon-slot-no: + description: slot number of the current sense monitor + minimum: 0 + maximum: 15 + default: 0 + + adi,spkfb-slot-no: + description: slot number of speaker DSP monitor + minimum: 0 + maximum: 15 + default: 0 + + adi,interleave-mode: + type: boolean + description: For cases where a single combined channel for the I/V sense data is not sufficient, + the device can also be configured to share a single data output channel on alternating frames. + In this configuration, the current and voltage data will be frame interleaved on a single output channel. + default: false + + reset-gpios: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + max98396: amplifier@39 { + compatible = "adi,max98396"; + reg = <0x39>; + adi,vmon-slot-no = <0>; + adi,imon-slot-no = <1>; + adi,interleave-mode = <0>; + reset-gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + max98397: amplifier@3c { + compatible = "adi,max98397"; + reg = <0x3c>; + adi,vmon-slot-no = <0>; + adi,imon-slot-no = <1>; + adi,interleave-mode = <0>; + reset-gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + }; + -- 2.25.1

4 5

[PATCH] ALSA: hda: intel-dsp-config: Add RaptorLake PCI IDs
by Pierre-Louis Bossart 21 Apr '22

21 Apr '22

From: Gongjun Song <gongjun.song(a)intel.com> Add RaptorLake-P PCI IDs Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Signed-off-by: Gongjun Song <gongjun.song(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/hda/intel-dsp-config.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 8b0a16ba27d39..a8fe01764b254 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -424,6 +424,15 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x54c8, }, + /* RaptorLake-P */ + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x51ca, + }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x51cb, + }, #endif }; -- 2.30.2

2 1

[PATCH] ALSA: hda/realtek: Add quirk for Clevo NP70PNP
by Tim Crawford 21 Apr '22

21 Apr '22

Fixes headset detection on Clevo NP70PNP. Signed-off-by: Tim Crawford <tcrawford(a)system76.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 62fbf3772b41..f0f95e25f3f1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9163,6 +9163,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x8562, "Clevo NH[57][0-9]RZ[Q]", ALC269_FIXUP_DMIC), SND_PCI_QUIRK(0x1558, 0x8668, "Clevo NP50B[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x866d, "Clevo NP5[05]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x867c, "Clevo NP7[01]PNP", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x867d, "Clevo NP7[01]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x8680, "Clevo NJ50LU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME), -- 2.35.1

2 1

[PATCH] ASoC: soc-ops: fix error handling
by Pierre-Louis Bossart 21 Apr '22

21 Apr '22

cppcheck throws the following warning: sound/soc/soc-ops.c:461:8: style: Variable 'ret' is assigned a value that is never used. [unreadVariable] ret = err; ^ This seems to be a missing change in the return value. Fixes: 7f3d90a351968 ("ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_sx()") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index a0ca58ba16273..58347eadd219b 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -461,7 +461,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ret = err; } } - return err; + return ret; } EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx); -- 2.30.2

2 1

[PATCH v2 0/2] ASoC: SOF: AMD updates
by Pierre-Louis Bossart 21 Apr '22

21 Apr '22

these patches were originally submitted in the "ASoC: SOF: AMD/Mediatek updates" series, but there was a bisect issue on the first patch. sound/soc/sof/amd/acp.c:176:29: error: unused variable ‘sdev’ [-Werror=unused-variable] resubmitting as v2 with each patch compiling without warning. Ajit Kumar Pandey (2): ASoC: SOF: amd: Add psp_mbox_ready() and psp_send_cmd() callback ASoC: SOF: amd: Use dedicated MBOX for ACP and PSP communication sound/soc/sof/amd/acp.c | 66 ++++++++++++++++++++++++++++++++++++----- sound/soc/sof/amd/acp.h | 6 ++-- 2 files changed, 63 insertions(+), 9 deletions(-) -- 2.30.2

2 3

[PATCH] ASoC: Intel: sof_ssp_amp: remove 'set-but-not-used' warning
by Pierre-Louis Bossart 21 Apr '22

21 Apr '22

Clang warning: >> sound/soc/intel/boards/sof_ssp_amp.c:97:6: warning: variable 'i' set but not used [-Wunused-but-set-variable] int i = 0; ^ The device counter is not used when the quirk is not set, which static analysis cannot know. Move its initialization before the loop to remove this warning. Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/intel/boards/sof_ssp_amp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_ssp_amp.c b/sound/soc/intel/boards/sof_ssp_amp.c index 02a27aaed92fb..8f5b9ebbe8287 100644 --- a/sound/soc/intel/boards/sof_ssp_amp.c +++ b/sound/soc/intel/boards/sof_ssp_amp.c @@ -94,7 +94,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) char jack_name[NAME_SIZE]; struct sof_hdmi_pcm *pcm; int err; - int i = 0; + int i; if (!(sof_ssp_amp_quirk & SOF_HDMI_PLAYBACK_PRESENT)) return 0; @@ -113,6 +113,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) return hda_dsp_hdmi_build_controls(card, component); } + i = 0; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), -- 2.30.2

2 1