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

[RESEND 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

2 4

[PATCH 1/4] ASoC: codecs: es8326: Add es8326_mute function
by Zhu Ning 12 Jul '23

12 Jul '23

The internal analog power and hp Vref of es8326 should always be on to reduce pop noise. The HP_VOL and HP_CAL are moved to es8326_mute function so they are turned on at last and turned off at first. Also, the calibration should be done manually once during start-up to reduce DC offset on headphone. Signed-off-by: Zhu Ning <zhuning0077(a)gmail.com> --- sound/soc/codecs/es8326.c | 75 ++++++++++++++++----------------------- sound/soc/codecs/es8326.h | 5 +-- 2 files changed, 34 insertions(+), 46 deletions(-) diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index ed348bbf5f49..9190a8779334 100644 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -38,6 +38,9 @@ struct es8326_priv { u8 interrupt_clk; bool jd_inverted; unsigned int sysclk; + + bool calibrated; + int version; }; static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9550, 50, 0); @@ -121,33 +124,12 @@ static const struct snd_soc_dapm_widget es8326_dapm_widgets[] = { /* Analog Power Supply*/ SND_SOC_DAPM_DAC("Right DAC", NULL, ES8326_ANA_PDN, 0, 1), SND_SOC_DAPM_DAC("Left DAC", NULL, ES8326_ANA_PDN, 1, 1), - SND_SOC_DAPM_SUPPLY("Analog Power", ES8326_ANA_PDN, 7, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("IBias Power", ES8326_ANA_PDN, 6, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("ADC Vref", ES8326_ANA_PDN, 5, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("DAC Vref", ES8326_ANA_PDN, 4, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("Vref Power", ES8326_ANA_PDN, 3, 1, NULL, 0), SND_SOC_DAPM_SUPPLY("MICBIAS1", ES8326_ANA_MICBIAS, 2, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("MICBIAS2", ES8326_ANA_MICBIAS, 3, 0, NULL, 0), SND_SOC_DAPM_PGA("LHPMIX", ES8326_DAC2HPMIX, 7, 0, NULL, 0), SND_SOC_DAPM_PGA("RHPMIX", ES8326_DAC2HPMIX, 3, 0, NULL, 0), - /* Headphone Charge Pump and Output */ - SND_SOC_DAPM_SUPPLY("HPOR Cal", ES8326_HP_CAL, 7, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("HPOL Cal", ES8326_HP_CAL, 3, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("Headphone Charge Pump", ES8326_HP_DRIVER, - 3, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("Headphone Driver Bias", ES8326_HP_DRIVER, - 2, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("Headphone LDO", ES8326_HP_DRIVER, - 1, 1, NULL, 0), - SND_SOC_DAPM_SUPPLY("Headphone Reference", ES8326_HP_DRIVER, - 0, 1, NULL, 0), - SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPOR Supply", ES8326_HP_CAL, - ES8326_HPOR_SHIFT, 7, 7, 0), - SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPOL Supply", ES8326_HP_CAL, - 0, 7, 7, 0), - SND_SOC_DAPM_OUTPUT("HPOL"), SND_SOC_DAPM_OUTPUT("HPOR"), }; @@ -166,34 +148,12 @@ static const struct snd_soc_dapm_route es8326_dapm_routes[] = { {"I2S OUT", NULL, "ADC L"}, {"I2S OUT", NULL, "ADC R"}, - {"I2S OUT", NULL, "Analog Power"}, - {"I2S OUT", NULL, "ADC Vref"}, - {"I2S OUT", NULL, "Vref Power"}, - {"I2S OUT", NULL, "IBias Power"}, - {"I2S IN", NULL, "Analog Power"}, - {"I2S IN", NULL, "DAC Vref"}, - {"I2S IN", NULL, "Vref Power"}, - {"I2S IN", NULL, "IBias Power"}, - {"Right DAC", NULL, "I2S IN"}, {"Left DAC", NULL, "I2S IN"}, {"LHPMIX", NULL, "Left DAC"}, {"RHPMIX", NULL, "Right DAC"}, - {"HPOR", NULL, "HPOR Cal"}, - {"HPOL", NULL, "HPOL Cal"}, - {"HPOR", NULL, "HPOR Supply"}, - {"HPOL", NULL, "HPOL Supply"}, - {"HPOL", NULL, "Headphone Charge Pump"}, - {"HPOR", NULL, "Headphone Charge Pump"}, - {"HPOL", NULL, "Headphone Driver Bias"}, - {"HPOR", NULL, "Headphone Driver Bias"}, - {"HPOL", NULL, "Headphone LDO"}, - {"HPOR", NULL, "Headphone LDO"}, - {"HPOL", NULL, "Headphone Reference"}, - {"HPOR", NULL, "Headphone Reference"}, - {"HPOL", NULL, "LHPMIX"}, {"HPOR", NULL, "RHPMIX"}, }; @@ -419,6 +379,31 @@ static int es8326_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } +static int es8326_mute(struct snd_soc_dai *dai, int mute, int direction) +{ + struct snd_soc_component *component = dai->component; + struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component); + + if (mute) { + regmap_write(es8326->regmap, ES8326_HP_CAL, 0x00); + regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE, + ES8326_MUTE_MASK, ES8326_MUTE); + regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xf0); + } else { + if (!es8326->calibrated) { + regmap_write(es8326->regmap, ES8326_HP_CAL, 0x88); + msleep(30); + es8326->calibrated = true; + } + regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa0); + regmap_write(es8326->regmap, ES8326_HP_VOL, 0x00); + regmap_write(es8326->regmap, ES8326_HP_CAL, 0x77); + regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE, + ES8326_MUTE_MASK, ~(ES8326_MUTE)); + } + return 0; +} + static int es8326_set_bias_level(struct snd_soc_component *codec, enum snd_soc_bias_level level) { @@ -469,6 +454,8 @@ static const struct snd_soc_dai_ops es8326_ops = { .hw_params = es8326_pcm_hw_params, .set_fmt = es8326_set_dai_fmt, .set_sysclk = es8326_set_dai_sysclk, + .mute_stream = es8326_mute, + .no_capture_mute = 1, }; static struct snd_soc_dai_driver es8326_dai = { @@ -691,7 +678,7 @@ static int es8326_suspend(struct snd_soc_component *component) cancel_delayed_work_sync(&es8326->jack_detect_work); es8326_disable_micbias(component); - + es8326->calibrated = false; regmap_write(es8326->regmap, ES8326_CLK_CTL, ES8326_CLK_OFF); regcache_cache_only(es8326->regmap, true); regcache_mark_dirty(es8326->regmap); diff --git a/sound/soc/codecs/es8326.h b/sound/soc/codecs/es8326.h index 8e5ffe5ee10d..b837ed8c4b39 100644 --- a/sound/soc/codecs/es8326.h +++ b/sound/soc/codecs/es8326.h @@ -9,8 +9,6 @@ #ifndef _ES8326_H #define _ES8326_H -#define CONFIG_HHTECH_MINIPMP 1 - /* ES8326 register space */ #define ES8326_RESET 0x00 #define ES8326_CLK_CTL 0x01 @@ -94,6 +92,8 @@ #define ES8326_PWRUP_SEQ_EN (1 << 5) #define ES8326_CODEC_RESET (0x0f << 0) #define ES8326_CSM_OFF (0 << 7) +#define ES8326_MUTE_MASK (3 << 0) +#define ES8326_MUTE (3 << 0) /* ES8326_CLK_CTL */ #define ES8326_CLK_ON (0x7f << 0) @@ -180,3 +180,4 @@ #define ES8326_VERSION_B (1 << 0) #endif + -- 2.34.1

2 4

[PATCH 0/3] regmap: Fix REGMAP selections
by Geert Uytterhoeven 12 Jul '23

12 Jul '23

Hi all, This patch series fixes several missing selects related to REGMAP. The first patch fixes a serious thinko I made when making the regmap KUnit test depend on REGMAP. The last two patches fix missing selects I discovered when diving deeper into the REGMAP_* => REGMAP logic. Thanks for your comments! Geert Uytterhoeven (3): regmap: Replace "default y if" by select regmap: REGMAP_SLIMBUS should select REGMAP ASoC: codecs: SND_SOC_WCD934X should select REGMAP_IRQ drivers/base/regmap/Kconfig | 16 +++++++++++++++- drivers/mfd/Kconfig | 1 - sound/soc/codecs/Kconfig | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) -- 2.34.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

3 11

[PATCH v2 00/15] spi: Header and core clean up and refactoring
by Andy Shevchenko 12 Jul '23

12 Jul '23

Various cleanups and refactorings of the SPI header and core parts united in a single series. It also touches drivers under SPI subsystem folder on the pure renaming purposes of some constants. No functional change intended. Changelog v2: - added new patches 3,4,5,10,13,14 - massaged comment and kernel doc in patch 9 - split used to be patch 4 to patches 11,12 - covered a few things in SPI core in patch 15 - amended commit message for above (Mark) - reshuffled patches in the series for better logical grouping Andy Shevchenko (15): spi: Remove unneeded OF node NULL checks spi: Drop duplicate IDR allocation code in spi_register_controller() spi: Replace if-else-if by bitops and multiplications spi: Replace open coded spi_controller_xfer_timeout() spi: Remove code duplication in spi_add_device_locked() spi: Use sysfs_emit() to instead of s*printf() spi: Sort headers alphabetically spi: Clean up headers spi: Use struct_size() helper spi: Use predefined constants from bits.h and units.h spi: Get rid of old SPI_MASTER_NO_TX & SPI_MASTER_NO_RX spi: Get rid of old SPI_MASTER_MUST_TX & SPI_MASTER_MUST_RX spi: Rename SPI_MASTER_GPIO_SS to SPI_CONTROLLER_GPIO_SS spi: Convert to SPI_CONTROLLER_HALF_DUPLEX spi: Fix spelling typos and acronyms capitalization drivers/spi/spi-amd.c | 2 +- drivers/spi/spi-at91-usart.c | 2 +- drivers/spi/spi-ath79.c | 2 +- drivers/spi/spi-atmel.c | 4 +- drivers/spi/spi-bitbang-txrx.h | 16 +-- drivers/spi/spi-bitbang.c | 8 +- drivers/spi/spi-cavium-thunderx.c | 2 +- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-dw-core.c | 2 +- drivers/spi/spi-falcon.c | 2 +- drivers/spi/spi-fsl-lpspi.c | 2 +- drivers/spi/spi-gpio.c | 10 +- drivers/spi/spi-imx.c | 2 +- drivers/spi/spi-lp8841-rtc.c | 10 +- drivers/spi/spi-meson-spicc.c | 2 +- drivers/spi/spi-mt65xx.c | 2 +- drivers/spi/spi-mxs.c | 2 +- drivers/spi/spi-omap-uwire.c | 2 +- drivers/spi/spi-orion.c | 2 +- drivers/spi/spi-pci1xxxx.c | 2 +- drivers/spi/spi-pic32-sqi.c | 2 +- drivers/spi/spi-pic32.c | 2 +- drivers/spi/spi-qcom-qspi.c | 2 +- drivers/spi/spi-rb4xx.c | 2 +- drivers/spi/spi-rockchip-sfc.c | 2 +- drivers/spi/spi-rockchip.c | 2 +- drivers/spi/spi-sifive.c | 2 +- drivers/spi/spi-slave-mt27xx.c | 2 +- drivers/spi/spi-sprd-adi.c | 2 +- drivers/spi/spi-stm32.c | 2 +- drivers/spi/spi-ti-qspi.c | 2 +- drivers/spi/spi-xcomm.c | 2 +- drivers/spi/spi-xtensa-xtfpga.c | 2 +- drivers/spi/spi.c | 204 ++++++++++++------------------ include/linux/spi/spi.h | 198 +++++++++++++++++------------ include/trace/events/spi.h | 2 +- 36 files changed, 247 insertions(+), 261 deletions(-) -- 2.40.0.1.gaa8946217a0b

6 47

[PATCH 00/14] ASoC: add multi Component support
by Kuninori Morimoto 12 Jul '23

12 Jul '23

Hi Mark On below HW case, we would like to use it as "2 Cards", but unfortunately it is impossible in intuitive way or possible but not intuitive way. In reality, it is handled as "1 big Card" today. +-- basic board --------+ |+--------+ | || CPU ch0| <--> CodecA | || ch1| <-+ | |+--------+ | | +-------------|---------+ +-- expansion board ----+ | | | | +-> CodecB| +-----------------------+ To handling it as intuitive "2 Cards", this patch-set adds multi Component support. Link: https://lore.kernel.org/all/87a6b6cofh.wl-kuninori.morimoto.gx@renesas.com/ Kuninori Morimoto (14): ASoC: soc-core.c: initialize dlc on snd_soc_get_dai_id() ASoC: soc-core.c: cleanup soc_dai_link_sanity_check() ASoC: soc-dai.c: add DAI get/match functions ASoC: soc-core.c: enable multi Component ASoC: soc-core.c: add snd_soc_get_dai_via_args() ASoC: soc-core.c: add snd_soc_dlc_use_cpu_as_platform() ASoC: soc-core.c: add snd_soc_copy_dai_args() ASoC: simple-card-utils.c: enable multi Component support ASoC: simple-card.c: enable multi Component support ASoC: rsnd: use DAI driver ID instead of DAI ID ASoC: rsnd: cleanup rsnd_dai_of_node() ASoC: rsnd: enable multi Component support for Audio Graph Card/Card2 ASoC: dt-bindings: renesas,rsnd.yaml: add common port-def ASoC: dt-bindings: renesas,rsnd.yaml: enable multi ports for multi Component support .../bindings/sound/renesas,rsnd.yaml | 60 ++-- include/sound/simple_card_utils.h | 5 +- include/sound/soc-dai.h | 3 + include/sound/soc.h | 6 + sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/generic/audio-graph-card2.c | 2 +- sound/soc/generic/simple-card-utils.c | 23 +- sound/soc/generic/simple-card.c | 20 +- sound/soc/sh/rcar/core.c | 146 +++++++--- sound/soc/sh/rcar/rsnd.h | 4 + sound/soc/soc-core.c | 267 +++++++++++++----- 11 files changed, 374 insertions(+), 164 deletions(-) -- 2.25.1

3 19

[PATCH 0/4] Add acpi mahine id's for vangogh platform and
by Venkata Prasad Potturu 12 Jul '23

12 Jul '23

This patch series is to add acpi machine id's for vangogh platform and add new dmi entries and machine driver support for nau8821 and max98388 codecs. Venkata Prasad Potturu (4): ASoC: amd: acp: Add machine driver support for nau8821 codec ASoC: amd: acp: Add machine driver support for max98388 codec ASoC: amd: Add acpi machine id's for vangogh platform ASoC: amd: Add new dmi entries to config entry sound/soc/amd/acp-config.c | 33 ++++ sound/soc/amd/acp/Kconfig | 2 + sound/soc/amd/acp/acp-mach-common.c | 267 ++++++++++++++++++++++++++++ sound/soc/amd/acp/acp-mach.h | 2 + sound/soc/amd/acp/acp-sof-mach.c | 16 ++ sound/soc/amd/mach-config.h | 1 + 6 files changed, 321 insertions(+) -- 2.25.1

2 5

[PATCH 0/2] ASoC: Another set of platform remove conversions
by Uwe Kleine-König 12 Jul '23

12 Jul '23

Hello, two more drivers were added during the current merge window that are users of the original .remove callback that I plan to get rid of. Convert them to .remove_new. Best regards Uwe Uwe Kleine-König (2): ASoC: amd: ps-sdw-dma: Convert to platform remove callback returning void ASoC: starfive: jh7110_tdm: Convert to platform remove callback returning void sound/soc/amd/ps/ps-sdw-dma.c | 5 ++--- sound/soc/starfive/jh7110_tdm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) base-commit: 5133c9e51de41bfa902153888e11add3342ede18 -- 2.39.2

2 3

[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