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

[PATCH] ASoC: imx-pcm-rpmsg: Remove unused variable
by Deepak R Varma 14 Feb '23

14 Feb '23

Variable ret is initialed but is never modified or used except for returning the initial value 0. The value can be directly returned instead and the variable definition can be dropped. Issue identified using returnvar.cocci Coccinelle semantic patch. Signed-off-by: Deepak R Varma <drv(a)mailo.com> --- sound/soc/fsl/imx-pcm-rpmsg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 2f310994f7ee..6614b3447649 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -140,7 +140,6 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, { struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { msg = &info->msg[TX_HW_PARAM]; @@ -184,7 +183,7 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, info->send_message(msg, info); - return ret; + return 0; } static snd_pcm_uframes_t imx_rpmsg_pcm_pointer(struct snd_soc_component *component, @@ -282,7 +281,6 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; /* Flush work in workqueue to make TX_CLOSE is the last message */ flush_workqueue(info->rpmsg_wq); @@ -305,7 +303,7 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, dev_warn(rtd->dev, "Msg is dropped!, number is %d\n", info->msg_drop_count[substream->stream]); - return ret; + return 0; } static int imx_rpmsg_pcm_prepare(struct snd_soc_component *component, -- 2.34.1

1 0

[PATCH] ASoC: codecs: wcd934x: Use min macro for comparison and assignment
by Deepak R Varma 14 Feb '23

14 Feb '23

Simplify code by using min helper macro for logical evaluation and value assignment. The change also facilitates code realignment for improved readability. Proposed change is identified using minmax.cocci Coccinelle script. Signed-off-by: Deepak R Varma <drv(a)mailo.com> --- sound/soc/codecs/wcd934x.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 28175c746b9a..783479a4d535 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -4737,13 +4737,9 @@ static u32 wcd934x_get_dmic_sample_rate(struct snd_soc_component *comp, if (dec_found && adc_mux_index <= 8) { tx_fs_reg = WCD934X_CDC_TX0_TX_PATH_CTL + (16 * adc_mux_index); tx_stream_fs = snd_soc_component_read(comp, tx_fs_reg) & 0x0F; - if (tx_stream_fs <= 4) { - if (wcd->dmic_sample_rate <= - WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ) - dmic_fs = wcd->dmic_sample_rate; - else - dmic_fs = WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ; - } else + if (tx_stream_fs <= 4) + dmic_fs = min(wcd->dmic_sample_rate, WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ); + else dmic_fs = WCD9XXX_DMIC_SAMPLE_RATE_4P8MHZ; } else { dmic_fs = wcd->dmic_sample_rate; -- 2.34.1

1 0

[PATCH 0/5] ASoC: SOF: Intel/ipc4: Support for low power playback (d0i3)
by Peter Ujfalusi 14 Feb '23

14 Feb '23

Hi, The following series will enable the the Low Power Audio (LPA) playback on Intel platforms when using IPC4. The support is closely follows how IPC3 supports similar use case. All depending patches are upstream and our CI have been testing this feature for some time without issues. Regards, Peter --- Rander Wang (5): ASoC: SOF: Introduce a new set_pm_gate() IPC PM op ASoC: SOF: Intel: hda-dsp: use set_pm_gate according to ipc version ASoC: SOF: ipc4: Wake up dsp core before sending ipc msg ASoC: SOF: Intel: Enable d0i3 work for ipc4 ASoC: SOF: Intel: hda-dsp: Set streaming flag for d0i3 sound/soc/sof/intel/cnl.c | 2 ++ sound/soc/sof/intel/hda-dsp.c | 46 ++++++++++++++++++++++++++--------- sound/soc/sof/intel/hda-ipc.c | 28 +++++++++++++++++++++ sound/soc/sof/intel/hda.h | 2 ++ sound/soc/sof/intel/mtl.c | 2 ++ sound/soc/sof/ipc3.c | 18 ++++++++++++++ sound/soc/sof/ipc4.c | 24 ++++++++++++++++++ sound/soc/sof/sof-priv.h | 2 ++ 8 files changed, 113 insertions(+), 11 deletions(-) -- 2.39.1

2 6

[PATCH] ASoC: tlv320adcx140: extend list of supported samplerates
by Alexandru Ardelean 14 Feb '23

14 Feb '23

From: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> The 'tlv320adcx140' driver currently supports 3 devices: TLV320ADC3140, TLV320ADC5140 and TLV320ADC6140. All 3 devices, support higher samplerates, up to 768-kHz according to their datasheets. In our applications, we only tested (and worked) with 96 kHz and 192 kHz. This change extends the list of supported sample-rates for these devices with 96 & 192 kHz. References: https://www.ti.com/product/TLV320ADC3140 https://www.ti.com/product/TLV320ADC5140 https://www.ti.com/product/TLV320ADC6140 Signed-off-by: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> Signed-off-by: Alexandru Ardelean <alex(a)shruggie.ro> --- sound/soc/codecs/tlv320adcx140.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320adcx140.h b/sound/soc/codecs/tlv320adcx140.h index fd80fac8b327..27a1f1012fe2 100644 --- a/sound/soc/codecs/tlv320adcx140.h +++ b/sound/soc/codecs/tlv320adcx140.h @@ -6,7 +6,9 @@ #define _TLV320ADCX140_H #define ADCX140_RATES (SNDRV_PCM_RATE_44100 | \ - SNDRV_PCM_RATE_48000) + SNDRV_PCM_RATE_48000 | \ + SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_192000) #define ADCX140_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ -- 2.34.1

2 1

[PATCH 00/35] Documentation: correct lots of spelling errors (series 1)
by Randy Dunlap 14 Feb '23

14 Feb '23

Correct many spelling errors in Documentation/ as reported by codespell. Maintainers of specific kernel subsystems are only Cc-ed on their respective patches, not the entire series. [if all goes well] These patches are based on linux-next-20230125. [PATCH 01/35] Documentation: arm64: correct spelling [PATCH 02/35] Documentation: arm: correct spelling [PATCH 03/35] Documentation: block: correct spelling [PATCH 04/35] Documentation: bpf: correct spelling [PATCH 05/35] Documentation: core-api: correct spelling [PATCH 06/35] Documentation: fault-injection: correct spelling [PATCH 07/35] Documentation: fb: correct spelling [PATCH 08/35] Documentation: features: correct spelling [PATCH 09/35] Documentation: firmware-guide/acpi: correct spelling [PATCH 10/35] Documentation: hid: correct spelling [PATCH 11/35] Documentation: i2c: correct spelling [PATCH 12/35] Documentation: input: correct spelling [PATCH 13/35] Documentation: isdn: correct spelling [PATCH 14/35] Documentation: leds: correct spelling [PATCH 15/35] Documentation: litmus-tests: correct spelling [PATCH 16/35] Documentation: livepatch: correct spelling [PATCH 17/35] Documentation: locking: correct spelling [PATCH 18/35] Documentation: mm: correct spelling [PATCH 19/35] Documentation: openrisc: correct spelling [PATCH 20/35] Documentation: PCI: correct spelling [PATCH 21/35] Documentation: powerpc: correct spelling [PATCH 22/35] Documentation: power: correct spelling [PATCH 23/35] Documentation: s390: correct spelling [PATCH 24/35] Documentation: scheduler: correct spelling [PATCH 25/35] Documentation: security: correct spelling [PATCH 26/35] Documentation: sound: correct spelling [PATCH 27/35] Documentation: spi: correct spelling [PATCH 28/35] Documentation: target: correct spelling [PATCH 29/35] Documentation: timers: correct spelling [PATCH 30/35] Documentation: tools/rtla: correct spelling [PATCH 31/35] Documentation: trace: correct spelling [PATCH 32/35] Documentation: usb: correct spelling [PATCH 33/35] Documentation: w1: correct spelling [PATCH 34/35] Documentation: x86: correct spelling [PATCH 35/35] Documentation: xtensa: correct spelling Documentation/PCI/endpoint/pci-vntb-howto.rst | 2 - Documentation/PCI/msi-howto.rst | 2 - Documentation/arm/arm.rst | 2 - Documentation/arm/ixp4xx.rst | 4 +- Documentation/arm/keystone/knav-qmss.rst | 2 - Documentation/arm/stm32/stm32-dma-mdma-chaining.rst | 6 +-- Documentation/arm/sunxi/clocks.rst | 2 - Documentation/arm/swp_emulation.rst | 2 - Documentation/arm/tcm.rst | 2 - Documentation/arm/vlocks.rst | 2 - Documentation/arm64/booting.rst | 2 - Documentation/arm64/elf_hwcaps.rst | 2 - Documentation/arm64/sve.rst | 4 +- Documentation/block/data-integrity.rst | 2 - Documentation/bpf/libbpf/libbpf_naming_convention.rst | 6 +-- Documentation/bpf/map_xskmap.rst | 2 - Documentation/bpf/ringbuf.rst | 4 +- Documentation/bpf/verifier.rst | 2 - Documentation/core-api/packing.rst | 2 - Documentation/core-api/padata.rst | 2 - Documentation/fault-injection/fault-injection.rst | 2 - Documentation/fb/sm712fb.rst | 2 - Documentation/fb/sstfb.rst | 2 - Documentation/features/core/thread-info-in-task/arch-support.txt | 2 - Documentation/firmware-guide/acpi/acpi-lid.rst | 2 - Documentation/firmware-guide/acpi/namespace.rst | 2 - Documentation/hid/hid-alps.rst | 2 - Documentation/hid/hid-bpf.rst | 2 - Documentation/hid/hiddev.rst | 2 - Documentation/hid/hidraw.rst | 2 - Documentation/hid/intel-ish-hid.rst | 2 - Documentation/i2c/gpio-fault-injection.rst | 2 - Documentation/i2c/smbus-protocol.rst | 2 - Documentation/input/devices/iforce-protocol.rst | 2 - Documentation/input/multi-touch-protocol.rst | 2 - Documentation/isdn/interface_capi.rst | 2 - Documentation/isdn/m_isdn.rst | 2 - Documentation/leds/leds-qcom-lpg.rst | 4 +- Documentation/litmus-tests/README | 2 - Documentation/livepatch/reliable-stacktrace.rst | 2 - Documentation/locking/lockdep-design.rst | 4 +- Documentation/locking/locktorture.rst | 2 - Documentation/locking/locktypes.rst | 2 - Documentation/locking/preempt-locking.rst | 2 - Documentation/mm/hmm.rst | 4 +- Documentation/mm/hwpoison.rst | 2 - Documentation/openrisc/openrisc_port.rst | 4 +- Documentation/power/suspend-and-interrupts.rst | 2 - Documentation/powerpc/kasan.txt | 2 - Documentation/powerpc/papr_hcalls.rst | 2 - Documentation/powerpc/qe_firmware.rst | 4 +- Documentation/powerpc/vas-api.rst | 4 +- Documentation/s390/pci.rst | 4 +- Documentation/s390/vfio-ccw.rst | 2 - Documentation/scheduler/sched-bwc.rst | 2 - Documentation/scheduler/sched-energy.rst | 4 +- Documentation/security/digsig.rst | 4 +- Documentation/security/keys/core.rst | 2 - Documentation/security/secrets/coco.rst | 2 - Documentation/sound/alsa-configuration.rst | 8 ++-- Documentation/sound/cards/audigy-mixer.rst | 2 - Documentation/sound/cards/maya44.rst | 2 - Documentation/sound/cards/sb-live-mixer.rst | 2 - Documentation/sound/designs/jack-controls.rst | 2 - Documentation/sound/designs/seq-oss.rst | 2 - Documentation/sound/hd-audio/notes.rst | 2 - Documentation/spi/pxa2xx.rst | 12 +++--- Documentation/spi/spi-lm70llp.rst | 2 - Documentation/spi/spi-summary.rst | 2 - Documentation/target/tcmu-design.rst | 2 - Documentation/timers/hrtimers.rst | 2 - Documentation/tools/rtla/rtla-timerlat-top.rst | 2 - Documentation/trace/coresight/coresight-etm4x-reference.rst | 2 - Documentation/trace/events.rst | 6 +-- Documentation/trace/fprobe.rst | 2 - Documentation/trace/ftrace-uses.rst | 2 - Documentation/trace/hwlat_detector.rst | 2 - Documentation/trace/rv/runtime-verification.rst | 2 - Documentation/trace/uprobetracer.rst | 2 - Documentation/usb/chipidea.rst | 19 +++++----- Documentation/usb/gadget-testing.rst | 2 - Documentation/usb/mass-storage.rst | 2 - Documentation/w1/w1-netlink.rst | 2 - Documentation/x86/boot.rst | 2 - Documentation/x86/buslock.rst | 2 - Documentation/x86/mds.rst | 2 - Documentation/x86/resctrl.rst | 2 - Documentation/x86/sgx.rst | 2 - Documentation/xtensa/atomctl.rst | 2 - 89 files changed, 124 insertions(+), 123 deletions(-) Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Will Deacon <will(a)kernel.org> Cc: Russell King <linux(a)armlinux.org.uk> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Andrii Nakryiko <andrii(a)kernel.org> Cc: Alexei Starovoitov <ast(a)kernel.org> Cc: Daniel Borkmann <daniel(a)iogearbox.net> Cc: Vladimir Oltean <olteanv(a)gmail.com> Cc: Steffen Klassert <steffen.klassert(a)secunet.com> Cc: Daniel Jordan <daniel.m.jordan(a)oracle.com> Cc: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Helge Deller <deller(a)gmx.de> Cc: "Rafael J. Wysocki" <rafael(a)kernel.org> Cc: Jiri Kosina <jikos(a)kernel.org> Cc: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Cc: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> Cc: Wolfram Sang <wsa(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Henrik Rydberg <rydberg(a)bitmath.org> Cc: Karsten Keil <isdn(a)linux-pingi.de> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Lee Jones <lee(a)kernel.org> Cc: Josh Poimboeuf <jpoimboe(a)kernel.org> Cc: Miroslav Benes <mbenes(a)suse.cz> Cc: Petr Mladek <pmladek(a)suse.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Jérôme Glisse <jglisse(a)redhat.com> Cc: Naoya Horiguchi <naoya.horiguchi(a)nec.com> Cc: Miaohe Lin <linmiaohe(a)huawei.com> Cc: Jonas Bonn <jonas(a)southpole.se> Cc: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> Cc: Stafford Horne <shorne(a)gmail.com> Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: Lorenzo Pieralisi <lpieralisi(a)kernel.org> Cc: Marc Zyngier <maz(a)kernel.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Len Brown <len.brown(a)intel.com> Cc: Heiko Carstens <hca(a)linux.ibm.com> Cc: Vasily Gorbik <gor(a)linux.ibm.com> Cc: Alexander Gordeev <agordeev(a)linux.ibm.com> Cc: Juri Lelli <juri.lelli(a)redhat.com> Cc: Vincent Guittot <vincent.guittot(a)linaro.org> Cc: David Howells <dhowells(a)redhat.com> Cc: Jarkko Sakkinen <jarkko(a)kernel.org> Cc: Paul Moore <paul(a)paul-moore.com> Cc: James Morris <jmorris(a)namei.org> Cc: "Serge E. Hallyn" <serge(a)hallyn.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: "Martin K. Petersen" <martin.petersen(a)oracle.com> Cc: Daniel Bristot de Oliveira <bristot(a)kernel.org> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> Cc: Suzuki K Poulose <suzuki.poulose(a)arm.com> Cc: Evgeniy Polyakov <zbr(a)ioremap.net> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Reinette Chatre <reinette.chatre(a)intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Chris Zankel <chris(a)zankel.net> Cc: Max Filippov <jcmvbkbc(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Cc: coresight(a)lists.linaro.org Cc: bpf(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: isdn4linux(a)listserv.isdn4linux.de Cc: keyrings(a)vger.kernel.org Cc: linux-acpi(a)vger.kernel.org Cc: linux-block(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: linux-doc(a)vger.kernel.org Cc: linux-fbdev(a)vger.kernel.org Cc: linux-i2c(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-leds(a)vger.kernel.org Cc: linux-pci(a)vger.kernel.org Cc: linux-s390(a)vger.kernel.org Cc: linux-scsi(a)vger.kernel.org Cc: linux-sgx(a)vger.kernel.org Cc: linux-spi(a)vger.kernel.org Cc: linux-trace-devel(a)vger.kernel.org Cc: linux-trace-kernel(a)vger.kernel.org Cc: live-patching(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: linux-security-module(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: target-devel(a)vger.kernel.org Cc: linux-mm(a)kvack.org Cc: openrisc(a)lists.librecores.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-xtensa(a)linux-xtensa.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: x86(a)kernel.org

6 6

[PATCH 1/2] ALSA: hda/realtek: fix mute/micmute LEDs don't work for a HP platform.
by Andy Chi 14 Feb '23

14 Feb '23

There is a HP platform needs ALC236_FIXUP_HP_GPIO_LED quirk to make mic-mute/audio-mute working. Signed-off-by: Andy Chi <andy.chi(a)canonical.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 1134a493d225..7b9fb38ff732 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9436,6 +9436,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED), -- 2.34.1

2 9

[PATCH] sound: soc: codec: tlv320adcx140: fix 'ti,gpio-config' DT property init
by Alexandru Ardelean 14 Feb '23

14 Feb '23

From: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> When the 'ti,gpio-config' property is not defined, the device_property_count_u32() will return an error, rather than zero. The current check, only handles a return value of zero, which assumes that the property is defined and has no elements. This change extends the check to also handle for an error case (most likely to be hit by the case that the 'ti,gpio-config' is not defined). Semantically, this would be the same as 'device_property_count_u32()' returning zero. In case that 'ti,gpio-config' is defined, and returns a 'gpio_count' value that is incorrect, there is an 'if (gpio_count != ADCX140_NUM_GPIO_CFGS)' check, a few lines lower that will return -EINVAL. This means that someone tried to define 'ti,gpio-config', but with the wrong number of GPIOs. Signed-off-by: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> Signed-off-by: Alexandru Ardelean <alex(a)shruggie.ro> --- sound/soc/codecs/tlv320adcx140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c index 91a22d927915..530f321d08e9 100644 --- a/sound/soc/codecs/tlv320adcx140.c +++ b/sound/soc/codecs/tlv320adcx140.c @@ -925,7 +925,7 @@ static int adcx140_configure_gpio(struct adcx140_priv *adcx140) gpio_count = device_property_count_u32(adcx140->dev, "ti,gpio-config"); - if (gpio_count == 0) + if (gpio_count <= 0) return 0; if (gpio_count != ADCX140_NUM_GPIO_CFGS) -- 2.34.1

2 4

[PATCH V2 3/8] soundwire: amd: register soundwire manager dai ops
by Vijendar Mukunda 14 Feb '23

14 Feb '23

Register dai ops for soundwire manager instances. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 182 ++++++++++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 18 +++ include/linux/soundwire/sdw_amd.h | 18 +++ 3 files changed, 218 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index cd1e5a3d5995..14c88b80ab6d 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -641,6 +641,182 @@ static const struct sdw_master_ops amd_sdw_ops = { .read_ping_status = amd_sdw_read_ping_status, }; +static int amd_sdw_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai); + struct sdw_amd_dai_runtime *dai_runtime; + struct sdw_stream_config sconfig; + struct sdw_port_config *pconfig; + int ch, dir; + int ret; + + dai_runtime = amd_manager->dai_runtime_array[dai->id]; + if (!dai_runtime) + return -EIO; + + ch = params_channels(params); + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + dir = SDW_DATA_DIR_RX; + else + dir = SDW_DATA_DIR_TX; + dev_dbg(amd_manager->dev, "%s: dir:%d dai->id:0x%x\n", __func__, dir, dai->id); + + sconfig.direction = dir; + sconfig.ch_count = ch; + sconfig.frame_rate = params_rate(params); + sconfig.type = dai_runtime->stream_type; + + sconfig.bps = snd_pcm_format_width(params_format(params)); + + /* Port configuration */ + pconfig = kzalloc(sizeof(*pconfig), GFP_KERNEL); + if (!pconfig) { + ret = -ENOMEM; + goto error; + } + + pconfig->num = dai->id; + pconfig->ch_mask = (1 << ch) - 1; + ret = sdw_stream_add_master(&amd_manager->bus, &sconfig, + pconfig, 1, dai_runtime->stream); + if (ret) + dev_err(amd_manager->dev, "add manager to stream failed:%d\n", ret); + + kfree(pconfig); +error: + return ret; +} + +static int amd_sdw_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) +{ + struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai); + struct sdw_amd_dai_runtime *dai_runtime; + int ret; + + dai_runtime = amd_manager->dai_runtime_array[dai->id]; + if (!dai_runtime) + return -EIO; + + ret = sdw_stream_remove_master(&amd_manager->bus, dai_runtime->stream); + if (ret < 0) + dev_err(dai->dev, "remove manager from stream %s failed: %d\n", + dai_runtime->stream->name, ret); + return ret; +} + +static int amd_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction) +{ + struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai); + struct sdw_amd_dai_runtime *dai_runtime; + + dai_runtime = amd_manager->dai_runtime_array[dai->id]; + if (stream) { + /* first paranoia check */ + if (dai_runtime) { + dev_err(dai->dev, + "dai_runtime already allocated for dai %s\n", + dai->name); + return -EINVAL; + } + + /* allocate and set dai_runtime info */ + dai_runtime = kzalloc(sizeof(*dai_runtime), GFP_KERNEL); + if (!dai_runtime) + return -ENOMEM; + + dai_runtime->stream_type = SDW_STREAM_PCM; + dai_runtime->bus = &amd_manager->bus; + dai_runtime->stream = stream; + amd_manager->dai_runtime_array[dai->id] = dai_runtime; + } else { + /* second paranoia check */ + if (!dai_runtime) { + dev_err(dai->dev, + "dai_runtime not allocated for dai %s\n", + dai->name); + return -EINVAL; + } + + /* for NULL stream we release allocated dai_runtime */ + kfree(dai_runtime); + amd_manager->dai_runtime_array[dai->id] = NULL; + } + return 0; +} + +static int amd_pcm_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction) +{ + return amd_set_sdw_stream(dai, stream, direction); +} + +static void *amd_get_sdw_stream(struct snd_soc_dai *dai, int direction) +{ + struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai); + struct sdw_amd_dai_runtime *dai_runtime; + + dai_runtime = amd_manager->dai_runtime_array[dai->id]; + if (!dai_runtime) + return ERR_PTR(-EINVAL); + + return dai_runtime->stream; +} + +static const struct snd_soc_dai_ops amd_sdw_dai_ops = { + .hw_params = amd_sdw_hw_params, + .hw_free = amd_sdw_hw_free, + .set_stream = amd_pcm_set_sdw_stream, + .get_stream = amd_get_sdw_stream, +}; + +static const struct snd_soc_component_driver amd_sdw_dai_component = { + .name = "soundwire", +}; + +static int amd_sdw_register_dais(struct amd_sdw_manager *amd_manager) +{ + struct sdw_amd_dai_runtime **dai_runtime_array; + struct snd_soc_dai_driver *dais; + struct snd_soc_pcm_stream *stream; + struct device *dev; + int i, num_dais; + + dev = amd_manager->dev; + num_dais = amd_manager->num_dout_ports + amd_manager->num_din_ports; + dais = devm_kcalloc(dev, num_dais, sizeof(*dais), GFP_KERNEL); + if (!dais) + return -ENOMEM; + + dai_runtime_array = devm_kcalloc(dev, num_dais, + sizeof(struct sdw_amd_dai_runtime *), + GFP_KERNEL); + if (!dai_runtime_array) + return -ENOMEM; + amd_manager->dai_runtime_array = dai_runtime_array; + for (i = 0; i < num_dais; i++) { + dais[i].name = devm_kasprintf(dev, GFP_KERNEL, "SDW%d Pin%d", amd_manager->instance, + i); + if (!dais[i].name) + return -ENOMEM; + if (i < amd_manager->num_dout_ports) + stream = &dais[i].playback; + else + stream = &dais[i].capture; + + stream->channels_min = 2; + stream->channels_max = 2; + stream->rates = SNDRV_PCM_RATE_48000; + stream->formats = SNDRV_PCM_FMTBIT_S16_LE; + + dais[i].ops = &amd_sdw_dai_ops; + dais[i].id = i; + } + + return devm_snd_soc_register_component(dev, &amd_sdw_dai_component, + dais, num_dais); +} + static void amd_sdw_probe_work(struct work_struct *work) { struct amd_sdw_manager *amd_manager = container_of(work, struct amd_sdw_manager, @@ -726,6 +902,12 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) dev_err(dev, "Failed to register Soundwire manager(%d)\n", ret); return ret; } + ret = amd_sdw_register_dais(amd_manager); + if (ret) { + dev_err(dev, "CPU DAI registration failed\n"); + sdw_bus_master_delete(&amd_manager->bus); + return ret; + } dev_set_drvdata(dev, amd_manager); INIT_WORK(&amd_manager->probe_work, amd_sdw_probe_work); schedule_work(&amd_manager->probe_work); diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 811ed9ee3d86..3e1bded1e769 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -205,6 +205,24 @@ struct sdw_manager_dp_reg { u32 lane_ctrl_ch_en_reg; }; +/* + * SDW0 Manager instance registers 6 CPU DAI (3 TX & 3 RX Ports) + * whereas SDW1 Manager Instance registers 2 CPU DAI (one TX & one RX port) + * Below is the CPU DAI <->Manager port number mapping + * i.e SDW0 Pin0 -> port number 0 -> AUDIO0 TX + * SDW0 Pin1 -> Port number 1 -> AUDIO1 TX + * SDW0 Pin2 -> Port number 2 -> AUDIO2 TX + * SDW0 Pin3 -> port number 3 -> AUDIO0 RX + * SDW0 Pin4 -> Port number 4 -> AUDIO1 RX + * SDW0 Pin5 -> Port number 5 -> AUDIO2 RX + * Whereas for SDW1 instance + * SDW1 Pin0 -> port number 0 -> AUDIO1 TX + * SDW1 Pin1 -> Port number 1 -> AUDIO1 RX + * Same mapping should be used for programming DMA controller registers in Soundwire DMA driver. + * i.e if AUDIO0 TX channel is selected then we need to use AUDIO0 TX registers for DMA programming + * in Soundwire DMA driver. + */ + static struct sdw_manager_dp_reg sdw0_manager_dp_reg[AMD_SDW0_MAX_DAI] = { {ACP_SW_AUDIO0_TX_FRAME_FORMAT, ACP_SW_AUDIO0_TX_SAMPLEINTERVAL, ACP_SW_AUDIO0_TX_HCTRL_DP0, ACP_SW_AUDIO0_TX_OFFSET_DP0, ACP_SW_AUDIO0_TX_CHANNEL_ENABLE_DP0}, diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h index 922d30a540fd..c978cfbc0207 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -23,6 +23,21 @@ struct sdw_manager_reg_mask { u32 acp_sdw_intr_mask; }; +/** + * struct sdw_amd_dai_runtime: AMD sdw dai runtime data + * + * @name: SoundWire stream name + * @stream: stream runtime + * @bus: Bus handle + * @stream_type: Stream type + */ +struct sdw_amd_dai_runtime { + char *name; + struct sdw_stream_runtime *stream; + struct sdw_bus *bus; + enum sdw_stream_type stream_type; +}; + /** * struct amd_sdw_manager - amd manager driver context * @bus: bus handle @@ -40,6 +55,7 @@ struct sdw_manager_reg_mask { * @quirks: soundwire manager quirks * @wake_en_mask: wake enable mask per soundwire manager * @power_mode_mask: flag interprets amd soundwire manager power mode + * @dai_runtime_array: dai runtime array */ struct amd_sdw_manager { struct sdw_bus bus; @@ -63,5 +79,7 @@ struct amd_sdw_manager { u32 quirks; u32 wake_en_mask; u32 power_mode_mask; + + struct sdw_amd_dai_runtime **dai_runtime_array; }; #endif -- 2.34.1

3 2

remove arch/sh
by Christoph Hellwig 13 Feb '23

13 Feb '23

18 96

[PATCH 0/3][next] ASoC: codecs: Modify error implicit declaration of function and misspelling
by wangweidong.a＠awinic.com 13 Feb '23

13 Feb '23

From: Weidong Wang <wangweidong.a(a)awinic.com> Change the function name aw88395_plack_event to aw88395_playback_event Change hdrlen to hdr_len Add select GPIOLIB to the sound/soc/codecs/Kconfig file Weidong Wang (3): ASoC: codecs: Fixed a spelling error in the function name ASoC: codecs: Modify the log print statement ASoC: codecs: Modify error: implicit declaration of function 'gpiod_set_value_cansleep' sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/aw88395/aw88395.c | 4 ++-- sound/soc/codecs/aw88395/aw88395_lib.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) base-commit: 6ba8a227fd19d19779005fb66ad7562608e1df83 -- 2.39.1

2 4