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

[PATCH 3/3] ASoC: rt5645: add the system level suspend-resume callback
by shumingf＠realtek.com 12 Jul '23

12 Jul '23

From: Shuming Fan <shumingf(a)realtek.com> This patch handles the regmap settings and re-detects the jack when the system level suspend/resume. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt5645.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index b0953e9bcaf9..5be5ec0260e9 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -4199,11 +4199,44 @@ static void rt5645_i2c_shutdown(struct i2c_client *i2c) regmap_write(rt5645->regmap, RT5645_RESET, 0); } +static int __maybe_unused rt5645_sys_suspend(struct device *dev) +{ + struct rt5645_priv *rt5645 = dev_get_drvdata(dev); + + del_timer_sync(&rt5645->btn_check_timer); + cancel_delayed_work_sync(&rt5645->jack_detect_work); + cancel_delayed_work_sync(&rt5645->rcclock_work); + + regcache_cache_only(rt5645->regmap, true); + regcache_mark_dirty(rt5645->regmap); + return 0; +} + +static int __maybe_unused rt5645_sys_resume(struct device *dev) +{ + struct rt5645_priv *rt5645 = dev_get_drvdata(dev); + + regcache_cache_only(rt5645->regmap, false); + regcache_sync(rt5645->regmap); + + if (rt5645->hp_jack) { + rt5645->jack_type = 0; + queue_delayed_work(system_power_efficient_wq, + &rt5645->jack_detect_work, msecs_to_jiffies(0)); + } + return 0; +} + +static const struct dev_pm_ops rt5645_pm = { + SET_SYSTEM_SLEEP_PM_OPS(rt5645_sys_suspend, rt5645_sys_resume) +}; + static struct i2c_driver rt5645_i2c_driver = { .driver = { .name = "rt5645", .of_match_table = of_match_ptr(rt5645_of_match), .acpi_match_table = ACPI_PTR(rt5645_acpi_match), + .pm = &rt5645_pm, }, .probe = rt5645_i2c_probe, .remove = rt5645_i2c_remove, -- 2.41.0

2 1

[PATCH 1/3] ASoC: rt5645: implement set_jack callback
by shumingf＠realtek.com 12 Jul '23

12 Jul '23

From: Shuming Fan <shumingf(a)realtek.com> Add a wrapper function to support set_jack component driver callback. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt5645.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index acc7fb1581b2..c0d56a8f7f47 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3258,6 +3258,22 @@ int rt5645_set_jack_detect(struct snd_soc_component *component, } EXPORT_SYMBOL_GPL(rt5645_set_jack_detect); +static int rt5645_component_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *hs_jack, void *data) +{ + struct snd_soc_jack *mic_jack = NULL; + struct snd_soc_jack *btn_jack = NULL; + int *type = (int *)data; + + if (*type & SND_JACK_MICROPHONE) + mic_jack = hs_jack; + if (*type & (SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3)) + btn_jack = hs_jack; + + return rt5645_set_jack_detect(component, hs_jack, mic_jack, btn_jack); +} + static void rt5645_jack_detect_work(struct work_struct *work) { struct rt5645_priv *rt5645 = @@ -3532,6 +3548,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt5645 = { .num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets), .dapm_routes = rt5645_dapm_routes, .num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes), + .set_jack = rt5645_component_set_jack, .use_pmdown_time = 1, .endianness = 1, }; -- 2.41.0

2 1

[PATCH v3 0/3] AMD Vangogh support for NAU8821/MAX98388
by Cristian Ciocaltea 12 Jul '23

12 Jul '23

This patch series extends the Vangogh machine driver to support a variant based on the Nuvoton NAU88L21 Codec and the Analog Devices MAX98388 Speaker Amplifier. Changes in v3: * Dropped acp5x_max98388_hw_params() in PATCH 3/3 and rely on dai_link to set format, according to Mark's review * v2: https://lore.kernel.org/all/20230705134341.175889-1-cristian.ciocaltea@coll… Changes in v2: * Reworked series to ensure the existing devices based on the CS35L41 codec continue to work fine * Rebased onto next-20230703 Cristian Ciocaltea (3): ASoC: amd: vangogh: Make use of DRV_NAME ASoC: amd: vangogh: Use dmi_first_match() for DMI quirk handling ASoC: amd: vangogh: Add support for NAU8821/MAX98388 variant sound/soc/amd/Kconfig | 5 +- sound/soc/amd/vangogh/acp5x-mach.c | 149 +++++++++++++++++++++++++---- 2 files changed, 131 insertions(+), 23 deletions(-) -- 2.41.0

2 4

[PATCH v2 0/4] ASoC: remove copy of intlog10()
by Andy Shevchenko 12 Jul '23

12 Jul '23

The first three patches moves intlog10() to be available in entire kernel. The last one removes copy of it in one driver. Besides already good Lines of Code (LoC) statistics the upcoming users, if any, can utilize the exported functions. The series can be routed via ASoC tree (as Mauro suggested). Note, int_log.h is separated from math.h due to licensing. I dunno if we can mix two in a single header file. In any case we may do it later on. Changelog v2: - moved kernel doc inclusion to the generic place (Mauro) - added tags (Mauro, Mark) Andy Shevchenko (4): lib/math: Move dvb_math.c into lib/math/int_log.c lib/math/int_log: Use ARRAY_SIZE(logtable) where makes sense lib/math/int_log: Replace LGPL-2.1-or-later boilerplate with SPDX identifier ASoC: nau8825: Replace copied'n'pasted intlog10() Documentation/core-api/kernel-api.rst | 7 +- Documentation/driver-api/media/dtv-common.rst | 9 -- drivers/media/dvb-core/Makefile | 2 +- drivers/media/dvb-frontends/af9013_priv.h | 2 +- drivers/media/dvb-frontends/af9033_priv.h | 2 +- drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- drivers/media/dvb-frontends/cxd2841er.c | 2 +- .../cxd2880/cxd2880_tnrdmd_dvbt2_mon.c | 2 +- .../cxd2880/cxd2880_tnrdmd_dvbt_mon.c | 2 +- .../media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- drivers/media/dvb-frontends/dib7000p.c | 2 +- drivers/media/dvb-frontends/dib8000.c | 2 +- drivers/media/dvb-frontends/dib9000.c | 2 +- drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/dvb-frontends/lgdt3305.c | 2 +- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/lgdt330x.c | 2 +- drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- drivers/media/dvb-frontends/mn88443x.c | 2 +- drivers/media/dvb-frontends/mn88472_priv.h | 2 +- drivers/media/dvb-frontends/mn88473_priv.h | 2 +- drivers/media/dvb-frontends/or51132.c | 2 +- drivers/media/dvb-frontends/or51211.c | 2 +- drivers/media/dvb-frontends/rtl2830_priv.h | 2 +- drivers/media/dvb-frontends/rtl2832_priv.h | 2 +- drivers/media/dvb-frontends/si2165.c | 2 +- drivers/media/dvb-frontends/stv0367.c | 2 +- drivers/media/dvb-frontends/tc90522.c | 2 +- drivers/media/dvb-frontends/tda10048.c | 2 +- include/{media/dvb_math.h => linux/int_log.h} | 18 +--- lib/math/Makefile | 2 +- .../dvb-core/dvb_math.c => lib/math/int_log.c | 26 ++---- sound/soc/codecs/nau8825.c | 93 +------------------ 33 files changed, 49 insertions(+), 160 deletions(-) rename include/{media/dvb_math.h => linux/int_log.h} (63%) rename drivers/media/dvb-core/dvb_math.c => lib/math/int_log.c (84%) -- 2.40.0.1.gaa8946217a0b

3 6

[PATCH 1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command
by Mastan Katragadda 12 Jul '23

12 Jul '23

ACP driver should send SHA DMA completion command to PSP module for RN platform only. Add a revision check for RN platform. Signed-off-by: Mastan Katragadda <Mastan.Katragadda(a)amd.com> --- sound/soc/sof/amd/acp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 2ae76bcd3590..afb505461ea1 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -217,6 +217,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, unsigned int image_length) { struct snd_sof_dev *sdev = adata->dev; + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int tx_count, fw_qualifier, val; int ret; @@ -251,9 +252,12 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); - if (ret) - return ret; + /* psp_send_cmd only required for renoir platform (rev - 3) */ + if (desc->rev == 3) { + ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); + if (ret) + return ret; + } ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE, -- 2.25.1

3 9

[PATCH v2] ASoC: stac9766: fix build errors with REGMAP_AC97
by Randy Dunlap 12 Jul '23

12 Jul '23

Select REGMAP_AC97 to fix these build errors: ERROR: modpost: "regmap_ac97_default_volatile" [sound/soc/codecs/snd-soc-stac9766.ko] undefined! ERROR: modpost: "__regmap_init_ac97" [sound/soc/codecs/snd-soc-stac9766.ko] undefined! Fixes: 6bbf787bb70c ("ASoC: stac9766: Convert to regmap") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Mark Brown <broonie(a)kernel.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: alsa-devel(a)alsa-project.org --- v2: rebase/resend sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -- a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1707,6 +1707,7 @@ config SND_SOC_STA529 config SND_SOC_STAC9766 tristate depends on SND_SOC_AC97_BUS + select REGMAP_AC97 config SND_SOC_STI_SAS tristate "codec Audio support for STI SAS codec"

2 1

[PATCH 0/2] ASoC: mt8188: add memory-region support
by Trevor Wu 12 Jul '23

12 Jul '23

This series introduces support for memory-region, allowing afe memif to utilize the region specified in dts. Trevor Wu (2): ASoC: mediatek: mt8188: add memory-region support ASoC: dt-bindings: mediatek,mt8188-afe: add memory-region .../devicetree/bindings/sound/mediatek,mt8188-afe.yaml | 7 +++++++ sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.18.0

3 4

[PATCH] ASoC: soc-core: protect dlc->of_node under mutex
by Kuninori Morimoto 12 Jul '23

12 Jul '23

dlc->of_node will be set on snd_soc_get_dlc(), but we want 1) protect it by mutex, 2) set only when successed. This patch do it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 11bc5250ffd0..fcc798e0b8f0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3262,8 +3262,6 @@ int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_ struct snd_soc_component *pos; int ret = -EPROBE_DEFER; - dlc->of_node = args->np; - mutex_lock(&client_mutex); for_each_component(pos) { struct device_node *component_of_node = soc_component_to_node(pos); @@ -3317,6 +3315,10 @@ int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_ break; } + + if (ret == 0) + dlc->of_node = args->np; + mutex_unlock(&client_mutex); return ret; } -- 2.25.1

2 1

[PATCH 0/8] ASoC: Intel: avs: New boards and fixes to existing ones
by Cezary Rojewski 12 Jul '23

12 Jul '23

Series adds support for two boards: es8336 and rt5663. The former is utilized by some KBL-based tablets whereas the latter unlocks Chromebooks with rt5663 i2c codecs. As existing implementation of es8336 (es8316.c) codec driver is not prepared to cope with KBL-based platforms, couple of small, clock-related changes precede anything avs-driver related. The tail of patchset cleans up existing implementation of rt5682. Amadeusz Sławiński (2): ASoC: Intel: avs: Add rt5663 machine board ASoC: Intel: avs: Load rt5663 board on KBL-based platforms Cezary Rojewski (6): ASoC: codecs: es8316: Add support for 24 MHz MCLK ASoC: codecs: es8316: Add support for S24_3LE format ASoC: Intel: avs: Add es8336 machine board ASoC: Intel: avs: Load es8336 board on KBL-based platforms ASoC: Intel: avs: rt5682: Add missing components ASoC: Intel: avs: rt5682: Tidy up hw_params() sound/soc/codecs/es8316.c | 5 +- sound/soc/intel/avs/board_selection.c | 16 ++ sound/soc/intel/avs/boards/Kconfig | 20 ++ sound/soc/intel/avs/boards/Makefile | 4 + sound/soc/intel/avs/boards/es8336.c | 315 ++++++++++++++++++++++++++ sound/soc/intel/avs/boards/rt5663.c | 254 +++++++++++++++++++++ sound/soc/intel/avs/boards/rt5682.c | 67 +++--- 7 files changed, 652 insertions(+), 29 deletions(-) create mode 100644 sound/soc/intel/avs/boards/es8336.c create mode 100644 sound/soc/intel/avs/boards/rt5663.c -- 2.25.1

2 9

[PATCH] ASoC: imx-pcm-rpmsg: Set PCM hardware parameters separately
by Chancel Liu 12 Jul '23

12 Jul '23

Different PCM devices may have different PCM hardware parameters. It requires PCM hardware parameters set separately if there is more than one rpmsg sound card. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/fsl/imx-pcm-rpmsg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 765dad607bf6..d63782b8bdef 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -228,6 +228,10 @@ static int imx_rpmsg_pcm_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct rpmsg_info *info = dev_get_drvdata(component->dev); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev); + struct snd_pcm_hardware pcm_hardware; struct rpmsg_msg *msg; int ret = 0; int cmd; @@ -255,10 +259,11 @@ static int imx_rpmsg_pcm_open(struct snd_soc_component *component, info->send_message(msg, info); - imx_rpmsg_pcm_hardware.period_bytes_max = - imx_rpmsg_pcm_hardware.buffer_bytes_max / 2; + pcm_hardware = imx_rpmsg_pcm_hardware; + pcm_hardware.buffer_bytes_max = rpmsg->buffer_size; + pcm_hardware.period_bytes_max = pcm_hardware.buffer_bytes_max / 2; - snd_soc_set_runtime_hwparams(substream, &imx_rpmsg_pcm_hardware); + snd_soc_set_runtime_hwparams(substream, &pcm_hardware); ret = snd_pcm_hw_constraint_integer(substream->runtime, SNDRV_PCM_HW_PARAM_PERIODS); @@ -597,7 +602,6 @@ static int imx_rpmsg_pcm_new(struct snd_soc_component *component, if (ret) return ret; - imx_rpmsg_pcm_hardware.buffer_bytes_max = rpmsg->buffer_size; return snd_pcm_set_fixed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_WC, pcm->card->dev, rpmsg->buffer_size); } -- 2.25.1

3 2