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

Qualcomm: Add SM8750 MTP HiFi config
by GitHub pull_request - opened 22 Jan '25

22 Jan '25

alsa-project/alsa-ucm-conf pull request #498 was opened from krzk: Add UCM2 configs for the Qualcomm SM8750-MTP Board to handle: - on-board Speakers - Headphones speakers - Top and Bottom on-board Microphones Not yet implemented/tested are Headphone Microphones over USB-C port. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/498 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/498.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[RESEND PATCH v1] MAINTAINERS: update entries in TEXAS INSTRUMENTS LOW/MIDDLE-POWER AUDIO AMPLIFIER (ASoC/HDA) DRIVERS and add entries for haptic driver
by Shenghao Ding 22 Jan '25

22 Jan '25

Due to internal re-org, Kevin has no longer maintained audio driver. With the job responsibility change, drop entries for the audio converter and add entries for both haptics drivers and middle-power audio amplifier drivers. Add audio converter, set the Status as Supported. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- MAINTAINERS | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 58c3381725fb..41a4bd0cd0a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23206,25 +23206,42 @@ S: Maintained F: Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml F: sound/soc/ti/ -TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS +TEXAS INSTRUMENTS LOW/MIDDLE-POWER AUDIO AMPLIFIER (ASoC/HDA) & HAPTICS DRIVERS M: Shenghao Ding <shenghao-ding(a)ti.com> -M: Kevin Lu <kevin-lu(a)ti.com> M: Baojun Xu <baojun.xu(a)ti.com> L: linux-sound(a)vger.kernel.org -S: Maintained +S: Supported +F: Documentation/devicetree/bindings/input/ti,drv260x.yaml +F: Documentation/devicetree/bindings/input/ti,drv266x.yaml F: Documentation/devicetree/bindings/sound/tas2552.txt +F: Documentation/devicetree/bindings/sound/tas5720.txt F: Documentation/devicetree/bindings/sound/ti,tas2562.yaml F: Documentation/devicetree/bindings/sound/ti,tas2770.yaml +F: Documentation/devicetree/bindings/sound/ti,tas2781.yaml F: Documentation/devicetree/bindings/sound/ti,tas27xx.yaml +F: Documentation/devicetree/bindings/sound/ti,tas5086.txt +F: Documentation/devicetree/bindings/sound/ti,tas57xx.yaml +F: Documentation/devicetree/bindings/sound/ti,tas5805m.yaml F: Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml +F: drivers/input/misc/drv2*.c +F: include/sound/tas2*.h +F: include/sound/tas5086.h +F: include/sound/tpa6130a2-plat.h +F: sound/pci/hda/tas2781_hda_i2c.c +F: sound/soc/codecs/tas2*.* +F: sound/soc/codecs/tas5*.* +F: sound/soc/codecs/tpa6130a2.* + +TEXAS INSTRUMENTS AUDIO Converter (ASoC) and Touch Screen DRIVERS +L: linux-sound(a)vger.kernel.org +S: Maintained F: Documentation/devicetree/bindings/sound/ti,pcm1681.yaml F: Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml +F: Documentation/devicetree/bindings/sound/ti,pcm6240.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320*.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml -F: include/sound/tas2*.h +F: drivers/input/touchscreen/tsc2*.* F: include/sound/tlv320*.h -F: include/sound/tpa6130a2-plat.h -F: sound/pci/hda/tas2781_hda_i2c.c F: sound/soc/codecs/pcm1681.c F: sound/soc/codecs/pcm1789*.* F: sound/soc/codecs/pcm179x*.* @@ -23234,9 +23251,8 @@ F: sound/soc/codecs/pcm3060*.* F: sound/soc/codecs/pcm3168a*.* F: sound/soc/codecs/pcm5102a.c F: sound/soc/codecs/pcm512x*.* -F: sound/soc/codecs/tas2*.* +F: sound/soc/codecs/pcm6240.* F: sound/soc/codecs/tlv320*.* -F: sound/soc/codecs/tpa6130a2.* TEXAS INSTRUMENTS DMA DRIVERS M: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> base-commit: c4b9570cfb63501638db720f3bee9f6dfd044b82 -- 2.34.1

1 0

[PATCH V2 3/7] soundwire: amd: add conditional for check for device resume
by Vijendar Mukunda 21 Jan '25

21 Jan '25

Add a conditional check to resume SoundWire manager device, when the SoundWire manager instance is in the suspended state. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 60be5805715e..6831b3729db5 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -850,7 +850,10 @@ static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_chang static void amd_sdw_process_wake_event(struct amd_sdw_manager *amd_manager) { dev_dbg(amd_manager->dev, "SoundWire Wake event reported\n"); - pm_request_resume(amd_manager->dev); + if (pm_runtime_suspended(amd_manager->dev)) { + dev_dbg(amd_manager->dev, "Device is in suspend state\n"); + pm_request_resume(amd_manager->dev); + } writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); } -- 2.34.1

3 2

[PATCH] ALSA: hda/realtek: Enable Mute LED on HP Laptop 14s-fq1xxx
by Sebastian Wiese-Wagner 20 Jan '25

20 Jan '25

This HP Laptop uses ALC236 codec with COEF 0x07 controlling the mute LED. Enable existing quirk for this device. Signed-off-by: Sebastian Wiese-Wagner <seb(a)fastmail.to> --- 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 46623cd615a4..d3c9ed963588 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10415,6 +10415,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2), + SND_PCI_QUIRK(0x103c, 0x887c, "HP Laptop 14s-fq1xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2), SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS), SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED), -- 2.48.1

2 1

[PATCH] ASoC: codecs: ES8326: Improved PSRR
by Zhang Yi 20 Jan '25

20 Jan '25

Modified configuration to improve PSSR when ES8326 is working Signed-off-by: Zhang Yi <zhangyi(a)everest-semi.com> --- sound/soc/codecs/es8326.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index b06eead7e0f6..066d92b54312 100755 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -911,7 +911,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) regmap_write(es8326->regmap, ES8326_INT_SOURCE, (ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON)); regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f); - regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x08); + regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x0d); queue_delayed_work(system_wq, &es8326->jack_detect_work, msecs_to_jiffies(400)); es8326->hp = 1; @@ -1023,7 +1023,7 @@ static void es8326_init(struct snd_soc_component *component) struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component); regmap_write(es8326->regmap, ES8326_RESET, 0x1f); - regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x0E); + regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x3E); regmap_write(es8326->regmap, ES8326_ANA_LP, 0xf0); usleep_range(10000, 15000); regmap_write(es8326->regmap, ES8326_HPJACK_TIMER, 0xd9); -- 2.17.1

2 1

[GIT PULL] ASoC updates for v6.14
by Mark Brown 20 Jan '25

20 Jan '25

The following changes since commit 9d89551994a430b50c4fffcb1e617a057fa76e20: Linux 6.13-rc6 (2025-01-05 14:13:40 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v6.14 for you to fetch changes up to fee89ddd76e45841a2b01d87b481bc02483f4572: ASoC: xilinx: xlnx_spdif: Simpify using devm_clk_get_enabled() (2025-01-16 15:20:41 +0000) ---------------------------------------------------------------- ASoC: Updates for v6.14 This was quite a quiet release for what I imagine are holiday related reasons, the diffstat is dominated by some Cirrus Logic Kunit tests. There's the usual mix of small improvements and fixes, plus a few new drivers and features. The diffstat includes some DRM changes due to work on HDMI audio. - Allow clocking on each DAI in an audio graph card to be configured separately. - Improved power management for Renesas RZ-SSI. - KUnit testing for the Cirrus DSP framework. - Memory to meory operation support for Freescale/NXP platforms. - Support for pause operations in SOF. - Support for Allwinner suinv F1C100s, Awinc AW88083, Realtek ALC5682I-VE ---------------------------------------------------------------- Alexey Klimov (1): ASoC: qcom: sdm845: add handling of secondary MI2S clock Amadeusz Sławiński (4): ASoC: Intel: avs: Fix init-config parsing ASoC: Intel: avs: Print IPC error messages in lower layer ASoC: Intel: avs: Add MODULE_FIRMWARE to inform about FW ASoC: Intel: avs: Update ASRC definition Andrew Davis (21): ASoC: ad193x: Remove use of i2c_match_id() ASoC: adau1761: Remove use of i2c_match_id() ASoC: adau1781: Remove use of i2c_match_id() ASoC: adau1977: Remove use of i2c_match_id() ASoC: alc5623: Remove use of i2c_match_id() ASoC: alc5632: Remove use of i2c_match_id() ASoC: max98088: Remove use of i2c_match_id() ASoC: max98090: Remove use of i2c_match_id() ASoC: max98095: Remove use of i2c_match_id() ASoC: pcm186x: Remove use of i2c_match_id() ASoc: pcm6240: Remove use of i2c_match_id() ASoC: ssm2602: Remove use of i2c_match_id() ASoC: tas2562: Remove use of i2c_match_id() ASoC: tas2781: Remove use of i2c_match_id() ASoC: tas5720: Remove use of i2c_match_id() ASoC: tlv320adc3xxx: Remove use of i2c_match_id() ASoC: tlv320aic31xx: Remove use of i2c_match_id() ASoC: tlv320aic3x: Remove use of i2c_match_id() ASoC: tpa6130a2: Remove use of i2c_match_id() ASoC: wm8904: Remove use of i2c_match_id() ASoC: wm8985: Remove use of i2c_match_id() Andy Shevchenko (1): ASoc: mediatek: mt8365: Don't use "proxy" headers Arnd Bergmann (1): firmware: cs_dsp: avoid large local variables Bard Liao (7): ASoC: SOF: Intel: hda-dai: Ensure DAI widget is valid during params ASoC: Intel: sof_sdw: correct mach_params->dmic_num ASoC: Intel: sof_sdw: reduce log level for not using internal dmic ASoC: Intel: sof_sdw: improve the log of DAI link numbers ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb + rt1320 support ASoC: Intel: soc-acpi-intel-lnl-match: add rt713_vb_l2_rt1320_l13 support ASoC: Intel: soc-acpi-intel-ptl-match: add rt713_vb_l2_rt1320_l13 support Bence Csókás (1): ASoC: sun4i-codec: Use new devm clk and reset APIs Cezary Rojewski (9): ASoC: Intel: avs: Do not readq() u32 registers ASoC: Intel: avs: Fix the minimum firmware version numbers ASoC: Intel: avs: Fix theoretical infinite loop ASoC: Intel: avs: Update hda component teardown sequences ASoC: Intel: avs: Clearly state assumptions of hw_params() ASoC: Intel: avs: Improve logging of firmware loading ASoC: Intel: avs: Adjust DSP status register names ASoC: Intel: avs: Adjust IPC traces ASoC: Intel: avs: Add missing includes Chancel Liu (4): ASoC: fsl_utils: Add function to constrain rates ASoC: fsl_micfil: Switch to common sample rate constraint function ASoC: fsl_xcvr: Add sample rate constraint ASoC: fsl_sai: Add sample rate constraint Charles Keepax (5): ASoC: SDCA: Add missing header includes ASoC: SDCA: Clean up error messages ASoC: SDCA: Add bounds check for function address ASoC: SDCA: Add missing function type names ASoC: SDCA: Split function type patching and function naming Christophe JAILLET (1): ASoC: cs42l51: Constify struct i2c_device_id Claudiu Beznea (16): ASoC: renesas: rz-ssi: Terminate all the DMA transactions ASoC: renesas: rz-ssi: Use only the proper amount of dividers ASoC: renesas: rz-ssi: Fix typo on SSI_RATES macro comment ASoC: renesas: rz-ssi: Remove pdev member of struct rz_ssi_priv ASoC: renesas: rz-ssi: Remove the rz_ssi_get_dai() function ASoC: renesas: rz-ssi: Remove the first argument of rz_ssi_stream_is_play() ASoC: renesas: rz-ssi: Use readl_poll_timeout_atomic() ASoC: renesas: rz-ssi: Use temporary variable for struct device ASoC: renesas: rz-ssi: Use goto label names that specify their actions ASoC: renesas: rz-ssi: Rely on the ASoC subsystem to runtime resume/suspend the SSI ASoC: renesas: rz-ssi: Enable runtime PM autosuspend support ASoC: renesas: rz-ssi: Add runtime PM support ASoC: renesas: rz-ssi: Issue software reset in hw_params API ASoC: renesas: rz-ssi: Add suspend to RAM support ASoC: dt-bindings: renesas,rz-ssi: Remove DMA description ASoC: dt-bindings: renesas,rz-ssi: Document the Renesas RZ/G3S SoC Colin Ian King (1): ASoC: soc-core: remove redundant assignment to variable ret Csókás Bence (1): ASoC: dt-bindings: Add Allwinner suniv F1C100s Audio Codec Dan Carpenter (1): ASoC: renesas: rz-ssi: Add a check for negative sample_space Derek Fang (1): ASoC: rt5682: Support the ALC5682I-VE codec Dheeraj Reddy Jonnalagadda (1): ASoC: rockchip: i2s-tdm: Fix a useless call issue Dr. David Alan Gilbert (1): ASoC: rt715: Remove unused hda_to_sdw George Lander (1): ASoC: sun4i-spdif: Add clock multiplier settings Krzysztof Kozlowski (3): ASoC: codecs: wcd9335: Add define for number of DAIs ASoC: dt-bindings: qcom,wcd9335: Drop number of DAIs from the header ASoC: dt-bindings: Correct indentation and style in DTS example Kuninori Morimoto (18): ASoC: simple-card-utils: use __free(device_node) for device node ASoC: simple-card-utils: check port reg first on graph_get_dai_id() ASoC: simple-card-utils: use for_each_of_graph_port() on graph_get_dai_id() ASoC: soc-core: tidyup ret handling for card->disable_route_checks ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback ASoC: simple-card-utils: Unify clock direction by clk_direction ASoC: dt-bindings: renesas,rsnd: remove post-init-providers property ASoC: soc-card: remove card check ASoC: intel: remove disable_route_checks ASoC: remove disable_route_checks ASoC: audio-graph-card2: use __free(device_node) for device node ASoC: audio-graph-card: use __free(device_node) for device node ASoC: simple-card: use __free(device_node) for device node ASoC: soc-core: return 0 if np was NULL on snd_soc_daifmt_parse_clock_provider_raw() ASoC: audio-graph-card2: use of_graph_get_port_by_id() at graph_get_next_multi_ep() ASoC: soc-core: Enable to use extra format on each DAI ASoC: audio-graph-card2: Use extra format on each DAI ASoC: soc-dapm: remove !card check from snd_soc_dapm_set_bias_level() Marcus Cooper (2): ASoC: sun4i-spdif: Always set the valid data to be the MSB ASoC: sun4i-spdif: Add working 24bit audio support Mark Brown (23): ASoC: fsl_xcvr: Add suspend and resume support ASoC: Correct *-objs usages Add support for codec of F1C100s ASoC: Splitting cs35l56 SoundWire DAI into separate ASoC: Merge up origin to resolve interaction with manline symbol changes ASoC: Merge up v6.12-rc2 ASoC: Intel: boards: updates for 6.14 ASoC: sun4i-spdif: Add 24bit support Add function to constrain rates ASoC: simple-card-utils: tidyup for Multi connection Add audio support for the Renesas RZ/G3S SoC ASoC: SOF: core/Intel: Handle pause supported token firmware: cirrus: Add KUnit tests for cs_dsp ASoC: fsl: add memory to memory function for ASRC ASoC: Intel: Add matches for Cirrus Logic CDB35L56 Minor debugging improvements ASoC: codecs: Add aw88083 amplifier driver ASoC: Merge up v6.13-rc6 ASoC: Intel: avs: Fixes and cleanups ASoC: remove disable_route_checks ASoC: fsl: Support MQS on i.MX943 ASoC: extra format on each DAI ASoC: fsl: Support micfil on i.MX943 Martin Blumenstingl (2): ASoC: soc-dai: add snd_soc_dai_prepare() and use it internally ASoC: dapm: add support for preparing streams Mesih Kilinc (2): ASoC: sun4i-codec: Add DMA Max Burst field ASoC: sun4i-codec: Add support for Allwinner suniv F1C100s Michal Simek (1): ASoC: xilinx: xlnx_spdif: Simpify using devm_clk_get_enabled() Neil Armstrong (1): ASoC: dt-bindings: convert rt5682.txt to dt-schema Nícolas F. R. A. Prado (2): ASoC: dt-bindings: mediatek,mt8188-mt6359: Add compatible for mt8390 evk ASoC: dt-bindings: mediatek,mt8188-mt6359: Allow DL_SRC/UL_SRC dai-links Peter Ujfalusi (4): ASoC: SOF: Add support for pause supported tokens from topology ASoC: SOF: Intel: hda-pcm: Follow the pause_supported flag to drop PAUSE support ASoC: SOF: ipc4-topology: Use macro to set the EXT_PARAM_SIZE in widget setup ASoC: SOF: sof-priv: Remove unused SOF_DAI_STREAM() and SOF_FORMATS Richard Fitzgerald (21): ASoC: cs35l56: Split SoundWire DAI into separate playback and capture ASoC: sdw_utils: cs_amp: Assign non-overlapping TDM masks for each codec on a bus firmware: cs_dsp: Add mock regmap for KUnit testing firmware: cs_dsp: Add mock DSP memory map for KUnit testing firmware: cs_dsp: Add mock wmfw file generator for KUnit testing firmware: cs_dsp: Add mock bin file generator for KUnit testing firmware: cs_dsp: Add KUnit testing of bin file download firmware: cs_dsp: Add KUnit testing of wmfw download firmware: cs_dsp: Add KUnit testing of control parsing firmware: cs_dsp: Add KUnit testing of control cache firmware: cs_dsp: Add KUnit testing of control read/write firmware: cs_dsp: Add KUnit testing of bin error cases firmware: cs_dsp: Add KUnit testing of wmfw error cases firmware: cs_dsp: Add KUnit testing of client callbacks ASoC: Intel: tgl-match: Add entries for CS35L56 on CDB35L56-EIGHT-C ASoC: Intel: mtl-match: Add CDB35L56-EIGHT-C with aggregated speakers ASoC: Intel: mtl-match: Add CDB35L56-EIGHT-C 8x CS35L56 without CS42L43 firmware: cs_dsp: Fix kerneldoc typos in cs_dsp_mock_bin.c firmware: cs_dsp: Avoid using a u32 as a __be32 in cs_dsp_mock_mem_maps.c firmware: cs_dsp: Fix endianness conversion in cs_dsp_mock_wmfw.c firmware: cs_dsp: Delete redundant assignments in cs_dsp_test_bin.c Rob Herring (Arm) (2): ASoC: Use of_property_present() for non-boolean properties ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check Shengjiu Wang (13): ASoC: fsl_xcvr: Use regmap for PHY and PLL registers ASoC: fsl_xcvr: Add suspend and resume support ALSA: compress: Add output rate and output format support ASoC: fsl_asrc: define functions for memory to memory usage ASoC: fsl_easrc: define functions for memory to memory usage ASoC: fsl_asrc_m2m: Add memory to memory function ASoC: fsl_asrc: register m2m platform device ASoC: fsl_easrc: register m2m platform device ASoC: fsl_asrc_m2m: force cast for snd_pcm_format_t type ASoC: fsl_mqs: Add i.MX943 platform support ASoC: dt-bindings: fsl,mqs: Add compatible string for i.MX943 platform ASoC: fsl_micfil: Add i.MX943 platform support ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX943 platform Simon Trimmer (4): ASoC: Intel: sof_sdw: Correct quirk for Lenovo Yoga Slim 7 ASoC: Intel: sof_sdw: Add a dev_dbg message for the SOC_SDW_CODEC_MIC quirk ASoC: Intel: soc-acpi: arl: Correct naming of a cs35l56 address struct ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops Stephen Gordon (2): ASoC: simple_card: Improve debugging messages ASoC: simple_card: Show if link is unidirectional Takashi Iwai (5): ASoC: cs40l50: Use *-y for Makefile ASoC: mediatek: mt8365: Use *-y for Makefile ASoC: SDCA: Use *-y for Makefile ASoC: cs42l84: Use *-y for Makefile ASoC: wcd937x: Use *-y for Makefile Tang Bin (2): ASoC: mediatek: mt8192-afe-pcm: Simplify probe() with local dev variable ASoC: tas2781: Fix redundant logical jump Thorsten Blum (4): ASoC: SOF: Intel: Use str_yes_no() helper in atom_dump() ASoC: madera: Use str_enabled_disabled() helper function ASoC: SOF: Intel: Use str_yes_no() to improve bdw_dump() ASoC: codecs: Use ARRAY_SIZE() to calculate PEB2466_TLV_SIZE Uwe Kleine-König (1): ASoC: Drop explicit initialization of struct i2c_device_id::driver_data to 0 Vijendar Mukunda (2): ASoC: amd: ps: update mach params subsystem_rev variable ASoC: amd: ps: add ZSC control register programming sequence Weidong Wang (2): ASoC: dt-bindings: Add schema for "awinic,aw88083" ASoC: codecs: Add aw88083 amplifier driver Wolfram Sang (1): ASoC: cs42l43: don't include '<linux/find.h>' directly Yu-Chun Lin (1): ASoC: amd: Add ACPI dependency to fix build error .../devicetree/bindings/sound/adi,ssm2518.yaml | 20 +- .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 31 + .../devicetree/bindings/sound/awinic,aw88395.yaml | 2 + .../devicetree/bindings/sound/everest,es71x4.yaml | 10 +- .../devicetree/bindings/sound/everest,es7241.yaml | 19 +- .../devicetree/bindings/sound/fsl,easrc.yaml | 32 +- .../devicetree/bindings/sound/fsl,micfil.yaml | 1 + .../devicetree/bindings/sound/fsl,mqs.yaml | 2 + .../devicetree/bindings/sound/fsl,xcvr.yaml | 34 +- .../bindings/sound/intel,keembay-i2s.yaml | 32 +- .../bindings/sound/mediatek,mt8188-mt6359.yaml | 16 +- .../bindings/sound/neofidelity,ntp8918.yaml | 26 +- .../devicetree/bindings/sound/realtek,rt5682.yaml | 156 + .../devicetree/bindings/sound/renesas,rsnd.yaml | 6 - .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 19 +- Documentation/devicetree/bindings/sound/rt5682.txt | 98 - .../devicetree/bindings/sound/ti,pcm6240.yaml | 32 +- .../devicetree/bindings/sound/ti,tas2562.yaml | 30 +- .../devicetree/bindings/sound/ti,tas2770.yaml | 34 +- .../devicetree/bindings/sound/ti,tas2781.yaml | 38 +- .../devicetree/bindings/sound/ti,tas27xx.yaml | 34 +- .../devicetree/bindings/sound/ti,tas57xx.yaml | 36 +- MAINTAINERS | 4 +- drivers/firmware/cirrus/Kconfig | 20 + drivers/firmware/cirrus/Makefile | 2 + drivers/firmware/cirrus/test/Makefile | 23 + drivers/firmware/cirrus/test/cs_dsp_mock_bin.c | 199 ++ .../firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 752 +++++ drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c | 367 +++ drivers/firmware/cirrus/test/cs_dsp_mock_utils.c | 13 + drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c | 473 +++ drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 2556 +++++++++++++++ .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 600 ++++ .../firmware/cirrus/test/cs_dsp_test_callbacks.c | 688 ++++ .../cirrus/test/cs_dsp_test_control_cache.c | 3282 ++++++++++++++++++++ .../cirrus/test/cs_dsp_test_control_parse.c | 1851 +++++++++++ .../firmware/cirrus/test/cs_dsp_test_control_rw.c | 2669 ++++++++++++++++ drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 2211 +++++++++++++ .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 1347 ++++++++ drivers/firmware/cirrus/test/cs_dsp_tests.c | 14 + include/dt-bindings/sound/qcom,wcd9335.h | 1 - include/linux/firmware/cirrus/cs_dsp_test_utils.h | 160 + include/sound/sdca.h | 7 +- include/sound/sdca_function.h | 3 + include/sound/simple_card_utils.h | 8 +- include/sound/soc-dai.h | 3 + include/sound/soc.h | 12 +- include/sound/soc_sdw_utils.h | 2 + include/uapi/sound/compress_params.h | 23 +- include/uapi/sound/sof/tokens.h | 2 + sound/soc/amd/Kconfig | 2 +- sound/soc/amd/ps/pci-ps.c | 16 +- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/Makefile | 8 +- sound/soc/codecs/ad193x-i2c.c | 3 +- sound/soc/codecs/adau1761-i2c.c | 5 +- sound/soc/codecs/adau1781-i2c.c | 5 +- sound/soc/codecs/adau1977-i2c.c | 5 +- sound/soc/codecs/alc5623.c | 10 +- sound/soc/codecs/alc5632.c | 6 +- sound/soc/codecs/aw88081.c | 333 +- sound/soc/codecs/aw88081.h | 43 + sound/soc/codecs/cs35l56.c | 8 +- sound/soc/codecs/cs42l43.c | 2 +- sound/soc/codecs/cs42l51-i2c.c | 6 +- sound/soc/codecs/cs42l84.c | 2 +- sound/soc/codecs/es8323.c | 2 +- sound/soc/codecs/madera.c | 7 +- sound/soc/codecs/max98088.c | 4 +- sound/soc/codecs/max98090.c | 18 +- sound/soc/codecs/max98095.c | 4 +- sound/soc/codecs/ntp8835.c | 2 +- sound/soc/codecs/ntp8918.c | 2 +- sound/soc/codecs/pcm186x-i2c.c | 3 +- sound/soc/codecs/pcm6240.c | 3 +- sound/soc/codecs/peb2466.c | 3 +- sound/soc/codecs/rt5682-i2c.c | 6 + sound/soc/codecs/rt5682.c | 12 +- sound/soc/codecs/rt5682.h | 2 + sound/soc/codecs/rt715-sdw.c | 41 - sound/soc/codecs/rt715.h | 3 - sound/soc/codecs/sma1307.c | 4 +- sound/soc/codecs/ssm2602-i2c.c | 5 +- sound/soc/codecs/tas2562.c | 4 +- sound/soc/codecs/tas2781-i2c.c | 71 +- sound/soc/codecs/tas5720.c | 10 +- sound/soc/codecs/tlv320adc3xxx.c | 4 +- sound/soc/codecs/tlv320aic31xx.c | 6 +- sound/soc/codecs/tlv320aic3x-i2c.c | 3 +- sound/soc/codecs/tpa6130a2.c | 4 +- sound/soc/codecs/uda1342.c | 2 +- sound/soc/codecs/wcd9335.c | 2 + sound/soc/codecs/wm8904.c | 13 +- sound/soc/codecs/wm8985.c | 4 +- sound/soc/fsl/Kconfig | 2 + sound/soc/fsl/Makefile | 2 +- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/fsl/fsl_asrc.c | 179 +- sound/soc/fsl/fsl_asrc.h | 2 + sound/soc/fsl/fsl_asrc_common.h | 70 + sound/soc/fsl/fsl_asrc_m2m.c | 727 +++++ sound/soc/fsl/fsl_easrc.c | 261 +- sound/soc/fsl/fsl_easrc.h | 4 + sound/soc/fsl/fsl_micfil.c | 131 +- sound/soc/fsl/fsl_micfil.h | 2 +- sound/soc/fsl/fsl_mqs.c | 28 + sound/soc/fsl/fsl_sai.c | 7 +- sound/soc/fsl/fsl_sai.h | 3 + sound/soc/fsl/fsl_utils.c | 45 + sound/soc/fsl/fsl_utils.h | 5 + sound/soc/fsl/fsl_xcvr.c | 404 ++- sound/soc/fsl/fsl_xcvr.h | 13 + sound/soc/fsl/imx-audmux.c | 2 +- sound/soc/fsl/imx-card.c | 2 +- sound/soc/fsl/imx-rpmsg.c | 2 +- sound/soc/generic/audio-graph-card.c | 48 +- sound/soc/generic/audio-graph-card2.c | 262 +- sound/soc/generic/simple-card-utils.c | 79 +- sound/soc/generic/simple-card.c | 58 +- sound/soc/intel/avs/apl.c | 2 +- sound/soc/intel/avs/core.c | 24 +- sound/soc/intel/avs/debugfs.c | 1 + sound/soc/intel/avs/ipc.c | 25 +- sound/soc/intel/avs/loader.c | 36 +- sound/soc/intel/avs/messages.c | 22 +- sound/soc/intel/avs/messages.h | 3 +- sound/soc/intel/avs/pcm.c | 5 +- sound/soc/intel/avs/registers.h | 2 +- sound/soc/intel/avs/topology.c | 4 +- sound/soc/intel/avs/trace.h | 38 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 - sound/soc/intel/boards/sof_sdw.c | 33 +- sound/soc/intel/common/soc-acpi-intel-arl-match.c | 45 +- sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 70 + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 289 +- sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 148 + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 194 ++ sound/soc/intel/keembay/kmb_platform.c | 2 +- sound/soc/mediatek/common/mtk-soundcard-driver.c | 4 +- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 19 +- sound/soc/mediatek/mt8365/Makefile | 2 +- sound/soc/mediatek/mt8365/mt8365-mt6357.c | 11 +- sound/soc/qcom/common.c | 6 +- sound/soc/qcom/sc7180.c | 2 +- sound/soc/qcom/sdm845.c | 5 +- sound/soc/renesas/rz-ssi.c | 228 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 28 - sound/soc/sdca/Makefile | 2 +- sound/soc/sdca/sdca_device.c | 2 + sound/soc/sdca/sdca_functions.c | 132 +- sound/soc/sdw_utils/soc_sdw_cs_amp.c | 46 + sound/soc/sdw_utils/soc_sdw_utils.c | 13 +- sound/soc/soc-card.c | 4 +- sound/soc/soc-core.c | 58 +- sound/soc/soc-dai.c | 27 +- sound/soc/soc-dapm.c | 14 +- sound/soc/soc-pcm.c | 32 +- sound/soc/soc-topology.c | 10 +- sound/soc/sof/intel/atom.c | 16 +- sound/soc/sof/intel/bdw.c | 16 +- sound/soc/sof/intel/hda-dai.c | 12 + sound/soc/sof/intel/hda-pcm.c | 15 + sound/soc/sof/intel/hda.c | 5 + sound/soc/sof/ipc4-topology.c | 2 +- sound/soc/sof/sof-audio.h | 1 + sound/soc/sof/sof-priv.h | 8 - sound/soc/sof/topology.c | 4 + sound/soc/sunxi/sun4i-codec.c | 409 ++- sound/soc/sunxi/sun4i-spdif.c | 24 +- sound/soc/xilinx/xlnx_spdif.c | 38 +- 170 files changed, 21739 insertions(+), 1441 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682.yaml delete mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt create mode 100644 drivers/firmware/cirrus/test/Makefile create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_bin.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_utils.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_callbacks.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_parse.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_rw.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c create mode 100644 drivers/firmware/cirrus/test/cs_dsp_tests.c create mode 100644 include/linux/firmware/cirrus/cs_dsp_test_utils.h create mode 100644 sound/soc/fsl/fsl_asrc_m2m.c

2 1

[PATCH V2 7/7] soundwire: amd: add soundwire host wake interrupt enable/disable sequence
by Vijendar Mukunda 20 Jan '25

20 Jan '25

For wake event, SoundWire host wake interrupt will be asserted based on below pre-conditions for ACP7.0 & ACP7.1 platforms. - ACP device should be in D0 state. - SoundWire manager instance should be in D3 state. - SoundWire manager device state should be set to D3. - ACP_PME_EN should be set to 1. Implement code changes to enable/disable SoundWire host wake interrupt mask during suspend and resume as per design flow for ACP7.0 & ACP7.1 platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 58 +++++++++++++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 2 ++ 2 files changed, 60 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 03c9e15dce5b..161d963c80e6 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -166,6 +166,34 @@ static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u32 tar return 0; } +static int amd_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable) +{ + u32 intr_cntl1; + u32 sdw_host_wake_irq_mask; + + if (!amd_manager->wake_en_mask) + return 0; + + switch (amd_manager->instance) { + case ACP_SDW0: + sdw_host_wake_irq_mask = AMD_SDW0_HOST_WAKE_INTR_MASK; + break; + case ACP_SDW1: + sdw_host_wake_irq_mask = AMD_SDW1_HOST_WAKE_INTR_MASK; + break; + default: + return -EINVAL; + } + + intr_cntl1 = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1)); + if (enable) + intr_cntl1 |= sdw_host_wake_irq_mask; + else + intr_cntl1 &= ~sdw_host_wake_irq_mask; + writel(intr_cntl1, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1)); + return 0; +} + static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg, int cmd_offset) { @@ -1186,11 +1214,21 @@ static int __maybe_unused amd_suspend(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, false); + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, false); + if (ret) + return ret; + } ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, false); + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, false); + if (ret) + return ret; + } /* * As per hardware programming sequence on AMD platforms, * clock stop should be invoked first before powering-off @@ -1224,11 +1262,21 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, true); + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, true); + if (ret) + return ret; + } ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, true); + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, true); + if (ret) + return ret; + } ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; @@ -1269,8 +1317,18 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) ret = amd_sdw_clock_stop_exit(amd_manager); if (ret) return ret; + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, false); + if (ret) + return ret; + } } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_host_wake_enable(amd_manager, false); + if (ret) + return ret; + } val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); if (val) { val |= AMD_SDW_CLK_RESUME_REQ; diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 1d5e94371f81..6cc916b0c820 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -194,6 +194,8 @@ #define AMD_SDW_CLK_RESUME_DONE 3 #define AMD_SDW_WAKE_STAT_MASK BIT(16) #define AMD_SDW_WAKE_INTR_MASK BIT(16) +#define AMD_SDW0_HOST_WAKE_INTR_MASK BIT(22) +#define AMD_SDW1_HOST_WAKE_INTR_MASK BIT(23) #define AMD_SDW_DEVICE_STATE 0x1430 #define AMD_SDW0_DEVICE_STATE_MASK GENMASK(1, 0) #define AMD_SDW1_DEVICE_STATE_MASK GENMASK(3, 2) -- 2.34.1

1 0

[PATCH V2 6/7] soundwire: amd: set ACP_PME_EN during runtime suspend sequence
by Vijendar Mukunda 20 Jan '25

20 Jan '25

Set ACP_PME_EN to 1 during runtime suspend sequence as per design flow for ACP7.0 & ACP7.1 platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 9 +++++++++ drivers/soundwire/amd_manager.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 42d553878e91..03c9e15dce5b 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -1215,6 +1215,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev); struct sdw_bus *bus = &amd_manager->bus; int ret; + u32 val; if (bus->prop.hw_disabled) { dev_dbg(bus->dev, "SoundWire manager %d is disabled,\n", @@ -1239,6 +1240,14 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); if (ret) return ret; + if (amd_manager->wake_en_mask) { + val = readl(amd_manager->acp_mmio + ACP_PME_EN); + if (!val) { + writel(1, amd_manager->acp_mmio + ACP_PME_EN); + val = readl(amd_manager->acp_mmio + ACP_PME_EN); + dev_dbg(amd_manager->dev, "ACP_PME_EN:0x%x\n", val); + } + } } return 0; } diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 8430f279d88e..1d5e94371f81 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -199,6 +199,7 @@ #define AMD_SDW1_DEVICE_STATE_MASK GENMASK(3, 2) #define AMD_SDW_DEVICE_STATE_D0 0 #define AMD_SDW_DEVICE_STATE_D3 3 +#define ACP_PME_EN 0x0001400 static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = { AMD_SDW_DEFAULT_CLK_FREQ, -- 2.34.1

1 0

[PATCH V2 5/7] soundwire: amd: set device power state during suspend/resume sequence
by Vijendar Mukunda 20 Jan '25

20 Jan '25

Set SoundWire manager device power state during suspend and resume sequence for ACP7.0 & ACP7.1 platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 58 ++++++++++++++++++++++++++++++--- drivers/soundwire/amd_manager.h | 5 +++ 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index d611498d5488..42d553878e91 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -143,6 +143,29 @@ static void amd_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable writel(wake_ctrl, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); } +static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u32 target_device_state) +{ + u32 sdw_dev_state; + + sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + switch (amd_manager->instance) { + case ACP_SDW0: + u32p_replace_bits(&sdw_dev_state, target_device_state, + AMD_SDW0_DEVICE_STATE_MASK); + break; + case ACP_SDW1: + u32p_replace_bits(&sdw_dev_state, target_device_state, + AMD_SDW1_DEVICE_STATE_MASK); + break; + default: + return -EINVAL; + } + writel(sdw_dev_state, amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + dev_dbg(amd_manager->dev, "AMD_SDW_DEVICE_STATE:0x%x\n", sdw_dev_state); + return 0; +} + static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg, int cmd_offset) { @@ -1163,7 +1186,9 @@ static int __maybe_unused amd_suspend(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, false); - return amd_sdw_clock_stop(amd_manager); + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, false); /* @@ -1173,7 +1198,14 @@ static int __maybe_unused amd_suspend(struct device *dev) ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; - return amd_deinit_sdw_manager(amd_manager); + ret = amd_deinit_sdw_manager(amd_manager); + if (ret) + return ret; + } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + if (ret) + return ret; } return 0; } @@ -1191,13 +1223,22 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, true); - return amd_sdw_clock_stop(amd_manager); + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, true); ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; - return amd_deinit_sdw_manager(amd_manager); + ret = amd_deinit_sdw_manager(amd_manager); + if (ret) + return ret; + } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + if (ret) + return ret; } return 0; } @@ -1216,7 +1257,9 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - return amd_sdw_clock_stop_exit(amd_manager); + ret = amd_sdw_clock_stop_exit(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); @@ -1239,6 +1282,11 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) return ret; amd_sdw_set_frameshape(amd_manager); } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0); + if (ret) + return ret; + } return 0; } diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 30244a31c21c..8430f279d88e 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -194,6 +194,11 @@ #define AMD_SDW_CLK_RESUME_DONE 3 #define AMD_SDW_WAKE_STAT_MASK BIT(16) #define AMD_SDW_WAKE_INTR_MASK BIT(16) +#define AMD_SDW_DEVICE_STATE 0x1430 +#define AMD_SDW0_DEVICE_STATE_MASK GENMASK(1, 0) +#define AMD_SDW1_DEVICE_STATE_MASK GENMASK(3, 2) +#define AMD_SDW_DEVICE_STATE_D0 0 +#define AMD_SDW_DEVICE_STATE_D3 3 static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = { AMD_SDW_DEFAULT_CLK_FREQ, -- 2.34.1

1 0

[PATCH V2 4/7] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms
by Vijendar Mukunda 20 Jan '25

20 Jan '25

Add SoundWire support for ACP7.0 and ACP7.1 platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 22 ++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 18 ++++++++++++++++++ include/linux/soundwire/sdw_amd.h | 2 ++ 3 files changed, 42 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 6831b3729db5..d611498d5488 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -446,6 +446,10 @@ static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_pa return -EINVAL; } break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + frame_fmt_reg = acp70_sdw_dp_reg[p_params->num].frame_fmt_reg; + break; default: return -EINVAL; } @@ -494,6 +498,14 @@ static int amd_sdw_transport_params(struct sdw_bus *bus, return -EINVAL; } break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + frame_fmt_reg = acp70_sdw_dp_reg[params->port_num].frame_fmt_reg; + sample_int_reg = acp70_sdw_dp_reg[params->port_num].sample_int_reg; + hctrl_dp0_reg = acp70_sdw_dp_reg[params->port_num].hctrl_dp0_reg; + offset_reg = acp70_sdw_dp_reg[params->port_num].offset_reg; + lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[params->port_num].lane_ctrl_ch_en_reg; + break; default: return -EINVAL; } @@ -549,6 +561,10 @@ static int amd_sdw_port_enable(struct sdw_bus *bus, return -EINVAL; } break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[enable_ch->port_num].lane_ctrl_ch_en_reg; + break; default: return -EINVAL; } @@ -898,6 +914,7 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager) ret = amd_enable_sdw_manager(amd_manager); if (ret) return ret; + amd_sdw_set_frameshape(amd_manager); } /* Enable runtime PM */ @@ -969,6 +986,11 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) return -EINVAL; } break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + amd_manager->num_dout_ports = AMD_ACP70_SDW_MAX_TX_PORTS; + amd_manager->num_din_ports = AMD_ACP70_SDW_MAX_RX_PORTS; + break; default: return -EINVAL; } diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index cc2170e4521e..30244a31c21c 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -159,8 +159,11 @@ #define AMD_ACP63_SDW0_MAX_RX_PORTS 3 #define AMD_ACP63_SDW1_MAX_TX_PORTS 1 #define AMD_ACP63_SDW1_MAX_RX_PORTS 1 +#define AMD_ACP70_SDW_MAX_TX_PORTS 3 +#define AMD_ACP70_SDW_MAX_RX_PORTS 3 #define AMD_ACP63_SDW0_MAX_DAI 6 #define AMD_ACP63_SDW1_MAX_DAI 2 +#define AMD_ACP70_SDW_MAX_DAI 6 #define AMD_SDW_SLAVE_0_ATTACHED 5 #define AMD_SDW_SSP_COUNTER_VAL 3 @@ -244,6 +247,21 @@ static struct sdw_manager_dp_reg acp63_sdw1_dp_reg[AMD_ACP63_SDW1_MAX_DAI] = { ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0} }; +static struct sdw_manager_dp_reg acp70_sdw_dp_reg[AMD_ACP70_SDW_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}, + {ACP_SW_AUDIO1_TX_FRAME_FORMAT, ACP_SW_AUDIO1_TX_SAMPLEINTERVAL, ACP_SW_AUDIO1_TX_HCTRL, + ACP_SW_AUDIO1_TX_OFFSET, ACP_SW_AUDIO1_TX_CHANNEL_ENABLE_DP0}, + {ACP_SW_AUDIO2_TX_FRAME_FORMAT, ACP_SW_AUDIO2_TX_SAMPLEINTERVAL, ACP_SW_AUDIO2_TX_HCTRL, + ACP_SW_AUDIO2_TX_OFFSET, ACP_SW_AUDIO2_TX_CHANNEL_ENABLE_DP0}, + {ACP_SW_AUDIO0_RX_FRAME_FORMAT, ACP_SW_AUDIO0_RX_SAMPLEINTERVAL, ACP_SW_AUDIO0_RX_HCTRL_DP0, + ACP_SW_AUDIO0_RX_OFFSET_DP0, ACP_SW_AUDIO0_RX_CHANNEL_ENABLE_DP0}, + {ACP_SW_AUDIO1_RX_FRAME_FORMAT, ACP_SW_AUDIO1_RX_SAMPLEINTERVAL, ACP_SW_AUDIO1_RX_HCTRL, + ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0}, + {ACP_SW_AUDIO2_RX_FRAME_FORMAT, ACP_SW_AUDIO2_RX_SAMPLEINTERVAL, ACP_SW_AUDIO2_RX_HCTRL, + ACP_SW_AUDIO2_RX_OFFSET, ACP_SW_AUDIO2_RX_CHANNEL_ENABLE_DP0}, +}; + static u32 sdw_manager_reg_mask_array[AMD_SDW_MAX_MANAGER_COUNT] = { AMD_SDW0_EXT_INTR_MASK, AMD_SDW1_EXT_INTR_MASK diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h index 799f8578137b..6b839987f14c 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -28,6 +28,8 @@ #define ACP_SDW1 1 #define AMD_SDW_MAX_MANAGER_COUNT 2 #define ACP63_PCI_REV_ID 0x63 +#define ACP70_PCI_REV_ID 0x70 +#define ACP71_PCI_REV_ID 0x71 struct acp_sdw_pdata { u16 instance; -- 2.34.1

1 0