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

[PATCH 1/2] ASoC: fsl: mpc8610_hpcd: Remove unused driver
by Michael Ellerman 23 Nov '23

23 Nov '23

The mpc8610_hpcd.c driver depends on CONFIG_MPC8610_HPCD which was removed in commit 248667f8bbde ("powerpc: drop HPCD/MPC8610 evaluation platform support"). That makes the driver unbuildable and unusable, so remove it. Depends-on: 248667f8bbde ("powerpc: drop HPCD/MPC8610 evaluation platform support") Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> --- MAINTAINERS | 1 - sound/soc/fsl/Kconfig | 13 - sound/soc/fsl/Makefile | 4 - sound/soc/fsl/mpc8610_hpcd.c | 451 ----------------------------------- 4 files changed, 469 deletions(-) delete mode 100644 sound/soc/fsl/mpc8610_hpcd.c diff --git a/MAINTAINERS b/MAINTAINERS index ea790149af79..27b2f5bb2061 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8581,7 +8581,6 @@ L: linuxppc-dev(a)lists.ozlabs.org S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/imx* -F: sound/soc/fsl/mpc8610_hpcd.c FREESCALE SOC SOUND QMC DRIVER M: Herve Codina <herve.codina(a)bootlin.com> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 725c530a3636..bec2aa561930 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -183,19 +183,6 @@ config SND_SOC_POWERPC_QMC_AUDIO comment "SoC Audio support for Freescale PPC boards:" -config SND_SOC_MPC8610_HPCD - tristate "ALSA SoC support for the Freescale MPC8610 HPCD board" - # I2C is necessary for the CS4270 driver - depends on MPC8610_HPCD && I2C - select SND_SOC_FSL_SSI - select SND_SOC_FSL_UTILS - select SND_SOC_POWERPC_DMA - select SND_SOC_CS4270 - select SND_SOC_CS4270_VD33_ERRATA - default y if MPC8610_HPCD - help - Say Y if you want to enable audio on the Freescale MPC8610 HPCD. - config SND_SOC_P1022_DS tristate "ALSA SoC support for the Freescale P1022 DS board" # I2C is necessary for the WM8776 driver diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 8db7e97d0bd5..b45eda80c196 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -# MPC8610 HPCD Machine Support -snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o -obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o - # P1022 DS Machine Support snd-soc-p1022-ds-objs := p1022_ds.o obj-$(CONFIG_SND_SOC_P1022_DS) += snd-soc-p1022-ds.o diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c deleted file mode 100644 index 52fb9e7bcca4..000000000000 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ /dev/null @@ -1,451 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// -// Freescale MPC8610HPCD ALSA SoC Machine driver -// -// Author: Timur Tabi <timur(a)freescale.com> -// -// Copyright 2007-2010 Freescale Semiconductor, Inc. - -#include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/fsl/guts.h> -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/slab.h> -#include <sound/soc.h> - -#include "fsl_dma.h" -#include "fsl_ssi.h" -#include "fsl_utils.h" - -/* There's only one global utilities register */ -static phys_addr_t guts_phys; - -/** - * mpc8610_hpcd_data: machine-specific ASoC device data - * - * This structure contains data for a single sound platform device on an - * MPC8610 HPCD. Some of the data is taken from the device tree. - */ -struct mpc8610_hpcd_data { - struct snd_soc_dai_link dai[2]; - struct snd_soc_card card; - unsigned int dai_format; - unsigned int codec_clk_direction; - unsigned int cpu_clk_direction; - unsigned int clk_frequency; - unsigned int ssi_id; /* 0 = SSI1, 1 = SSI2, etc */ - unsigned int dma_id[2]; /* 0 = DMA1, 1 = DMA2, etc */ - unsigned int dma_channel_id[2]; /* 0 = ch 0, 1 = ch 1, etc*/ - char codec_dai_name[DAI_NAME_SIZE]; - char platform_name[2][DAI_NAME_SIZE]; /* One for each DMA channel */ -}; - -/** - * mpc8610_hpcd_machine_probe: initialize the board - * - * This function is used to initialize the board-specific hardware. - * - * Here we program the DMACR and PMUXCR registers. - */ -static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card) -{ - struct mpc8610_hpcd_data *machine_data = - container_of(card, struct mpc8610_hpcd_data, card); - struct ccsr_guts __iomem *guts; - - guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); - if (!guts) { - dev_err(card->dev, "could not map global utilities\n"); - return -ENOMEM; - } - - /* Program the signal routing between the SSI and the DMA */ - guts_set_dmacr(guts, machine_data->dma_id[0], - machine_data->dma_channel_id[0], - CCSR_GUTS_DMACR_DEV_SSI); - guts_set_dmacr(guts, machine_data->dma_id[1], - machine_data->dma_channel_id[1], - CCSR_GUTS_DMACR_DEV_SSI); - - guts_set_pmuxcr_dma(guts, machine_data->dma_id[0], - machine_data->dma_channel_id[0], 0); - guts_set_pmuxcr_dma(guts, machine_data->dma_id[1], - machine_data->dma_channel_id[1], 0); - - switch (machine_data->ssi_id) { - case 0: - clrsetbits_be32(&guts->pmuxcr, - CCSR_GUTS_PMUXCR_SSI1_MASK, CCSR_GUTS_PMUXCR_SSI1_SSI); - break; - case 1: - clrsetbits_be32(&guts->pmuxcr, - CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI2_SSI); - break; - } - - iounmap(guts); - - return 0; -} - -/** - * mpc8610_hpcd_startup: program the board with various hardware parameters - * - * This function takes board-specific information, like clock frequencies - * and serial data formats, and passes that information to the codec and - * transport drivers. - */ -static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) -{ - struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - struct mpc8610_hpcd_data *machine_data = - container_of(rtd->card, struct mpc8610_hpcd_data, card); - struct device *dev = rtd->card->dev; - int ret = 0; - - /* Tell the codec driver what the serial protocol is. */ - ret = snd_soc_dai_set_fmt(snd_soc_rtd_to_codec(rtd, 0), machine_data->dai_format); - if (ret < 0) { - dev_err(dev, "could not set codec driver audio format\n"); - return ret; - } - - /* - * Tell the codec driver what the MCLK frequency is, and whether it's - * a slave or master. - */ - ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0), 0, - machine_data->clk_frequency, - machine_data->codec_clk_direction); - if (ret < 0) { - dev_err(dev, "could not set codec driver clock params\n"); - return ret; - } - - return 0; -} - -/** - * mpc8610_hpcd_machine_remove: Remove the sound device - * - * This function is called to remove the sound device for one SSI. We - * de-program the DMACR and PMUXCR register. - */ -static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card) -{ - struct mpc8610_hpcd_data *machine_data = - container_of(card, struct mpc8610_hpcd_data, card); - struct ccsr_guts __iomem *guts; - - guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); - if (!guts) { - dev_err(card->dev, "could not map global utilities\n"); - return -ENOMEM; - } - - /* Restore the signal routing */ - - guts_set_dmacr(guts, machine_data->dma_id[0], - machine_data->dma_channel_id[0], 0); - guts_set_dmacr(guts, machine_data->dma_id[1], - machine_data->dma_channel_id[1], 0); - - switch (machine_data->ssi_id) { - case 0: - clrsetbits_be32(&guts->pmuxcr, - CCSR_GUTS_PMUXCR_SSI1_MASK, CCSR_GUTS_PMUXCR_SSI1_LA); - break; - case 1: - clrsetbits_be32(&guts->pmuxcr, - CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI2_LA); - break; - } - - iounmap(guts); - - return 0; -} - -/** - * mpc8610_hpcd_ops: ASoC machine driver operations - */ -static const struct snd_soc_ops mpc8610_hpcd_ops = { - .startup = mpc8610_hpcd_startup, -}; - -/** - * mpc8610_hpcd_probe: platform probe function for the machine driver - * - * Although this is a machine driver, the SSI node is the "master" node with - * respect to audio hardware connections. Therefore, we create a new ASoC - * device for each new SSI node that has a codec attached. - */ -static int mpc8610_hpcd_probe(struct platform_device *pdev) -{ - struct device *dev = pdev->dev.parent; - /* ssi_pdev is the platform device for the SSI node that probed us */ - struct platform_device *ssi_pdev = to_platform_device(dev); - struct device_node *np = ssi_pdev->dev.of_node; - struct device_node *codec_np = NULL; - struct mpc8610_hpcd_data *machine_data; - struct snd_soc_dai_link_component *comp; - int ret; - const char *sprop; - const u32 *iprop; - - /* Find the codec node for this SSI. */ - codec_np = of_parse_phandle(np, "codec-handle", 0); - if (!codec_np) { - dev_err(dev, "invalid codec node\n"); - return -EINVAL; - } - - machine_data = kzalloc(sizeof(struct mpc8610_hpcd_data), GFP_KERNEL); - if (!machine_data) { - ret = -ENOMEM; - goto error_alloc; - } - - comp = devm_kzalloc(&pdev->dev, 6 * sizeof(*comp), GFP_KERNEL); - if (!comp) { - ret = -ENOMEM; - goto error_alloc; - } - - machine_data->dai[0].cpus = &comp[0]; - machine_data->dai[0].codecs = &comp[1]; - machine_data->dai[0].platforms = &comp[2]; - - machine_data->dai[0].num_cpus = 1; - machine_data->dai[0].num_codecs = 1; - machine_data->dai[0].num_platforms = 1; - - machine_data->dai[1].cpus = &comp[3]; - machine_data->dai[1].codecs = &comp[4]; - machine_data->dai[1].platforms = &comp[5]; - - machine_data->dai[1].num_cpus = 1; - machine_data->dai[1].num_codecs = 1; - machine_data->dai[1].num_platforms = 1; - - machine_data->dai[0].cpus->dai_name = dev_name(&ssi_pdev->dev); - machine_data->dai[0].ops = &mpc8610_hpcd_ops; - - /* ASoC core can match codec with device node */ - machine_data->dai[0].codecs->of_node = codec_np; - - /* The DAI name from the codec (snd_soc_dai_driver.name) */ - machine_data->dai[0].codecs->dai_name = "cs4270-hifi"; - - /* We register two DAIs per SSI, one for playback and the other for - * capture. Currently, we only support codecs that have one DAI for - * both playback and capture. - */ - memcpy(&machine_data->dai[1], &machine_data->dai[0], - sizeof(struct snd_soc_dai_link)); - - /* Get the device ID */ - iprop = of_get_property(np, "cell-index", NULL); - if (!iprop) { - dev_err(&pdev->dev, "cell-index property not found\n"); - ret = -EINVAL; - goto error; - } - machine_data->ssi_id = be32_to_cpup(iprop); - - /* Get the serial format and clock direction. */ - sprop = of_get_property(np, "fsl,mode", NULL); - if (!sprop) { - dev_err(&pdev->dev, "fsl,mode property not found\n"); - ret = -EINVAL; - goto error; - } - - if (strcasecmp(sprop, "i2s-slave") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBP_CFP; - machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; - - /* In i2s-slave mode, the codec has its own clock source, so we - * need to get the frequency from the device tree and pass it to - * the codec driver. - */ - iprop = of_get_property(codec_np, "clock-frequency", NULL); - if (!iprop || !*iprop) { - dev_err(&pdev->dev, "codec bus-frequency " - "property is missing or invalid\n"); - ret = -EINVAL; - goto error; - } - machine_data->clk_frequency = be32_to_cpup(iprop); - } else if (strcasecmp(sprop, "i2s-master") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC; - machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; - } else if (strcasecmp(sprop, "lj-slave") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBP_CFP; - machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; - } else if (strcasecmp(sprop, "lj-master") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBC_CFC; - machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; - } else if (strcasecmp(sprop, "rj-slave") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBP_CFP; - machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; - } else if (strcasecmp(sprop, "rj-master") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBC_CFC; - machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; - } else if (strcasecmp(sprop, "ac97-slave") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBP_CFP; - machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; - } else if (strcasecmp(sprop, "ac97-master") == 0) { - machine_data->dai_format = - SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBC_CFC; - machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; - machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; - } else { - dev_err(&pdev->dev, - "unrecognized fsl,mode property '%s'\n", sprop); - ret = -EINVAL; - goto error; - } - - if (!machine_data->clk_frequency) { - dev_err(&pdev->dev, "unknown clock frequency\n"); - ret = -EINVAL; - goto error; - } - - /* Find the playback DMA channel to use. */ - machine_data->dai[0].platforms->name = machine_data->platform_name[0]; - ret = fsl_asoc_get_dma_channel(np, "fsl,playback-dma", - &machine_data->dai[0], - &machine_data->dma_channel_id[0], - &machine_data->dma_id[0]); - if (ret) { - dev_err(&pdev->dev, "missing/invalid playback DMA phandle\n"); - goto error; - } - - /* Find the capture DMA channel to use. */ - machine_data->dai[1].platforms->name = machine_data->platform_name[1]; - ret = fsl_asoc_get_dma_channel(np, "fsl,capture-dma", - &machine_data->dai[1], - &machine_data->dma_channel_id[1], - &machine_data->dma_id[1]); - if (ret) { - dev_err(&pdev->dev, "missing/invalid capture DMA phandle\n"); - goto error; - } - - /* Initialize our DAI data structure. */ - machine_data->dai[0].stream_name = "playback"; - machine_data->dai[1].stream_name = "capture"; - machine_data->dai[0].name = machine_data->dai[0].stream_name; - machine_data->dai[1].name = machine_data->dai[1].stream_name; - - machine_data->card.probe = mpc8610_hpcd_machine_probe; - machine_data->card.remove = mpc8610_hpcd_machine_remove; - machine_data->card.name = pdev->name; /* The platform driver name */ - machine_data->card.owner = THIS_MODULE; - machine_data->card.dev = &pdev->dev; - machine_data->card.num_links = 2; - machine_data->card.dai_link = machine_data->dai; - - /* Register with ASoC */ - ret = snd_soc_register_card(&machine_data->card); - if (ret) { - dev_err(&pdev->dev, "could not register card\n"); - goto error; - } - - of_node_put(codec_np); - - return 0; - -error: - kfree(machine_data); -error_alloc: - of_node_put(codec_np); - return ret; -} - -/** - * mpc8610_hpcd_remove: remove the platform device - * - * This function is called when the platform device is removed. - */ -static void mpc8610_hpcd_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - struct mpc8610_hpcd_data *machine_data = - container_of(card, struct mpc8610_hpcd_data, card); - - snd_soc_unregister_card(card); - kfree(machine_data); -} - -static struct platform_driver mpc8610_hpcd_driver = { - .probe = mpc8610_hpcd_probe, - .remove_new = mpc8610_hpcd_remove, - .driver = { - /* The name must match 'compatible' property in the device tree, - * in lowercase letters. - */ - .name = "snd-soc-mpc8610hpcd", - }, -}; - -/** - * mpc8610_hpcd_init: machine driver initialization. - * - * This function is called when this module is loaded. - */ -static int __init mpc8610_hpcd_init(void) -{ - struct device_node *guts_np; - struct resource res; - - pr_info("Freescale MPC8610 HPCD ALSA SoC machine driver\n"); - - /* Get the physical address of the global utilities registers */ - guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts"); - if (of_address_to_resource(guts_np, 0, &res)) { - pr_err("mpc8610-hpcd: missing/invalid global utilities node\n"); - of_node_put(guts_np); - return -EINVAL; - } - guts_phys = res.start; - of_node_put(guts_np); - - return platform_driver_register(&mpc8610_hpcd_driver); -} - -/** - * mpc8610_hpcd_exit: machine driver exit - * - * This function is called when this driver is unloaded. - */ -static void __exit mpc8610_hpcd_exit(void) -{ - platform_driver_unregister(&mpc8610_hpcd_driver); -} - -module_init(mpc8610_hpcd_init); -module_exit(mpc8610_hpcd_exit); - -MODULE_AUTHOR("Timur Tabi <timur(a)freescale.com>"); -MODULE_DESCRIPTION("Freescale MPC8610 HPCD ALSA SoC machine driver"); -MODULE_LICENSE("GPL v2"); -- 2.41.0

2 4

[PATCH] soundwire: stream: constify sdw_port_config when adding devices
by Krzysztof Kozlowski 23 Nov '23

23 Nov '23

sdw_stream_add_master() and sdw_stream_add_slave() do not modify contents of passed sdw_port_config, so it can be made const for code safety and as documentation of expected usage. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/soundwire/stream.c | 10 +++++----- include/linux/soundwire/sdw.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 69719b335bcb..9dc6399f206a 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -897,7 +897,7 @@ static struct sdw_port_runtime *sdw_port_alloc(struct list_head *port_list) } static int sdw_port_config(struct sdw_port_runtime *p_rt, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, int port_index) { p_rt->ch_mask = port_config[port_index].ch_mask; @@ -970,7 +970,7 @@ static int sdw_slave_port_is_valid_range(struct device *dev, int num) static int sdw_slave_port_config(struct sdw_slave *slave, struct sdw_slave_runtime *s_rt, - struct sdw_port_config *port_config) + const struct sdw_port_config *port_config) { struct sdw_port_runtime *p_rt; int ret; @@ -1026,7 +1026,7 @@ static int sdw_master_port_alloc(struct sdw_master_runtime *m_rt, } static int sdw_master_port_config(struct sdw_master_runtime *m_rt, - struct sdw_port_config *port_config) + const struct sdw_port_config *port_config) { struct sdw_port_runtime *p_rt; int ret; @@ -1861,7 +1861,7 @@ EXPORT_SYMBOL(sdw_release_stream); */ int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_stream_config *stream_config, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream) { @@ -1981,7 +1981,7 @@ EXPORT_SYMBOL(sdw_stream_remove_master); */ int sdw_stream_add_slave(struct sdw_slave *slave, struct sdw_stream_config *stream_config, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream) { diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 4f3d14bb1538..904004d8b562 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -1040,7 +1040,7 @@ int sdw_compute_params(struct sdw_bus *bus); int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_stream_config *stream_config, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream); int sdw_stream_remove_master(struct sdw_bus *bus, @@ -1062,7 +1062,7 @@ void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id int sdw_stream_add_slave(struct sdw_slave *slave, struct sdw_stream_config *stream_config, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream); int sdw_stream_remove_slave(struct sdw_slave *slave, @@ -1084,7 +1084,7 @@ int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val); static inline int sdw_stream_add_slave(struct sdw_slave *slave, struct sdw_stream_config *stream_config, - struct sdw_port_config *port_config, + const struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream) { -- 2.34.1

3 2

[PATCH 1/2] soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup
by Krzysztof Kozlowski 23 Nov '23

23 Nov '23

The cleanup in "err" goto label clears bits from pconfig array which is a local variable. This does not have any effect outside of this function, so drop this useless code. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/soundwire/qcom.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index a1e2d6c98186..754870a4a047 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1157,7 +1157,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl, struct sdw_port_runtime *p_rt; struct sdw_slave *slave; unsigned long *port_mask; - int i, maxport, pn, nports = 0, ret = 0; + int maxport, pn, nports = 0, ret = 0; unsigned int m_port; mutex_lock(&ctrl->port_lock); @@ -1183,7 +1183,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl, if (pn > maxport) { dev_err(ctrl->dev, "All ports busy\n"); ret = -EBUSY; - goto err; + goto out; } set_bit(pn, port_mask); pconfig[nports].num = pn; @@ -1205,12 +1205,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl, sconfig.bps = 1; sdw_stream_add_master(&ctrl->bus, &sconfig, pconfig, nports, stream); -err: - if (ret) { - for (i = 0; i < nports; i++) - clear_bit(pconfig[i].num, port_mask); - } - +out: mutex_unlock(&ctrl->port_lock); return ret; -- 2.34.1

3 4

[PATCH] ASoC: fsl_xcvr: Enable 2 * TX bit clock for spdif only case
by Shengjiu Wang 22 Nov '23

22 Nov '23

The bit 10 in TX_DPTH_CTRL register controls the TX clock rate. If this bit is set, TX datapath clock should be = 2* TX bit rate. If this bit is not set, TX datapath clock should be 10* TX bit rate. As the spdif only case, we always use 2 * TX bit clock, so this bit need to be set. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_xcvr.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c index fa0a15263c66..77f8e2394bf9 100644 --- a/sound/soc/fsl/fsl_xcvr.c +++ b/sound/soc/fsl/fsl_xcvr.c @@ -414,6 +414,16 @@ static int fsl_xcvr_prepare(struct snd_pcm_substream *substream, switch (xcvr->mode) { case FSL_XCVR_MODE_SPDIF: + if (xcvr->soc_data->spdif_only && tx) { + ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_TX_DPTH_CTRL_SET, + FSL_XCVR_TX_DPTH_CTRL_BYPASS_FEM, + FSL_XCVR_TX_DPTH_CTRL_BYPASS_FEM); + if (ret < 0) { + dev_err(dai->dev, "Failed to set bypass fem: %d\n", ret); + return ret; + } + } + fallthrough; case FSL_XCVR_MODE_ARC: if (tx) { ret = fsl_xcvr_en_aud_pll(xcvr, fout); -- 2.34.1

2 1

[PATCH v4] ASoC: cs43130: Allow driver to work without IRQ connection
by Maciej Strozek 22 Nov '23

22 Nov '23

Add a polling mechanism that will keep the driver operational even in absence of physical IRQ connection. If IRQ line is detected, the driver will continue working as usual, in case of missing IRQ line it will fallback to the polling mechanism introduced in this change. This will support users which choose not to connect an IRQ line as it is not critical to part's operation. Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- V3 -> V4: - Removed unnecesary else and indentation - Changed cs43130_wait_for_completion return codes and updated callers accordingly - Changed approach for checking for presence of IRQ connection: see if client->irq equals 0 which seems to be a standard way of checking it used by other drivers (instead of inspecting devm_request_threaded_irq error code) V2 -> V3: Amended changelog message and subject line V1 -> V2: Add changelog message sound/soc/codecs/cs43130.c | 91 +++++++++++++++++++++++++++----------- sound/soc/codecs/cs43130.h | 1 + 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index 02e7f45b9208..bd51bb5b6f14 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -326,6 +326,40 @@ static int cs43130_set_pll(struct snd_soc_component *component, int pll_id, int return ret; } +static int cs43130_wait_for_completion(struct cs43130_private *cs43130, struct completion *to_poll, + int time) +{ + int stickies, offset, flag, ret; + + if (cs43130->has_irq_line) { + ret = wait_for_completion_timeout(to_poll, msecs_to_jiffies(time)); + if (ret == 0) + return -ETIMEDOUT; + else + return 0; // Discard number of jiffies left till timeout and return success + } + + if (to_poll == &cs43130->xtal_rdy) { + offset = 0; + flag = CS43130_XTAL_RDY_INT; + } else if (to_poll == &cs43130->pll_rdy) { + offset = 0; + flag = CS43130_PLL_RDY_INT; + } else if (to_poll == &cs43130->hpload_evt) { + offset = 3; + flag = CS43130_HPLOAD_NO_DC_INT | CS43130_HPLOAD_UNPLUG_INT | + CS43130_HPLOAD_OOR_INT | CS43130_HPLOAD_AC_INT | + CS43130_HPLOAD_DC_INT | CS43130_HPLOAD_ON_INT | + CS43130_HPLOAD_OFF_INT; + } else { + return -EINVAL; + } + + return regmap_read_poll_timeout(cs43130->regmap, CS43130_INT_STATUS_1 + offset, + stickies, (stickies & flag), + 1000, time * 1000); +} + static int cs43130_change_clksrc(struct snd_soc_component *component, enum cs43130_mclk_src_sel src) { @@ -364,14 +398,13 @@ static int cs43130_change_clksrc(struct snd_soc_component *component, CS43130_XTAL_RDY_INT_MASK, 0); regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL, CS43130_PDN_XTAL_MASK, 0); - ret = wait_for_completion_timeout(&cs43130->xtal_rdy, - msecs_to_jiffies(100)); + ret = cs43130_wait_for_completion(cs43130, &cs43130->xtal_rdy, 100); regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1, CS43130_XTAL_RDY_INT_MASK, 1 << CS43130_XTAL_RDY_INT_SHIFT); - if (ret == 0) { - dev_err(cs43130->dev, "Timeout waiting for XTAL_READY interrupt\n"); - return -ETIMEDOUT; + if (ret) { + dev_err(cs43130->dev, "Error waiting for XTAL_READY interrupt: %d\n", ret); + return ret; } } @@ -400,14 +433,13 @@ static int cs43130_change_clksrc(struct snd_soc_component *component, CS43130_XTAL_RDY_INT_MASK, 0); regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL, CS43130_PDN_XTAL_MASK, 0); - ret = wait_for_completion_timeout(&cs43130->xtal_rdy, - msecs_to_jiffies(100)); + ret = cs43130_wait_for_completion(cs43130, &cs43130->xtal_rdy, 100); regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1, CS43130_XTAL_RDY_INT_MASK, 1 << CS43130_XTAL_RDY_INT_SHIFT); - if (ret == 0) { - dev_err(cs43130->dev, "Timeout waiting for XTAL_READY interrupt\n"); - return -ETIMEDOUT; + if (ret) { + dev_err(cs43130->dev, "Error waiting for XTAL_READY interrupt: %d\n", ret); + return ret; } } @@ -416,14 +448,13 @@ static int cs43130_change_clksrc(struct snd_soc_component *component, CS43130_PLL_RDY_INT_MASK, 0); regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL, CS43130_PDN_PLL_MASK, 0); - ret = wait_for_completion_timeout(&cs43130->pll_rdy, - msecs_to_jiffies(100)); + ret = cs43130_wait_for_completion(cs43130, &cs43130->pll_rdy, 100); regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1, CS43130_PLL_RDY_INT_MASK, 1 << CS43130_PLL_RDY_INT_SHIFT); - if (ret == 0) { - dev_err(cs43130->dev, "Timeout waiting for PLL_READY interrupt\n"); - return -ETIMEDOUT; + if (ret) { + dev_err(cs43130->dev, "Error waiting for PLL_READY interrupt: %d\n", ret); + return ret; } regmap_update_bits(cs43130->regmap, CS43130_SYS_CLK_CTL_1, @@ -2048,12 +2079,12 @@ static int cs43130_hpload_proc(struct cs43130_private *cs43130, regmap_multi_reg_write(cs43130->regmap, seq, seq_size); - ret = wait_for_completion_timeout(&cs43130->hpload_evt, - msecs_to_jiffies(1000)); + ret = cs43130_wait_for_completion(cs43130, &cs43130->hpload_evt, 1000); + regmap_read(cs43130->regmap, CS43130_INT_MASK_4, &msk); - if (!ret) { - dev_err(cs43130->dev, "Timeout waiting for HPLOAD interrupt\n"); - return -1; + if (ret) { + dev_err(cs43130->dev, "Timeout waiting for HPLOAD interrupt: %d\n", ret); + return ret; } dev_dbg(cs43130->dev, "HP load stat: %x, INT_MASK_4: %x\n", @@ -2548,13 +2579,19 @@ static int cs43130_i2c_probe(struct i2c_client *client) init_completion(&cs43130->pll_rdy); init_completion(&cs43130->hpload_evt); - ret = devm_request_threaded_irq(cs43130->dev, client->irq, - NULL, cs43130_irq_thread, - IRQF_ONESHOT | IRQF_TRIGGER_LOW, - "cs43130", cs43130); - if (ret != 0) { - dev_err(cs43130->dev, "Failed to request IRQ: %d\n", ret); - goto err; + if (!client->irq) { + dev_dbg(cs43130->dev, "IRQ not found, will poll instead\n"); + cs43130->has_irq_line = 0; + } else { + ret = devm_request_threaded_irq(cs43130->dev, client->irq, + NULL, cs43130_irq_thread, + IRQF_ONESHOT | IRQF_TRIGGER_LOW, + "cs43130", cs43130); + if (ret != 0) { + dev_err(cs43130->dev, "Failed to request IRQ: %d\n", ret); + goto err; + } + cs43130->has_irq_line = 1; } cs43130->mclk_int_src = CS43130_MCLK_SRC_RCO; diff --git a/sound/soc/codecs/cs43130.h b/sound/soc/codecs/cs43130.h index d3f595bbd3ba..dbdb5b262f1b 100644 --- a/sound/soc/codecs/cs43130.h +++ b/sound/soc/codecs/cs43130.h @@ -508,6 +508,7 @@ struct cs43130_private { struct gpio_desc *reset_gpio; unsigned int dev_id; /* codec device ID */ int xtal_ibias; + bool has_irq_line; /* shared by both DAIs */ struct mutex clk_mutex; -- 2.34.1

2 2

ucm2: Add support for MT8186 Corsola Steelix Chromebook with SOF
by GitHub pull_request - opened 22 Nov '23

22 Nov '23

alsa-project/alsa-ucm-conf pull request #368 was opened from kholk: Add support for the Lenovo 300e Yoga Chromebook Gen4, powered by MediaTek Kompanio 520 (MT8186) with a HiFi4 Audio DSP running SoundOpenFirmware. This machine uses the MT6366 PMIC, with RT1019 and RT5862s as headphones and speaker codecs/amps. This configuration has been successfully tested on ArchLinux with PipeWire 0.3.83 + WirePlumber. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/368 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/368.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: hda: cs35l56: Enable low-power hibernation mode on SPI
by Richard Fitzgerald 22 Nov '23

22 Nov '23

SPI hibernation is now supported with the latest hibernation/wake sequences in the shared ASoC code. This has a functional dependency on two commits: commit 3df761bdbc8b ("ASoC: cs35l56: Wake transactions need to be issued twice") commit a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use allow auto hibernate") To protect against this, enabling hibernation is conditional on CS35L56_WAKE_HOLD_TIME_US being defined, which indicates that the new hibernation sequences are available. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/pci/hda/cs35l56_hda_spi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/hda/cs35l56_hda_spi.c b/sound/pci/hda/cs35l56_hda_spi.c index 756aec342eab..27d7fbc56b4c 100644 --- a/sound/pci/hda/cs35l56_hda_spi.c +++ b/sound/pci/hda/cs35l56_hda_spi.c @@ -21,6 +21,10 @@ static int cs35l56_hda_spi_probe(struct spi_device *spi) return -ENOMEM; cs35l56->base.dev = &spi->dev; + +#ifdef CS35L56_WAKE_HOLD_TIME_US + cs35l56->base.can_hibernate = true; +#endif cs35l56->base.regmap = devm_regmap_init_spi(spi, &cs35l56_regmap_spi); if (IS_ERR(cs35l56->base.regmap)) { ret = PTR_ERR(cs35l56->base.regmap); -- 2.30.2

2 3

[RFC PATCH] ASoC: simple-card: Use dai_id from node description
by Daniel Baluta 22 Nov '23

22 Nov '23

From: Daniel Baluta <daniel.baluta(a)nxp.com> We can specify DAI id using reg property. When dts node has only 1 DAI simple-card always assumes that DAI id is 0. But this is not correct in the case of SOF for example which adds DAIs staticaly (See definition of snd_soc_dai_driver in sound/soc/sof/imx/imx8m.c) Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.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 8ec5d413e8e60..739cb71593a88 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1121,7 +1121,7 @@ int asoc_graph_parse_dai(struct device *dev, struct device_node *ep, /* Get dai->name */ args.np = node; args.args[0] = graph_get_dai_id(ep); - args.args_count = (of_graph_get_endpoint_count(node) > 1); + args.args_count = (of_graph_get_endpoint_count(node) >= 1); /* * FIXME -- 2.25.1

3 7

Bug report - kernel 6.6.1 and 6.6.2 - speakers problem on Lenovo Legion 7 ACHg6 (82N6) laptop
by Primož Šušterič 22 Nov '23

22 Nov '23

BUG REPORT: Summary: I am experiencing an issue with my Lenovo Legion 7 ACHg6 (82N6) laptop's audio on Linux kernel version 6.6.2-zen1-1-zen on EndeavourOS Linux, where the sound works perfectly through Bluetooth, HDMI, and other outputs but not through the laptop's built-in speakers. Steps to Reproduction Boot into Linux kernel version 6.6.2-zen1-1-zen, 6.6.1-zen, 6.6.1-arch and 6.6.2-arch. Test audio output through Bluetooth and HDMI, which works as expected. Attempt to play sound through laptop's built-in speakers (identified as 'HD-Audio Generic', device 0: ALC287 Analog in aplay -l output). Observe that no sound is produced from the laptop speakers, despite other audio outputs working correctly. Here are detailed information about the system and Bug: uname -a Linux robo008 6.6.2-zen1-1-zen #1 ZEN SMP PREEMPT_DYNAMIC Mon, 20 Nov 2023 23:17:26 +0000 x86_64 GNU/Linux ____________________________________________________________________________ lspci -v 00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne Root Complex Subsystem: Lenovo Renoir/Cezanne Root Complex Flags: fast devsel 00:00.2 IOMMU: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne IOMMU Subsystem: Lenovo Renoir/Cezanne IOMMU Flags: bus master, fast devsel, latency 0, IRQ -2147483648 Capabilities: <access denied> 00:01.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Renoir PCIe Dummy Host Bridge Flags: fast devsel, IOMMU group 0 00:01.1 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir PCIe GPP Bridge (prog-if 00 [Normal decode]) Subsystem: Lenovo Renoir PCIe GPP Bridge Flags: bus master, fast devsel, latency 0, IRQ 28, IOMMU group 1 Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 3000-3fff [size=4K] [16-bit] Memory behind bridge: d0000000-d10fffff [size=17M] [32-bit] Prefetchable memory behind bridge: f800000000-fc01ffffff [size=16416M] [32-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:01.2 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne PCIe GPP Bridge (prog-if 00 [Normal decode]) Subsystem: Lenovo Renoir/Cezanne PCIe GPP Bridge Flags: bus master, fast devsel, latency 0, IRQ 29, IOMMU group 2 Bus: primary=00, secondary=02, subordinate=02, sec-latency=0 I/O behind bridge: [disabled] [32-bit] Memory behind bridge: d1900000-d19fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:02.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Renoir PCIe Dummy Host Bridge Flags: fast devsel, IOMMU group 3 00:02.1 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne PCIe GPP Bridge (prog-if 00 [Normal decode]) Subsystem: Lenovo Renoir/Cezanne PCIe GPP Bridge Flags: bus master, fast devsel, latency 0, IRQ 30, IOMMU group 4 Bus: primary=00, secondary=03, subordinate=03, sec-latency=0 I/O behind bridge: 2000-2fff [size=4K] [16-bit] Memory behind bridge: d1800000-d18fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:02.2 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne PCIe GPP Bridge (prog-if 00 [Normal decode]) Subsystem: Lenovo Renoir/Cezanne PCIe GPP Bridge Flags: bus master, fast devsel, latency 0, IRQ 31, IOMMU group 5 Bus: primary=00, secondary=04, subordinate=04, sec-latency=0 I/O behind bridge: [disabled] [32-bit] Memory behind bridge: d1700000-d17fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:02.4 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne PCIe GPP Bridge (prog-if 00 [Normal decode]) Subsystem: Lenovo Renoir/Cezanne PCIe GPP Bridge Flags: bus master, fast devsel, latency 0, IRQ 32, IOMMU group 6 Bus: primary=00, secondary=05, subordinate=05, sec-latency=0 I/O behind bridge: [disabled] [32-bit] Memory behind bridge: d1600000-d16fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:08.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Renoir PCIe Dummy Host Bridge Flags: fast devsel, IOMMU group 7 00:08.1 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir Internal PCIe GPP Bridge to Bus (prog-if 00 [Normal decode]) Subsystem: Advanced Micro Devices, Inc. [AMD] Renoir Internal PCIe GPP Bridge to Bus Flags: bus master, fast devsel, latency 0, IRQ 33, IOMMU group 8 Bus: primary=00, secondary=06, subordinate=06, sec-latency=0 I/O behind bridge: 1000-1fff [size=4K] [16-bit] Memory behind bridge: d1200000-d15fffff [size=4M] [32-bit] Prefetchable memory behind bridge: fc10000000-fc201fffff [size=258M] [32-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:08.2 PCI bridge: Advanced Micro Devices, Inc. [AMD] Renoir Internal PCIe GPP Bridge to Bus (prog-if 00 [Normal decode]) Subsystem: Advanced Micro Devices, Inc. [AMD] Renoir Internal PCIe GPP Bridge to Bus Flags: bus master, fast devsel, latency 0, IRQ 34, IOMMU group 9 Bus: primary=00, secondary=07, subordinate=07, sec-latency=0 I/O behind bridge: [disabled] [32-bit] Memory behind bridge: d1100000-d11fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:14.0 SMBus: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller (rev 51) Subsystem: Lenovo FCH SMBus Controller Flags: 66MHz, medium devsel, IOMMU group 10 Kernel driver in use: piix4_smbus Kernel modules: i2c_piix4, sp5100_tco 00:14.3 ISA bridge: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge (rev 51) Subsystem: Lenovo FCH LPC Bridge Flags: bus master, 66MHz, medium devsel, latency 0, IOMMU group 10 00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 0 Flags: fast devsel, IOMMU group 11 00:18.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 1 Flags: fast devsel, IOMMU group 11 00:18.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 2 Flags: fast devsel, IOMMU group 11 00:18.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 3 Flags: fast devsel, IOMMU group 11 Kernel driver in use: k10temp Kernel modules: k10temp 00:18.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 4 Flags: fast devsel, IOMMU group 11 00:18.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 5 Flags: fast devsel, IOMMU group 11 00:18.6 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 6 Flags: fast devsel, IOMMU group 11 00:18.7 Host bridge: Advanced Micro Devices, Inc. [AMD] Cezanne Data Fabric; Function 7 Flags: fast devsel, IOMMU group 11 01:00.0 VGA compatible controller: NVIDIA Corporation GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB] (rev a1) (prog-if 00 [VGA controller]) Subsystem: Lenovo GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB] Flags: bus master, fast devsel, latency 0, IRQ 132, IOMMU group 12 Memory at d0000000 (32-bit, non-prefetchable) [size=16M] Memory at f800000000 (64-bit, prefetchable) [size=16G] Memory at fc00000000 (64-bit, prefetchable) [size=32M] I/O ports at 3000 [size=128] Expansion ROM at d1080000 [virtual] [disabled] [size=512K] Capabilities: <access denied> Kernel driver in use: nvidia Kernel modules: nouveau, nvidia_drm, nvidia 01:00.1 Audio device: NVIDIA Corporation GA104 High Definition Audio Controller (rev a1) Flags: bus master, fast devsel, latency 0, IRQ 128, IOMMU group 12 Memory at d1000000 (32-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel 02:00.0 Non-Volatile memory controller: SK hynix Gold P31/BC711/PC711 NVMe Solid State Drive (prog-if 02 [NVM Express]) Subsystem: SK hynix Gold P31/BC711/PC711 NVMe Solid State Drive Flags: bus master, fast devsel, latency 0, IRQ 62, IOMMU group 13 Memory at d1900000 (64-bit, non-prefetchable) [size=16K] Memory at d1905000 (32-bit, non-prefetchable) [size=4K] Memory at d1904000 (32-bit, non-prefetchable) [size=4K] Capabilities: <access denied> Kernel driver in use: nvme Kernel modules: nvme 03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15) DeviceName: Realtek RTL8111E Ethernet LOM Subsystem: Lenovo RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller Flags: bus master, fast devsel, latency 0, IRQ 40, IOMMU group 14 I/O ports at 2000 [size=256] Memory at d1804000 (64-bit, non-prefetchable) [size=4K] Memory at d1800000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: r8169 Kernel modules: r8169 04:00.0 Network controller: Intel Corporation Wi-Fi 6 AX200 (rev 1a) Subsystem: Rivet Networks Killer Wi-Fi 6 AX1650x (AX200NGW) Flags: bus master, fast devsel, latency 0, IRQ 99, IOMMU group 15 Memory at d1700000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: iwlwifi Kernel modules: iwlwifi 05:00.0 Non-Volatile memory controller: Kingston Technology Company, Inc. KC3000/Renegade NVMe SSD (rev 01) (prog-if 02 [NVM Express]) Subsystem: Kingston Technology Company, Inc. KC3000/Renegade NVMe SSD Flags: bus master, fast devsel, latency 0, IRQ 61, IOMMU group 16 Memory at d1600000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: nvme Kernel modules: nvme 06:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] (rev c4) (prog-if 00 [VGA controller]) Subsystem: Lenovo Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] Flags: bus master, fast devsel, latency 0, IRQ 52, IOMMU group 17 Memory at fc10000000 (64-bit, prefetchable) [size=256M] Memory at fc20000000 (64-bit, prefetchable) [size=2M] I/O ports at 1000 [size=256] Memory at d1500000 (32-bit, non-prefetchable) [size=512K] Capabilities: <access denied> Kernel driver in use: amdgpu Kernel modules: amdgpu 06:00.2 Encryption controller: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 10h-1fh) Platform Security Processor Subsystem: Lenovo Family 17h (Models 10h-1fh) Platform Security Processor Flags: bus master, fast devsel, latency 0, IRQ 40, IOMMU group 18 Memory at d1400000 (32-bit, non-prefetchable) [size=1M] Memory at d1588000 (32-bit, non-prefetchable) [size=8K] Capabilities: <access denied> Kernel driver in use: ccp Kernel modules: ccp 06:00.3 USB controller: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne USB 3.1 (prog-if 30 [XHCI]) Subsystem: Lenovo Renoir/Cezanne USB 3.1 Flags: bus master, fast devsel, latency 0, IRQ 43, IOMMU group 19 Memory at d1200000 (64-bit, non-prefetchable) [size=1M] Capabilities: <access denied> Kernel driver in use: xhci_hcd Kernel modules: xhci_pci 06:00.4 USB controller: Advanced Micro Devices, Inc. [AMD] Renoir/Cezanne USB 3.1 (prog-if 30 [XHCI]) Subsystem: Lenovo Renoir/Cezanne USB 3.1 Flags: fast devsel, IRQ 52, IOMMU group 20 Memory at d1300000 (64-bit, non-prefetchable) [size=1M] Capabilities: <access denied> Kernel driver in use: xhci_hcd Kernel modules: xhci_pci 06:00.6 Audio device: Advanced Micro Devices, Inc. [AMD] Family 17h/19h HD Audio Controller Subsystem: Lenovo Family 17h/19h HD Audio Controller Flags: bus master, fast devsel, latency 0, IRQ 129, IOMMU group 21 Memory at d1580000 (32-bit, non-prefetchable) [size=32K] Capabilities: <access denied> Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel 07:00.0 SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI mode] (rev 81) (prog-if 01 [AHCI 1.0]) Subsystem: Lenovo FCH SATA Controller [AHCI mode] Flags: bus master, fast devsel, latency 0, IRQ 36, IOMMU group 22 Memory at d1101000 (32-bit, non-prefetchable) [size=2K] Capabilities: <access denied> Kernel driver in use: ahci 07:00.1 SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI mode] (rev 81) (prog-if 01 [AHCI 1.0]) Subsystem: Lenovo FCH SATA Controller [AHCI mode] Flags: bus master, fast devsel, latency 0, IRQ 38, IOMMU group 23 Memory at d1100000 (32-bit, non-prefetchable) [size=2K] Capabilities: <access denied> Kernel driver in use: ahci ____________________________________________________________________________ lsmod Module Size Used by uinput 24576 1 snd_seq_dummy 12288 0 snd_hrtimer 12288 1 snd_seq 135168 7 snd_seq_dummy snd_seq_device 16384 1 snd_seq rfcomm 102400 19 cmac 12288 3 algif_hash 12288 1 algif_skcipher 12288 1 af_alg 36864 6 algif_hash,algif_skcipher nvidia_drm 118784 3 nvidia_modeset 1585152 3 nvidia_drm nft_fib_inet 12288 1 nft_fib_ipv4 12288 1 nft_fib_inet nft_fib_ipv6 12288 1 nft_fib_inet nft_fib 12288 3 nft_fib_ipv6,nft_fib_ipv4,nft_fib_inet nft_reject_inet 12288 10 nf_reject_ipv4 16384 1 nft_reject_inet nf_reject_ipv6 24576 1 nft_reject_inet nft_reject 12288 1 nft_reject_inet nft_ct 28672 7 nft_chain_nat 12288 3 nf_nat 69632 1 nft_chain_nat nf_conntrack 221184 2 nf_nat,nft_ct nf_defrag_ipv6 24576 1 nf_conntrack nf_defrag_ipv4 12288 1 nf_conntrack nvidia 62394368 33 nvidia_modeset nf_tables 393216 253 nft_ct,nft_reject_inet,nft_fib_ipv6,nft_fib_ipv4,nft_chain_nat,nft_reject,nft_fib,nft_fib_inet libcrc32c 12288 3 nf_conntrack,nf_nat,nf_tables nfnetlink 20480 2 nf_tables bnep 32768 2 hid_logitech_hidpp 73728 0 intel_rapl_msr 20480 0 intel_rapl_common 40960 1 intel_rapl_msr snd_hda_codec_realtek 217088 1 amdgpu 13197312 46 snd_hda_codec_generic 131072 1 snd_hda_codec_realtek ledtrig_audio 12288 1 snd_hda_codec_generic snd_hda_codec_hdmi 102400 1 iwlmvm 757760 0 snd_hda_intel 65536 2 snd_intel_dspcfg 40960 1 snd_hda_intel edac_mce_amd 53248 0 snd_intel_sdw_acpi 16384 1 snd_intel_dspcfg drm_exec 12288 1 amdgpu hid_logitech_dj 40960 0 mac80211 1662976 1 iwlmvm amdxcp 12288 1 amdgpu drm_buddy 20480 1 amdgpu snd_hda_codec 237568 4 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec_realtek kvm_amd 204800 0 btusb 86016 0 gpu_sched 61440 1 amdgpu libarc4 12288 1 mac80211 snd_hda_core 151552 5 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,snd_hda_codec_realtek i2c_algo_bit 24576 1 amdgpu btrtl 32768 1 btusb kvm 1449984 1 kvm_amd btintel 61440 1 btusb snd_hwdep 20480 1 snd_hda_codec drm_suballoc_helper 12288 1 amdgpu vfat 20480 1 snd_hda_scodec_cs35l41_i2c 12288 0 iwlwifi 598016 1 iwlmvm drm_ttm_helper 12288 1 amdgpu btbcm 24576 1 btusb snd_hda_scodec_cs35l41 53248 1 snd_hda_scodec_cs35l41_i2c fat 106496 1 vfat snd_pcm 225280 4 snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,snd_hda_core r8169 131072 0 ttm 110592 2 amdgpu,drm_ttm_helper snd_hda_cs_dsp_ctls 16384 1 snd_hda_scodec_cs35l41 btmtk 12288 1 btusb cs_dsp 81920 2 snd_hda_scodec_cs35l41,snd_hda_cs_dsp_ctls realtek 40960 1 bluetooth 1167360 52 btrtl,btmtk,btintel,btbcm,bnep,btusb,rfcomm irqbypass 12288 1 kvm drm_display_helper 245760 1 amdgpu usbhid 90112 2 hid_logitech_dj,hid_logitech_hidpp mdio_devres 12288 1 r8169 snd_timer 53248 3 snd_seq,snd_hrtimer,snd_pcm snd_soc_cs35l41_lib 45056 2 snd_hda_scodec_cs35l41_i2c,snd_hda_scodec_cs35l41 cfg80211 1376256 3 iwlmvm,iwlwifi,mac80211 rapl 20480 0 ecdh_generic 16384 2 bluetooth libphy 241664 3 r8169,mdio_devres,realtek cec 102400 1 drm_display_helper wmi_bmof 12288 0 ideapad_laptop 61440 0 snd 167936 18 snd_hda_codec_generic,snd_seq,snd_seq_device,snd_hda_codec_hdmi,snd_hwdep,snd_hda_intel,snd_hda_codec,snd_hda_codec_realtek,snd_hda_scodec_cs35l41,snd_timer,snd_pcm,snd_hda_cs_dsp_ctls pcspkr 12288 0 sparse_keymap 12288 1 ideapad_laptop soundcore 16384 1 snd k10temp 16384 0 i2c_piix4 36864 0 cm32181 16384 0 platform_profile 12288 1 ideapad_laptop rfkill 40960 9 iwlmvm,bluetooth,ideapad_laptop,cfg80211 industrialio 143360 1 cm32181 serial_multi_instantiate 16384 0 joydev 24576 0 mousedev 24576 0 mac_hid 12288 0 fuse 221184 1 loop 36864 0 dm_mod 229376 0 ip_tables 36864 0 x_tables 69632 1 ip_tables ext4 1216512 1 crc32c_generic 12288 0 crc16 12288 2 bluetooth,ext4 mbcache 16384 1 ext4 jbd2 221184 1 ext4 crct10dif_pclmul 12288 1 crc32_pclmul 12288 0 crc32c_intel 16384 3 polyval_clmulni 12288 0 polyval_generic 12288 1 polyval_clmulni serio_raw 16384 0 gf128mul 20480 1 polyval_generic atkbd 40960 0 nvme 69632 2 ghash_clmulni_intel 16384 0 libps2 24576 1 atkbd sha512_ssse3 53248 0 vivaldi_fmap 12288 1 atkbd nvme_core 249856 3 nvme ucsi_acpi 12288 0 aesni_intel 360448 4 video 77824 3 amdgpu,ideapad_laptop,nvidia_modeset hid_multitouch 36864 0 i8042 57344 1 ideapad_laptop typec_ucsi 69632 1 ucsi_acpi xhci_pci 28672 0 crypto_simd 16384 1 aesni_intel cryptd 32768 3 crypto_simd,ghash_clmulni_intel wdat_wdt 24576 0 roles 16384 1 typec_ucsi ccp 172032 1 kvm_amd sp5100_tco 20480 0 xhci_pci_renesas 24576 1 xhci_pci nvme_common 24576 1 nvme_core typec 114688 1 typec_ucsi serio 28672 4 serio_raw,atkbd,i8042 wmi 45056 3 video,wmi_bmof,ideapad_laptop i2c_hid_acpi 12288 0 i2c_hid 45056 1 i2c_hid_acpi pkcs8_key_parser 12288 0 i2c_dev 28672 0 crypto_user 16384 0 ____________________________________________________________________________ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: NVidia [HDA NVidia], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 7: HDMI 1 [HDMI 1] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 8: HDMI 2 [HDMI 2] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 9: HDMI 3 [HDMI 3] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Generic [HD-Audio Generic], device 0: ALC287 Analog [ALC287 Analog] - this one doesnt work... Subdevices: 1/1 Subdevice #0: subdevice #0 ____________________________________________________________________________ dmesg | grep snd [ 3.764199] snd_hda_intel 0000:01:00.1: enabling device (0000 -> 0002) [ 3.764298] snd_hda_intel 0000:01:00.1: Disabling MSI [ 3.764307] snd_hda_intel 0000:01:00.1: Handle vga_switcheroo audio client [ 3.764418] snd_hda_intel 0000:06:00.6: enabling device (0000 -> 0002) [ 4.305102] snd_hda_codec_realtek hdaudioC1D0: bound i2c-CLSA0100:00-cs35l41-hda.0 (ops cs35l41_hda_comp_ops [snd_hda_scodec_cs35l41]) [ 4.827098] snd_hda_codec_realtek hdaudioC1D0: bound i2c-CLSA0100:00-cs35l41-hda.1 (ops cs35l41_hda_comp_ops [snd_hda_scodec_cs35l41]) [ 4.827503] snd_hda_codec_realtek hdaudioC1D0: autoconfig for ALC287: line_outs=1 (0x17/0x0/0x0/0x0/0x0) type:speaker [ 4.827507] snd_hda_codec_realtek hdaudioC1D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 4.827509] snd_hda_codec_realtek hdaudioC1D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) [ 4.827511] snd_hda_codec_realtek hdaudioC1D0: mono: mono_out=0x0 [ 4.827512] snd_hda_codec_realtek hdaudioC1D0: inputs: [ 4.827514] snd_hda_codec_realtek hdaudioC1D0: Mic=0x19 [ 4.827516] snd_hda_codec_realtek hdaudioC1D0: Internal Mic=0x12 ____________________________________________________________________________ journalctl -b | grep audio nov 21 22:37:37 robo008 kernel: snd_hda_intel 0000:01:00.1: Handle vga_switcheroo audio client nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: bound i2c-CLSA0100:00-cs35l41-hda.0 (ops cs35l41_hda_comp_ops [snd_hda_scodec_cs35l41]) nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: bound i2c-CLSA0100:00-cs35l41-hda.1 (ops cs35l41_hda_comp_ops [snd_hda_scodec_cs35l41]) nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: autoconfig for ALC287: line_outs=1 (0x17/0x0/0x0/0x0/0x0) type:speaker nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: mono: mono_out=0x0 nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: inputs: nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: Mic=0x19 nov 21 22:37:38 robo008 kernel: snd_hda_codec_realtek hdaudioC1D0: Internal Mic=0x12 nov 21 22:37:39 robo008 bluetoothd[629]: profiles/audio/micp.c:micp_init() D-Bus experimental not enabled nov 21 22:38:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: Settings schema org.freedesktop.pulseaudio.module-group is not installed nov 21 22:38:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: Settings schema org.freedesktop.pulseaudio.module-group is not installed nov 21 22:38:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: Settings schema org.freedesktop.pulseaudio.module-group is not installed nov 21 22:39:20 robo008 systemsettings[1828]: file:///usr/share/kpackage/kcms/kcm_pulseaudio/contents/ui/CardListItem.qml:16: TypeError: Cannot read property 'width' of null nov 21 23:12:47 robo008 konsole[4404]: kf.notifications: Playing audio notification failed: Destroyed nov 21 23:14:04 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: context kaput nov 21 23:14:04 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "alsa_output.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: context kaput nov 21 23:14:04 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "alsa_output.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "alsa_output.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "alsa_input.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "alsa_output.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "alsa_output.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "alsa_input.pci-0000_06_00.6.analog-stereo" nov 21 23:14:04 robo008 systemsettings[1828]: file:///usr/share/kpackage/kcms/kcm_pulseaudio/contents/ui/CardListItem.qml:16: TypeError: Cannot read property 'width' of null nov 21 23:14:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SINK@" nov 21 23:14:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SOURCE@" nov 21 23:14:06 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SINK@" nov 21 23:14:06 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SOURCE@" nov 21 23:14:06 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SINK@" nov 21 23:14:06 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SOURCE@" nov 21 23:14:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SINK@" nov 21 23:14:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "@DEFAULT_SOURCE@" nov 21 23:14:06 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "alsa_input.pci-0000_06_00.6.analog-stereo" nov 21 23:14:06 robo008 plasmashell[1028]: org.kde.plasma.pulseaudio: No object for name "alsa_input.pci-0000_06_00.6.analog-stereo" nov 21 23:14:07 robo008 systemsettings[1828]: file:///usr/share/kpackage/kcms/kcm_pulseaudio/contents/ui/CardListItem.qml:16: TypeError: Cannot read property 'width' of null nov 21 23:14:07 robo008 systemsettings[1828]: file:///usr/share/kpackage/kcms/kcm_pulseaudio/contents/ui/CardListItem.qml:16: TypeError: Cannot read property 'width' of null nov 21 23:25:00 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "bluez_output.68_D6_ED_88_30_7E.1" nov 21 23:25:00 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "bluez_output.68_D6_ED_88_30_7E.1" nov 21 23:25:00 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "bluez_output.68_D6_ED_88_30_7E.1" nov 21 23:25:00 robo008 systemsettings[1828]: org.kde.plasma.pulseaudio: No object for name "alsa_input.pci-0000_06_00.6.analog-stereo" ____________________________________________________________________________ Kind Regards, Primoz Susteric

1 0

[PATCH v5 1/2] ASoC: dt-bindings: sound-card-common: List sound widgets ignoring system suspend
by Chancel Liu 21 Nov '23

21 Nov '23

Add a property to list audio sound widgets which are marked ignoring system suspend. Paths between these endpoints are still active over suspend of the main application processor that the current operating system is running. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- .../devicetree/bindings/sound/sound-card-common.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/sound-card-common.yaml b/Documentation/devicetree/bindings/sound/sound-card-common.yaml index 3a941177f684..721950f65748 100644 --- a/Documentation/devicetree/bindings/sound/sound-card-common.yaml +++ b/Documentation/devicetree/bindings/sound/sound-card-common.yaml @@ -17,6 +17,13 @@ properties: pair of strings, the first being the connection's sink, the second being the connection's source. + ignore-suspend-widgets: + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + description: | + A list of audio sound widgets which are marked ignoring system suspend. + Paths between these endpoints are still active over suspend of the main + application processor that the current operating system is running. + model: $ref: /schemas/types.yaml#/definitions/string description: User specified audio sound card name -- 2.42.0

2 2