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

[PATCH AUTOSEL 6.3 10/17] ALSA: hda/realtek: Add quirk for ASUS ROG G634Z
by Sasha Levin 29 Jun '23

29 Jun '23

From: "Luke D. Jones" <luke(a)ljones.dev> [ Upstream commit 555434fd5c6b3589d9511ab6e88faf50346e19da ] Adds the required quirk to enable the Cirrus amp and correct pins on the ASUS ROG G634Z series. While this works if the related _DSD properties are made available, these aren't included in the ACPI of these laptops (yet). Signed-off-by: Luke D. Jones <luke(a)ljones.dev> Link: https://lore.kernel.org/r/20230619060320.1336455-1-luke@ljones.dev Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- 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 920e44ba998a5..3889701bdb1c9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9552,6 +9552,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS), + SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), -- 2.39.2

1 0

[PATCH v1 0/3] ASoC: rt5677: Refactor to use device_get_match_data()
by Andy Shevchenko 29 Jun '23

29 Jun '23

The code can be simplified with device_get_match_data(). Besides that couple of additional changes, one for maintenance (patch 3) and one for making IRQ domain agnostic (not pinned to OF). Andy Shevchenko (3): ASoC: rt5677: Use agnostic irq_domain_create_linear() ASoC: rt5677: Use device_get_match_data() ASoC: rt5677: Sort headers alphabetically sound/soc/codecs/rt5677.c | 41 +++++++++++++-------------------------- sound/soc/codecs/rt5677.h | 4 ++-- 2 files changed, 16 insertions(+), 29 deletions(-) -- 2.40.0.1.gaa8946217a0b

3 7

[RFC PATCH 0/8] PCI: Define Intel PCI IDs and use them in drivers
by Amadeusz Sławiński 29 Jun '23

29 Jun '23

PCI IDs for Intel HDA are duplicated across quite a few drivers, due to various configurations and historical reasons. Currently almost all uses of HDA PCI IDs have corresponding comment telling which platform it is. Additionally there are some inconsistencies between drivers about which ID corresponds to which device. Simplify things, by adding PCI IDs to global header and make use of them in drivers. This allows for removal of comments by having IDs themselves being self explanatory. Additionally it allows for removal of existing inconsistencies by having one source of truth. Amadeusz Sławiński (8): PCI: Add Intel Audio DSP devices to pci_ids.h ALSA: intel-dsp-config: Update PCI ID list ALSA: hda: Update PCI ID list ALSA: hda/i915: Update PCI IDs ASoC: Intel: avs: Update PCI ID list ASoC: Intel: avs: Update PCI ID list ASoC: Intel: Skylake: Update PCI ID list ASoC: SOF: Intel: Update PCI ID list include/linux/pci_ids.h | 44 ++++ sound/hda/hdac_i915.c | 8 +- sound/hda/intel-dsp-config.c | 119 +++++----- sound/pci/hda/hda_intel.c | 292 ++++++++++++------------- sound/soc/intel/avs/board_selection.c | 10 +- sound/soc/intel/avs/core.c | 16 +- sound/soc/intel/skylake/skl-messages.c | 16 +- sound/soc/intel/skylake/skl.c | 36 +-- sound/soc/sof/intel/pci-apl.c | 9 +- sound/soc/sof/intel/pci-cnl.c | 15 +- sound/soc/sof/intel/pci-icl.c | 12 +- sound/soc/sof/intel/pci-mtl.c | 3 +- sound/soc/sof/intel/pci-skl.c | 6 +- sound/soc/sof/intel/pci-tgl.c | 45 ++-- sound/soc/sof/intel/pci-tng.c | 3 +- 15 files changed, 311 insertions(+), 323 deletions(-) -- 2.34.1

5 25

[PATCH 0/2] ASoC: fsl_sai: Fill Tx FIFO to avoid initial underruns
by Sascha Hauer 29 Jun '23

29 Jun '23

This series fixes initial underruns that can occur in the TX queue of the fsl_sai interface when starting playback. These patches are around here for quite some time and have proven useful. Time to upstream them. Sascha Ahmad Fatoum (2): ASoC: fsl_sai: refactor TDM slots calculation into helper function ASoC: fsl_sai: Fill Tx FIFO to avoid initial underruns sound/soc/fsl/fsl_sai.c | 38 +++++++++++++++++++++++++++++++++----- sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 34 insertions(+), 5 deletions(-) -- 2.39.2

2 3

[PATCHv2] ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook G10
by Huang Rui 29 Jun '23

29 Jun '23

In the commit 3e10f6ca76c4 ("ALSA: hda/realtek: Add quirk for HP EliteBook G10 laptops"), speakers are fixed but mute/micmute LEDs does not lit. Need the ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED to get all mute/micmute LEDs working. Signed-off-by: Huang Rui <vowstar(a)gmail.com> Fixes: 3e10f6ca76c4 ("ALSA: hda/realtek: Add quirk for HP EliteBook G10 laptops") --- V1 -> V2: Add fixes to link a previously committed issue --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index dabfdecece26..425c87733e79 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9491,7 +9491,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8b65, "HP ProBook 455 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b70, "HP EliteBook 835 G10", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b74, "HP EliteBook 845W G10", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x103c, 0x8b77, "HP ElieBook 865 G10", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED), -- 2.41.0

2 1

Arturia Minifuse 2 (and probably any other using SplitPCM macro) - lost sample rate range on each in/out (and forced to 48000)
by GitHub issues - edited 29 Jun '23

29 Jun '23

alsa-project/alsa-ucm-conf issue #333 was edited from kmarty: Hi, I have Arturia MiniFuse 2 card allowing playback/capture sample rate in range 44100 - 192000. But using channel name (e.g. `Mic/Line/Inst 1 (L)`, `Main Output L/R`) created by UCM, it offers 48000 only (and in case of playback, it offers S15_LE only). Looks like something is lost when `SplitPCM` macro is used or so (I have absolutely no idea what's going on here). Is there any possibility to make it work as it should? ================================= `/proc/asound/card4/stream0` output: ``` ARTURIA MiniFuse 2 at usb-0000:16:00.0-6.2, high speed : USB Audio Playback: Status: Stop Interface 1 Altset 1 Format: S32_LE Channels: 4 Endpoint: 0x01 (1 OUT) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 24 Channel map: FL FR FC LFE Sync Endpoint: 0x81 (1 IN) Sync EP Interface: 1 Sync EP Altset: 1 Implicit Feedback Mode: No Interface 1 Altset 2 Format: S16_LE Channels: 4 Endpoint: 0x01 (1 OUT) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 16 Channel map: FL FR FC LFE Sync Endpoint: 0x81 (1 IN) Sync EP Interface: 1 Sync EP Altset: 2 Implicit Feedback Mode: No Capture: Status: Stop Interface 2 Altset 1 Format: S32_LE Channels: 4 Endpoint: 0x82 (2 IN) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 24 Channel map: FL FR FC LFE ``` `alsaucm -c hw:4 dump text` output: ``` Verb.HiFi { Comment "Default Alsa Profile" Device.Line1 { Comment "Main Output L/R" Values { CaptureCTL "_ucm0001.hw:M2" PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 2 PlaybackPCM "_ucm0001.minifuse12_stereo_out:M2,0,0,1" PlaybackPriority 300 } } Device.Line2 { Comment "Loopback L/R" Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 2 CapturePCM "_ucm0001.minifuse12_stereo_in:M2,0,2,3" CapturePriority 200 PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 2 PlaybackPCM "_ucm0001.minifuse12_stereo_out:M2,0,2,3" PlaybackPriority 200 } } Device.Line3 { Comment "Stereo Input 1+2 L/R" ConflictingDevices [ Mic2, Mic1 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 2 CapturePCM "_ucm0001.minifuse12_stereo_in:M2,0,0,1" CapturePriority 100 PlaybackCTL "_ucm0001.hw:M2" } } Device.Mic1 { Comment "Mic/Line/Inst 1 (L)" ConflictingDevices [ Line3 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 1 CapturePCM "_ucm0001.minifuse12_mono_in:M2,0,0" CapturePriority 400 PlaybackCTL "_ucm0001.hw:M2" } } Device.Mic2 { Comment "Mic/Line/Inst 2 (R)" ConflictingDevices [ Line3 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 1 CapturePCM "_ucm0001.minifuse12_mono_in:M2,0,1" CapturePriority 300 PlaybackCTL "_ucm0001.hw:M2" } } } Verb.Direct { Comment "Direct MiniFuse 2" Device.Direct { Comment "Direct MiniFuse 2" Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 4 CapturePCM "_ucm0001.hw:M2" CapturePriority 1000 PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 4 PlaybackPCM "_ucm0001.hw:M2" PlaybackPriority 1000 } } } ``` Pipewire debug log "spa.alsa:D" excerpts (I have no idea how to get this elsewhere, but it matches to offered reality): ``` [I][12125.973616] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x562ee6e95448: ALSA device open '_ucm0001.minifuse12_mono_in:M2,0,0' capture [I][12125.993003] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] minifuse12_mono_in:M2,0,0 could not find ctl device: No such file or directory [D][12125.993047] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][12125.993065] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED MMAP_NONINTERLEAVED RW_INTERLEAVED RW_NONINTERLEAVED [D][12125.993075] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S32_LE [D][12125.993082] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][12125.993089] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 32 [D][12125.993095] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 32 [D][12125.993101] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 1 [D][12125.993107] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: 48000 [D][12125.993113] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: 10000 [D][12125.993119] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: 480 [D][12125.993124] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: 1920 [D][12125.993130] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 50] [D][12125.993136] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: [20000 500000] [D][12125.993142] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [960 24000] [D][12125.993148] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [3840 96000] [D][12125.993153] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][12125.993165] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:48000 max:48000 min-allowed:0 scale:1 interleave:1 all:0 [D][12125.993172] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][12125.993180] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (1 1) default:1 all:0 [D][12125.993187] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e95448: position 0 2 ``` ``` [I][12125.637937] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x562ee6e24218: ALSA device open '_ucm0001.minifuse12_stereo_out:M2,0,0,1' playback [I][12125.657353] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] minifuse12_stereo_out:M2,0,0,1 could not find ctl device: No such file or directory [D][12125.657379] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][12125.657398] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED MMAP_NONINTERLEAVED RW_INTERLEAVED RW_NONINTERLEAVED [D][12125.657407] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S16_LE [D][12125.657414] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][12125.657420] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 16 [D][12125.657427] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 32 [D][12125.657433] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 2 [D][12125.657439] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: 48000 [D][12125.657445] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: 10000 [D][12125.657452] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: 480 [D][12125.657458] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: 1920 [D][12125.657463] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 50] [D][12125.657468] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: [20000 500000] [D][12125.657474] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [960 24000] [D][12125.657481] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [3840 96000] [D][12125.657488] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][12125.657499] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:48000 max:48000 min-allowed:0 scale:1 interleave:1 all:0 [D][12125.657507] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][12125.657514] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (2 2) default:2 all:0 [D][12125.657521] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e24218: position 0 3 [D][12125.657528] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e24218: position 1 4 ``` Without matching UCM profile the in/outs offers the full range (but everything is mapped as "surround" 4-channel): ``` [D][13133.383190] spa.alsa | [ alsa-pcm.c: 1346 spa_alsa_enum_format()] opened:0 format:0 started:0 [I][13133.383199] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x5629c57893f8: ALSA device open 'surround40:4' capture [I][13133.384911] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] surround40:4 could not find ctl device: No such file or directory [D][13133.384928] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][13133.384941] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED RW_INTERLEAVED [D][13133.384947] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S32_LE [D][13133.384951] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][13133.384955] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 32 [D][13133.384959] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 128 [D][13133.384963] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 4 [D][13133.384967] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: [44100 192000] [D][13133.384970] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: [125 1000000] [D][13133.384974] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: [6 192000] [D][13133.384978] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: [96 3072000] [D][13133.384982] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 1024] [D][13133.384986] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: (62 2000000] [D][13133.384990] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [12 384000] [D][13133.384993] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [192 6144000] [D][13133.384997] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][13133.385004] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:44100 max:192000 min-allowed:0 scale:1 interleave:1 all:0 [D][13133.385009] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][13133.385014] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (4 4) default:4 all:0 [D][13133.385018] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 0 3 [D][13133.385022] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 1 4 [D][13133.385026] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 2 12 [D][13133.385030] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 3 13 ``` ``` [D][13133.381023] spa.alsa | [ alsa-pcm.c: 1346 spa_alsa_enum_format()] opened:0 format:0 started:0 [I][13133.381032] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x5629c57650b8: ALSA device open 'surround40:4' playback [I][13133.382756] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] surround40:4 could not find ctl device: No such file or directory [D][13133.382772] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][13133.382786] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED RW_INTERLEAVED [D][13133.382792] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S16_LE S32_LE [D][13133.382796] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][13133.382800] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: [16 32] [D][13133.382804] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: [64 128] [D][13133.382808] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 4 [D][13133.382812] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: [44100 192000] [D][13133.382816] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: [125 1000000] [D][13133.382820] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: [6 192000] [D][13133.382824] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: [64 3072000] [D][13133.382827] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 1024] [D][13133.382831] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: (62 2000000] [D][13133.382835] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [12 384000] [D][13133.382839] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [96 6144000] [D][13133.382843] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][13133.382850] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:44100 max:192000 min-allowed:0 scale:1 interleave:1 all:0 [D][13133.382855] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][13133.382859] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (4 4) default:4 all:0 [D][13133.382864] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 0 3 [D][13133.382868] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 1 4 [D][13133.382872] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 2 12 [D][13133.382876] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 3 13 ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/333 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Arturia Minifuse 2 (and probably any other using SplitPCM macro) - lost sample rate range on each in/out (and forced to 48000)
by GitHub issues - opened 29 Jun '23

29 Jun '23

alsa-project/alsa-ucm-conf issue #333 was opened from kmarty: Hi, I have Arturia MiniFuse 2 card allowing playback/capture sample rate in range 44100 - 192000. But using channel name (e.g. `Mic/Line/Inst 1 (L)`, `Main Output L/R`) created by UCM, it offers 48000 only (and in case o playback, it offers S15_LE only). Looks like something is lost when `SplitPCM` macro is used or so (I have absolutely no idea what's going on here). Is there any possibility to make it work as it should? ================================= `/proc/asound/card4/stream0` output: ``` ARTURIA MiniFuse 2 at usb-0000:16:00.0-6.2, high speed : USB Audio Playback: Status: Stop Interface 1 Altset 1 Format: S32_LE Channels: 4 Endpoint: 0x01 (1 OUT) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 24 Channel map: FL FR FC LFE Sync Endpoint: 0x81 (1 IN) Sync EP Interface: 1 Sync EP Altset: 1 Implicit Feedback Mode: No Interface 1 Altset 2 Format: S16_LE Channels: 4 Endpoint: 0x01 (1 OUT) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 16 Channel map: FL FR FC LFE Sync Endpoint: 0x81 (1 IN) Sync EP Interface: 1 Sync EP Altset: 2 Implicit Feedback Mode: No Capture: Status: Stop Interface 2 Altset 1 Format: S32_LE Channels: 4 Endpoint: 0x82 (2 IN) (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Bits: 24 Channel map: FL FR FC LFE ``` `alsaucm -c hw:4 dump text` output: ``` Verb.HiFi { Comment "Default Alsa Profile" Device.Line1 { Comment "Main Output L/R" Values { CaptureCTL "_ucm0001.hw:M2" PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 2 PlaybackPCM "_ucm0001.minifuse12_stereo_out:M2,0,0,1" PlaybackPriority 300 } } Device.Line2 { Comment "Loopback L/R" Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 2 CapturePCM "_ucm0001.minifuse12_stereo_in:M2,0,2,3" CapturePriority 200 PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 2 PlaybackPCM "_ucm0001.minifuse12_stereo_out:M2,0,2,3" PlaybackPriority 200 } } Device.Line3 { Comment "Stereo Input 1+2 L/R" ConflictingDevices [ Mic2, Mic1 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 2 CapturePCM "_ucm0001.minifuse12_stereo_in:M2,0,0,1" CapturePriority 100 PlaybackCTL "_ucm0001.hw:M2" } } Device.Mic1 { Comment "Mic/Line/Inst 1 (L)" ConflictingDevices [ Line3 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 1 CapturePCM "_ucm0001.minifuse12_mono_in:M2,0,0" CapturePriority 400 PlaybackCTL "_ucm0001.hw:M2" } } Device.Mic2 { Comment "Mic/Line/Inst 2 (R)" ConflictingDevices [ Line3 ] Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 1 CapturePCM "_ucm0001.minifuse12_mono_in:M2,0,1" CapturePriority 300 PlaybackCTL "_ucm0001.hw:M2" } } } Verb.Direct { Comment "Direct MiniFuse 2" Device.Direct { Comment "Direct MiniFuse 2" Values { CaptureCTL "_ucm0001.hw:M2" CaptureChannels 4 CapturePCM "_ucm0001.hw:M2" CapturePriority 1000 PlaybackCTL "_ucm0001.hw:M2" PlaybackChannels 4 PlaybackPCM "_ucm0001.hw:M2" PlaybackPriority 1000 } } } ``` Pipewire debug log "spa.alsa:D" excerpts (I have no idea how to get this elsewhere, but it matches to offered reality): ``` [I][12125.973616] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x562ee6e95448: ALSA device open '_ucm0001.minifuse12_mono_in:M2,0,0' capture [I][12125.993003] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] minifuse12_mono_in:M2,0,0 could not find ctl device: No such file or directory [D][12125.993047] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][12125.993065] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED MMAP_NONINTERLEAVED RW_INTERLEAVED RW_NONINTERLEAVED [D][12125.993075] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S32_LE [D][12125.993082] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][12125.993089] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 32 [D][12125.993095] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 32 [D][12125.993101] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 1 [D][12125.993107] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: 48000 [D][12125.993113] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: 10000 [D][12125.993119] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: 480 [D][12125.993124] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: 1920 [D][12125.993130] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 50] [D][12125.993136] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: [20000 500000] [D][12125.993142] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [960 24000] [D][12125.993148] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [3840 96000] [D][12125.993153] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][12125.993165] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:48000 max:48000 min-allowed:0 scale:1 interleave:1 all:0 [D][12125.993172] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][12125.993180] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (1 1) default:1 all:0 [D][12125.993187] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e95448: position 0 2 ``` ``` [I][12125.637937] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x562ee6e24218: ALSA device open '_ucm0001.minifuse12_stereo_out:M2,0,0,1' playback [I][12125.657353] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] minifuse12_stereo_out:M2,0,0,1 could not find ctl device: No such file or directory [D][12125.657379] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][12125.657398] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED MMAP_NONINTERLEAVED RW_INTERLEAVED RW_NONINTERLEAVED [D][12125.657407] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S16_LE [D][12125.657414] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][12125.657420] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 16 [D][12125.657427] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 32 [D][12125.657433] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 2 [D][12125.657439] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: 48000 [D][12125.657445] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: 10000 [D][12125.657452] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: 480 [D][12125.657458] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: 1920 [D][12125.657463] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 50] [D][12125.657468] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: [20000 500000] [D][12125.657474] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [960 24000] [D][12125.657481] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [3840 96000] [D][12125.657488] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][12125.657499] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:48000 max:48000 min-allowed:0 scale:1 interleave:1 all:0 [D][12125.657507] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][12125.657514] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (2 2) default:2 all:0 [D][12125.657521] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e24218: position 0 3 [D][12125.657528] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x562ee6e24218: position 1 4 ``` Without matching UCM profile the in/outs offers the full range (but everything is mapped as "surround" 4-channel): ``` [D][13133.383190] spa.alsa | [ alsa-pcm.c: 1346 spa_alsa_enum_format()] opened:0 format:0 started:0 [I][13133.383199] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x5629c57893f8: ALSA device open 'surround40:4' capture [I][13133.384911] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] surround40:4 could not find ctl device: No such file or directory [D][13133.384928] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][13133.384941] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED RW_INTERLEAVED [D][13133.384947] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S32_LE [D][13133.384951] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][13133.384955] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: 32 [D][13133.384959] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: 128 [D][13133.384963] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 4 [D][13133.384967] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: [44100 192000] [D][13133.384970] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: [125 1000000] [D][13133.384974] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: [6 192000] [D][13133.384978] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: [96 3072000] [D][13133.384982] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 1024] [D][13133.384986] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: (62 2000000] [D][13133.384990] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [12 384000] [D][13133.384993] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [192 6144000] [D][13133.384997] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][13133.385004] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:44100 max:192000 min-allowed:0 scale:1 interleave:1 all:0 [D][13133.385009] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][13133.385014] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (4 4) default:4 all:0 [D][13133.385018] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 0 3 [D][13133.385022] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 1 4 [D][13133.385026] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 2 12 [D][13133.385030] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57893f8: position 3 13 ``` ``` [D][13133.381023] spa.alsa | [ alsa-pcm.c: 1346 spa_alsa_enum_format()] opened:0 format:0 started:0 [I][13133.381032] spa.alsa | [ alsa-pcm.c: 618 spa_alsa_open()] 0x5629c57650b8: ALSA device open 'surround40:4' playback [I][13133.382756] spa.alsa | [ alsa-pcm.c: 568 probe_pitch_ctl()] surround40:4 could not find ctl device: No such file or directory [D][13133.382772] spa.alsa | [ alsa-pcm.c: 1048 debug_hw_params()] enum_pcm_formats: [D][13133.382786] spa.alsa | [ alsa-pcm.c: 469 log_write()] ACCESS: MMAP_INTERLEAVED RW_INTERLEAVED [D][13133.382792] spa.alsa | [ alsa-pcm.c: 469 log_write()] FORMAT: S16_LE S32_LE [D][13133.382796] spa.alsa | [ alsa-pcm.c: 469 log_write()] SUBFORMAT: STD [D][13133.382800] spa.alsa | [ alsa-pcm.c: 469 log_write()] SAMPLE_BITS: [16 32] [D][13133.382804] spa.alsa | [ alsa-pcm.c: 469 log_write()] FRAME_BITS: [64 128] [D][13133.382808] spa.alsa | [ alsa-pcm.c: 469 log_write()] CHANNELS: 4 [D][13133.382812] spa.alsa | [ alsa-pcm.c: 469 log_write()] RATE: [44100 192000] [D][13133.382816] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_TIME: [125 1000000] [D][13133.382820] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_SIZE: [6 192000] [D][13133.382824] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIOD_BYTES: [64 3072000] [D][13133.382827] spa.alsa | [ alsa-pcm.c: 469 log_write()] PERIODS: [2 1024] [D][13133.382831] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_TIME: (62 2000000] [D][13133.382835] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_SIZE: [12 384000] [D][13133.382839] spa.alsa | [ alsa-pcm.c: 469 log_write()] BUFFER_BYTES: [96 6144000] [D][13133.382843] spa.alsa | [ alsa-pcm.c: 469 log_write()] TICK_TIME: ALL [D][13133.382850] spa.alsa | [ alsa-pcm.c: 885 add_rate()] min:44100 max:192000 min-allowed:0 scale:1 interleave:1 all:0 [D][13133.382855] spa.alsa | [ alsa-pcm.c: 909 add_rate()] rate:48000 multi:1 card:0 def:0 [D][13133.382859] spa.alsa | [ alsa-pcm.c: 963 add_channels()] channels (4 4) default:4 all:0 [D][13133.382864] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 0 3 [D][13133.382868] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 1 4 [D][13133.382872] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 2 12 [D][13133.382876] spa.alsa | [ alsa-pcm.c: 1036 add_channels()] 0x5629c57650b8: position 3 13 ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/333 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook G10
by Huang Rui 29 Jun '23

29 Jun '23

In the commit 3e10f6ca76c4 ("ALSA: hda/realtek: Add quirk for HP EliteBook G10 laptops"), speakers are fixed but mute/micmute LEDs does not lit. Need the ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED to get all mute/micmute LEDs working. Signed-off-by: Huang Rui <vowstar(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index dabfdecece26..425c87733e79 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9491,7 +9491,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8b65, "HP ProBook 455 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b70, "HP EliteBook 835 G10", ALC287_FIXUP_CS35L41_I2C_2), - SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b74, "HP EliteBook 845W G10", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x103c, 0x8b77, "HP ElieBook 865 G10", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED), -- 2.41.0

1 0

[PATCH] ASoC: hdmi-codec: fix channel info for compressed formats
by Matthias Reichl 29 Jun '23

29 Jun '23

According to CTA 861 the channel/speaker allocation info in the audio infoframe only applies to uncompressed (PCM) audio streams. The channel count info should indicate the number of channels in the transmitted audio, which usually won't match the number of channels used to transmit the compressed bitstream. Some devices (eg some Sony TVs) will refuse to decode compressed audio if these values are not set correctly. To fix this we can simply set the channel count to 0 (which means "refer to stream header") and set the channel/speaker allocation to 0 as well (which would mean stereo FL/FR for PCM, a safe value all sinks will support) when transmitting compressed audio. Signed-off-by: Matthias Reichl <hias(a)horus.com> --- sound/soc/codecs/hdmi-codec.c | 36 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 6d980fbc42077..d21f69f053422 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -495,31 +495,43 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, struct hdmi_codec_params *hp) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - int idx; - - /* Select a channel allocation that matches with ELD and pcm channels */ - idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); - if (idx < 0) { - dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", - idx); - hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; - return idx; + int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; + u8 ca_id = 0; + bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO); + + if (pcm_audio) { + /* Select a channel allocation that matches with ELD and pcm channels */ + idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); + + if (idx < 0) { + dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", + idx); + hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; + return idx; + } + + ca_id = hdmi_codec_channel_alloc[idx].ca_id; } memset(hp, 0, sizeof(*hp)); hdmi_audio_infoframe_init(&hp->cea); - hp->cea.channels = channels; + + if (pcm_audio) + hp->cea.channels = channels; + else + hp->cea.channels = 0; + hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; - hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id; + hp->cea.channel_allocation = ca_id; hp->sample_width = sample_width; hp->sample_rate = sample_rate; hp->channels = channels; - hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id; + hcp->chmap_idx = idx; return 0; } -- 2.39.2

3 4

[PATCH 1/6] ASoC: amd: ps: add comments for DMA irq bits mapping
by Vijendar Mukunda 29 Jun '23

29 Jun '23

Add comments for DMA stream id and IRQ bit mapping in ACP_EXTERNAL_CNTL & ACP_EXTERNAL_CNTL1 registers for SDW0 and SDW1 manager instances. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/ps/acp63.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h index e96e6dc9d90f..733a16e23d32 100644 --- a/sound/soc/amd/ps/acp63.h +++ b/sound/soc/amd/ps/acp63.h @@ -116,8 +116,28 @@ #define ACP63_SDW0_DMA_MAX_STREAMS 6 #define ACP63_SDW1_DMA_MAX_STREAMS 2 #define ACP_P1_AUDIO_TX_THRESHOLD 6 + +/* + * Below entries describes SDW0 instance DMA stream id and DMA irq bit mapping + * in ACP_EXTENAL_INTR_CNTL register. + * Stream id IRQ Bit + * 0 (SDW0_AUDIO0_TX) 28 + * 1 (SDW0_AUDIO1_TX) 26 + * 2 (SDW0_AUDIO2_TX) 24 + * 3 (SDW0_AUDIO0_RX) 27 + * 4 (SDW0_AUDIO1_RX) 25 + * 5 (SDW0_AUDIO2_RX) 23 + */ #define SDW0_DMA_TX_IRQ_MASK(i) (ACP_AUDIO0_TX_THRESHOLD - (2 * (i))) #define SDW0_DMA_RX_IRQ_MASK(i) (ACP_AUDIO0_RX_THRESHOLD - (2 * (i))) + +/* + * Below entries describes SDW1 instance DMA stream id and DMA irq bit mapping + * in ACP_EXTENAL_INTR_CNTL1 register. + * Stream id IRQ Bit + * 0 (SDW1_AUDIO1_TX) 6 + * 1 (SDW1_AUDIO1_RX) 5 + */ #define SDW1_DMA_IRQ_MASK(i) (ACP_P1_AUDIO_TX_THRESHOLD - (i)) #define ACP_DELAY_US 5 -- 2.34.1

2 6