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

[PATCH v2][next] ALSA: mixart: Replace one-element arrays with simple object declarations
by Gustavo A. R. Silva 20 May '23

20 May '23

One-element arrays are deprecated, and we are replacing them with flexible array members instead. However, in this case it seems those one-element arrays have never actually been used as fake flexible arrays. See this code that dates from Linux-2.6.12-rc2 initial git repository build (commit 1da177e4c3f4 ("Linux-2.6.12-rc2")): sound/pci/mixart/mixart_core.h: 215 struct mixart_stream_state_req 216 { 217 u32 delayed; 218 u64 scheduler; 219 u32 reserved4np[3]; 220 u32 stream_count; /* set to 1 for instance */ 221 struct mixart_flow_info stream_info; /* could be an array[stream_count] */ 222 } __attribute__((packed)); sound/pci/mixart/mixart.c: 388 389 memset(&stream_state_req, 0, sizeof(stream_state_req)); 390 stream_state_req.stream_count = 1; 391 stream_state_req.stream_info.stream_desc.uid_pipe = stream->pipe->group_uid; 392 stream_state_req.stream_info.stream_desc.stream_idx = stream->substream->number; 393 So, taking the code above as example, replace multiple one-element arrays with simple object declarations, and refactor the rest of the code, accordingly. This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1]. This results in no differences in binary output. Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/KSPP/linux/issues/296 Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1] Signed-off-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> --- Changes in v2: - Keep the code comments (by Takashi Iwai) and explicitly mention that the objects could be arrays, in theory. v1: - Link: https://lore.kernel.org/linux-hardening/ZGVlcpuvx1rSOMP8@work/ sound/pci/mixart/mixart.c | 8 ++++---- sound/pci/mixart/mixart_core.h | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 1b078b789604..7ceaf6a7a77e 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -98,7 +98,7 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr, memset(&group_state, 0, sizeof(group_state)); group_state.pipe_count = 1; - group_state.pipe_uid[0] = pipe->group_uid; + group_state.pipe_uid = pipe->group_uid; if(start) request.message_id = MSG_STREAM_START_STREAM_GRP_PACKET; @@ -185,7 +185,7 @@ static int mixart_set_clock(struct mixart_mgr *mgr, clock_properties.clock_mode = CM_STANDALONE; clock_properties.frequency = rate; clock_properties.nb_callers = 1; /* only one entry in uid_caller ! */ - clock_properties.uid_caller[0] = pipe->group_uid; + clock_properties.uid_caller = pipe->group_uid; dev_dbg(&mgr->pci->dev, "mixart_set_clock to %d kHz\n", rate); @@ -565,8 +565,8 @@ static int mixart_set_format(struct mixart_stream *stream, snd_pcm_format_t form stream_param.pipe_count = 1; /* set to 1 */ stream_param.stream_count = 1; /* set to 1 */ - stream_param.stream_desc[0].uid_pipe = stream->pipe->group_uid; - stream_param.stream_desc[0].stream_idx = stream->substream->number; + stream_param.stream_desc.uid_pipe = stream->pipe->group_uid; + stream_param.stream_desc.stream_idx = stream->substream->number; request.message_id = MSG_STREAM_SET_INPUT_STAGE_PARAM; request.uid = (struct mixart_uid){0,0}; diff --git a/sound/pci/mixart/mixart_core.h b/sound/pci/mixart/mixart_core.h index 2f0e29ed5d63..d39233e0e070 100644 --- a/sound/pci/mixart/mixart_core.h +++ b/sound/pci/mixart/mixart_core.h @@ -231,7 +231,7 @@ struct mixart_group_state_req u64 scheduler; u32 reserved4np[2]; u32 pipe_count; /* set to 1 for instance */ - struct mixart_uid pipe_uid[1]; /* could be an array[pipe_count] */ + struct mixart_uid pipe_uid; /* could be an array[pipe_count], in theory */ } __attribute__((packed)); struct mixart_group_state_resp @@ -314,7 +314,7 @@ struct mixart_clock_properties u32 format; u32 board_mask; u32 nb_callers; /* set to 1 (see below) */ - struct mixart_uid uid_caller[1]; + struct mixart_uid uid_caller; } __attribute__((packed)); struct mixart_clock_properties_resp @@ -401,8 +401,7 @@ struct mixart_stream_param_desc u32 reserved4np[3]; u32 pipe_count; /* set to 1 (array size !) */ u32 stream_count; /* set to 1 (array size !) */ - struct mixart_txx_stream_desc stream_desc[1]; /* only one stream per command, but this could be an array */ - + struct mixart_txx_stream_desc stream_desc; /* only one stream per command, but this could be an array, in theory */ } __attribute__((packed)); -- 2.34.1

2 1

[PATCH v2] ALSA: emu10k1: centralize freeing PCM voices
by Oswald Buddenhagen 20 May '23

20 May '23

This saves some code duplication; no functional change. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- v2: - add minimal description (the two subsequent patches are unmodified, so not re-posting.) --- sound/pci/emu10k1/emupcm.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 324db1141479..9d6eb58e773f 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -76,16 +76,22 @@ static void snd_emu10k1_pcm_efx_interrupt(struct snd_emu10k1 *emu, snd_pcm_period_elapsed(emu->pcm_capture_efx_substream); } -static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voices) +static void snd_emu10k1_pcm_free_voices(struct snd_emu10k1_pcm *epcm) { - int err, i; - - for (i = 0; i < ARRAY_SIZE(epcm->voices); i++) { + for (unsigned i = 0; i < ARRAY_SIZE(epcm->voices); i++) { if (epcm->voices[i]) { snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]); epcm->voices[i] = NULL; } } +} + +static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voices) +{ + int err, i; + + snd_emu10k1_pcm_free_voices(epcm); + err = snd_emu10k1_voice_alloc(epcm->emu, epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX, voices, @@ -115,15 +121,13 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voic "failed extra: voices=%d, frame=%d\n", voices, frame); */ - for (i = 0; i < voices; i++) { - snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]); - epcm->voices[i] = NULL; - } + snd_emu10k1_pcm_free_voices(epcm); return err; } epcm->extra->epcm = epcm; epcm->extra->interrupt = snd_emu10k1_pcm_interrupt; } + return 0; } @@ -359,21 +363,15 @@ static int snd_emu10k1_playback_hw_free(struct snd_pcm_substream *substream) struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_emu10k1_pcm *epcm; - int i; if (runtime->private_data == NULL) return 0; epcm = runtime->private_data; if (epcm->extra) { snd_emu10k1_voice_free(epcm->emu, epcm->extra); epcm->extra = NULL; } - for (i = 0; i < NUM_EFX_PLAYBACK; i++) { - if (epcm->voices[i]) { - snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]); - epcm->voices[i] = NULL; - } - } + snd_emu10k1_pcm_free_voices(epcm); if (epcm->memblk) { snd_emu10k1_free_pages(emu, epcm->memblk); epcm->memblk = NULL; -- 2.40.0.152.g15d061e6df

2 1

snd_hda_codec_cirrus kernel oops
by Olliver Schinagl 20 May '23

20 May '23

Hey list, I've noticed the following crash since the last few days, causing audio to no longer to work. It could be related to me updating the firmware (bios) not too long ago (I load Mac OS every few months via an external drive) which caused the firmware to be updated. Or, it was a kernel update, that came along every few weeks. I'll try to find my archlinux bugzilla stuff, to report it there as well, but I don't think they are actively patching the sound stuff. The last commit I'm seeing on `patch_cirrus.c` seems to be from aug 2022, so that can't be it, though incidentally, the change is with regards to support for iMac 12,1 model, which is interesting as the number is the same. I understand you guys probably get tons of bug reports, but best to leave it here, just in case. [ 90.497004] CPU: 3 PID: 343 Comm: modprobe Not tainted 6.3.1-arch2-1 #1 4c16b0b90f71a940c7f1bb2eb00cdd9db2a83452 [ 90.497008] Hardware name: Apple Inc. MacBookPro12,1/Mac-E43C1C25D4880AD6, BIOS 481.0.0.0.0 01/12/2023 [ 90.497010] RIP: 0010:get_line_out_pfx+0x2dd/0x3e0 [snd_hda_codec_generic] [ 90.497019] Code: f9 01 0f 84 20 fe ff ff 48 c7 c2 4d 45 f9 c0 41 83 f9 02 0f 85 fe fd ff ff e9 0a fe ff ff 48 c7 c7 6e 45 f9 c0 e8 13 26 32 e6 <0f> 0b 48 c7 c2 dd 45 f9 c0 e9 f0 fd ff ff 8b 91 10 0b 00 00 48 8b [ 90.497021] RSP: 0018:ffffa50740cebad8 EFLAGS: 00010282 [ 90.497023] RAX: 0000000000000000 RBX: ffff90ea048d1cf0 RCX: 0000000000000027 [ 90.497025] RDX: ffff90ed5eda1688 RSI: 0000000000000001 RDI: ffff90ed5eda1680 [ 90.497027] RBP: 0000000000000004 R08: 0000000000000000 R09: ffffa50740ceb968 [ 90.497028] R10: 0000000000000003 R11: ffffffffa90ca208 R12: ffffffffc0f948c0 [ 90.497030] R13: ffff90ea13961000 R14: ffff90ea13940000 R15: 0000000010000013 [ 90.497032] FS: 00007f1db7091740(0000) GS:ffff90ed5ed80000(0000) knlGS:0000000000000000 [ 90.497034] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 90.497036] CR2: 000056301fb6f000 CR3: 00000001018ec002 CR4: 00000000003706e0 [ 90.497038] Call Trace: [ 90.497040] <TASK> [ 90.497043] snd_hda_gen_parse_auto_config+0xa54/0x2d50 [snd_hda_codec_generic 81639eb673de159e5e532c3e233834b733e4a85d] [ 90.497066] ? snd_hda_parse_pin_defcfg+0xaf7/0xda0 [snd_hda_codec 5b5014cb067d97e046acd84ac2db87d5fa068fb6] [ 90.497086] cs_parse_auto_config+0x3b/0xa0 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497094] patch_cs4208+0x155/0x1a0 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497101] ? snd_hdac_regmap_init+0x24/0x50 [snd_hda_core b180f4281d829fe0e1d0ef6f041e0fc5adf64817] [ 90.497128] hda_codec_driver_probe+0x98/0x150 [snd_hda_codec 5b5014cb067d97e046acd84ac2db87d5fa068fb6] [ 90.497143] really_probe+0x19b/0x3e0 [ 90.497149] ? __pfx___driver_attach+0x10/0x10 [ 90.497152] __driver_probe_device+0x78/0x160 [ 90.497156] driver_probe_device+0x1f/0x90 [ 90.497159] __driver_attach+0xd2/0x1c0 [ 90.497163] bus_for_each_dev+0x85/0xd0 [ 90.497166] bus_add_driver+0x116/0x220 [ 90.497170] driver_register+0x59/0x100 [ 90.497173] ? __pfx_init_module+0x10/0x10 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497179] do_one_initcall+0x5a/0x240 [ 90.497184] do_init_module+0x4a/0x200 [ 90.497190] __do_sys_init_module+0x17f/0x1b0 [ 90.497195] do_syscall_64+0x5d/0x90 [ 90.497213] ? do_user_addr_fault+0x1e0/0x720 [ 90.497217] ? exc_page_fault+0x7c/0x180 [ 90.497222] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 90.497225] RIP: 0033:0x7f1db6b21f9e [ 90.497242] Code: 48 8b 0d bd ed 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 8a ed 0c 00 f7 d8 64 89 01 48 [ 90.497244] RSP: 002b:00007fff2ac9ec58 EFLAGS: 00000246 ORIG_RAX: 00000000000000af [ 90.497246] RAX: ffffffffffffffda RBX: 00005614a9a07e00 RCX: 00007f1db6b21f9e [ 90.497248] RDX: 00005614a8e1dcb2 RSI: 0000000000010660 RDI: 00005614a9a6cdb0 [ 90.497250] RBP: 00005614a8e1dcb2 R08: 0000000000010660 R09: 0000000000000000 [ 90.497251] R10: 000000000005d8a1 R11: 0000000000000246 R12: 0000000000040000 [ 90.497253] R13: 00005614a9a07c50 R14: 0000000000000000 R15: 00005614a9a0bbb0 [ 90.497270] </TASK> [ 90.497271] ---[ end trace 0000000000000000 ]--- [ 90.497273] ------------[ cut here ]------------ [ 90.497274] BUG? [ 90.497284] WARNING: CPU: 3 PID: 343 at sound/pci/hda/hda_generic.c:1238 get_line_out_pfx+0x2dd/0x3e0 [snd_hda_codec_generic] [ 90.497293] Modules linked in: snd_hda_codec_cirrus(+) brcmfmac(+) snd_hda_codec_generic ledtrig_audio brcmutil iTCO_wdt snd_hda_intel mei_pxp mei_hdcp snd_intel_dspcfg btusb irqbypass snd_intel_sdw_acpi btrtl intel_pmc_bxt snd_hda_codec btbcm drm_buddy spi_intel_platform btintel snd_hda_core spi_intel iTCO_vendor_support rapl btmtk cfg80211 applesmc i2c_i801 mei_me joydev i2c_algo_bit intel_cstate snd_hwdep ttm i2c_smbus pcspkr mei intel_uncore intel_pch_thermal bluetooth lpc_ich snd_pcm thunderbolt mmc_core drm_display_helper snd_timer snd acpi_als ecdh_generic cec mousedev bcm5974 rfkill intel_gtt industrialio_triggered_buffer soundcore sbs kfifo_buf video apple_mfi_fastcharge sbshc industrialio wmi apple_bl mac_hid dm_multipath sg loop crypto_user fuse bpf_preload ip_tables x_tables usbhid crct10dif_pclmul crc32_pclmul polyval_clmulni polyval_generic gf128mul ghash_clmulni_intel sha512_ssse3 aesni_intel crypto_simd cryptd applespi crc16 xhci_pci spi_pxa2xx_pci spi_pxa2xx_platform xhci_pci_renesas dw_dmac hid_apple [ 90.497374] tg3 libphy vfat fat btrfs blake2b_generic xor raid6_pq libcrc32c crc32c_generic crc32c_intel dm_crypt cbc encrypted_keys trusted asn1_encoder tee dm_mod [ 90.497388] CPU: 3 PID: 343 Comm: modprobe Tainted: G W 6.3.1-arch2-1 #1 4c16b0b90f71a940c7f1bb2eb00cdd9db2a83452 [ 90.497391] Hardware name: Apple Inc. MacBookPro12,1/Mac-E43C1C25D4880AD6, BIOS 481.0.0.0.0 01/12/2023 [ 90.497392] RIP: 0010:get_line_out_pfx+0x2dd/0x3e0 [snd_hda_codec_generic] [ 90.497401] Code: f9 01 0f 84 20 fe ff ff 48 c7 c2 4d 45 f9 c0 41 83 f9 02 0f 85 fe fd ff ff e9 0a fe ff ff 48 c7 c7 6e 45 f9 c0 e8 13 26 32 e6 <0f> 0b 48 c7 c2 dd 45 f9 c0 e9 f0 fd ff ff 8b 91 10 0b 00 00 48 8b [ 90.497403] RSP: 0018:ffffa50740cebad8 EFLAGS: 00010282 [ 90.497418] RAX: 0000000000000000 RBX: ffff90ea048d1cf0 RCX: 0000000000000027 [ 90.497420] RDX: ffff90ed5eda1688 RSI: 0000000000000001 RDI: ffff90ed5eda1680 [ 90.497422] RBP: 0000000000000004 R08: 0000000000000000 R09: ffffa50740ceb968 [ 90.497423] R10: 0000000000000003 R11: ffffffffa90ca208 R12: 0000000000000004 [ 90.497425] R13: ffff90ea13961000 R14: ffff90ea13940000 R15: ffffffffc0f945dd [ 90.497427] FS: 00007f1db7091740(0000) GS:ffff90ed5ed80000(0000) knlGS:0000000000000000 [ 90.497429] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 90.497430] CR2: 000056301fb6f000 CR3: 00000001018ec002 CR4: 00000000003706e0 [ 90.497432] Call Trace: [ 90.497433] <TASK> [ 90.497435] snd_hda_gen_parse_auto_config+0x9a5/0x2d50 [snd_hda_codec_generic 81639eb673de159e5e532c3e233834b733e4a85d] [ 90.497444] ? snd_hda_parse_pin_defcfg+0xaf7/0xda0 [snd_hda_codec 5b5014cb067d97e046acd84ac2db87d5fa068fb6] [ 90.497463] cs_parse_auto_config+0x3b/0xa0 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497469] patch_cs4208+0x155/0x1a0 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497476] ? snd_hdac_regmap_init+0x24/0x50 [snd_hda_core b180f4281d829fe0e1d0ef6f041e0fc5adf64817] [ 90.497489] hda_codec_driver_probe+0x98/0x150 [snd_hda_codec 5b5014cb067d97e046acd84ac2db87d5fa068fb6] [ 90.497516] really_probe+0x19b/0x3e0 [ 90.497520] ? __pfx___driver_attach+0x10/0x10 [ 90.497523] __driver_probe_device+0x78/0x160 [ 90.497527] driver_probe_device+0x1f/0x90 [ 90.497530] __driver_attach+0xd2/0x1c0 [ 90.497533] bus_for_each_dev+0x85/0xd0 [ 90.497537] bus_add_driver+0x116/0x220 [ 90.497540] driver_register+0x59/0x100 [ 90.497543] ? __pfx_init_module+0x10/0x10 [snd_hda_codec_cirrus 9ac52229b60afb26837192841054ac3dbe8aecc3] [ 90.497549] do_one_initcall+0x5a/0x240 [ 90.497553] do_init_module+0x4a/0x200 [ 90.497570] __do_sys_init_module+0x17f/0x1b0 [ 90.497576] do_syscall_64+0x5d/0x90 [ 90.497579] ? do_user_addr_fault+0x1e0/0x720 [ 90.497583] ? exc_page_fault+0x7c/0x180 [ 90.497587] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 90.497589] RIP: 0033:0x7f1db6b21f9e [ 90.497595] Code: 48 8b 0d bd ed 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 8a ed 0c 00 f7 d8 64 89 01 48 [ 90.497596] RSP: 002b:00007fff2ac9ec58 EFLAGS: 00000246 ORIG_RAX: 00000000000000af [ 90.497599] RAX: ffffffffffffffda RBX: 00005614a9a07e00 RCX: 00007f1db6b21f9e [ 90.497601] RDX: 00005614a8e1dcb2 RSI: 0000000000010660 RDI: 00005614a9a6cdb0 [ 90.497602] RBP: 00005614a8e1dcb2 R08: 0000000000010660 R09: 0000000000000000 [ 90.497604] R10: 000000000005d8a1 R11: 0000000000000246 R12: 0000000000040000 [ 90.497605] R13: 00005614a9a07c50 R14: 0000000000000000 R15: 00005614a9a0bbb0 [ 90.497609] </TASK> [ 90.497610] ---[ end trace 0000000000000000 ]--- [ 90.512670] bcm5974: bad trackpad package, length: 8 [ 90.569769] input: HDA Intel PCH Mic as /devices/pci0000:00/0000:00:1b.0/sound/card1/input9 [ 90.569831] input: HDA Intel PCH Line as /devices/pci0000:00/0000:00:1b.0/sound/card1/input10 [ 90.569886] input: HDA Intel PCH Headphone as /devices/pci0000:00/0000:00:1b.0/sound/card1/input11 [ 90.569926] input: HDA Intel PCH SPDIF as /devices/pci0000:00/0000:00:1b.0/sound/card1/input12 [ 90.569977] input: HDA Intel PCH SPDIF In as /devices/pci0000:00/0000:00:1b.0/sound/card1/input13

2 10

[PATCH alsa-utils 0/3] Add MIDI 2.0 support
by Takashi Iwai 20 May '23

20 May '23

This is a small patch set for alsa-utils to add the MIDI 2.0 support. Very minimalistic changes, covering only the sequencer programs: aseqdump, aconnect and aplaymidi. Takashi --- Takashi Iwai (3): aseqdump: Add UMP support aconnect: Add UMP support aplaymidi: Add UMP support configure.ac | 4 + seq/aconnect/aconnect.1 | 3 + seq/aconnect/aconnect.c | 91 +++++++++++++--- seq/aplaymidi/aplaymidi.1 | 6 ++ seq/aplaymidi/aplaymidi.c | 216 ++++++++++++++++++++++++++++++-------- seq/aseqdump/aseqdump.1 | 9 ++ seq/aseqdump/aseqdump.c | 211 ++++++++++++++++++++++++++++++++++++- 7 files changed, 478 insertions(+), 62 deletions(-) -- 2.35.3

1 3

[PATCH alsa-lib 0/8] Add MIDI 2.0 support
by Takashi Iwai 20 May '23

20 May '23

This is a series of patches for alsa-lib to add the support of MIDI 2.0 features, corresponding to the kernel patches that have been submitted recently: https://lore.kernel.org/r/20230519093114.28813-1-tiwai@suse.de The API extensions are minimalistic, and only a few basic accessors have been defined. Takashi --- Takashi Iwai (8): uapi: Update rawmidi API to 2.0.3 rawmidi: Add UMP ioctl support ump: Add initial support control: Add UMP device query support ump: Add helpers to parse / set UMP packet data ump: Add helpers for handling SysEx data uapi: Update asequencer.h definitions for 1.0.3 seq: Add UMP support configure.ac | 1 + include/Makefile.am | 2 +- include/control.h | 1 + include/local.h | 4 + include/rawmidi.h | 3 + include/seq.h | 44 ++ include/seq_event.h | 42 +- include/seqmid.h | 24 ++ include/sound/uapi/asequencer.h | 91 ++++- include/sound/uapi/asound.h | 58 ++- include/ump.h | 119 ++++++ include/ump_msg.h | 598 +++++++++++++++++++++++++++ src/Versions.in | 23 ++ src/control/control.c | 14 + src/control/control_hw.c | 9 + src/control/control_local.h | 1 + src/rawmidi/Makefile.am | 5 +- src/rawmidi/rawmidi.c | 19 + src/rawmidi/rawmidi_hw.c | 36 +- src/rawmidi/rawmidi_local.h | 7 + src/rawmidi/ump.c | 702 ++++++++++++++++++++++++++++++++ src/rawmidi/ump_local.h | 10 + src/seq/seq.c | 410 +++++++++++++++++-- src/seq/seq_hw.c | 72 +++- src/seq/seq_local.h | 6 +- src/seq/seqmid.c | 38 ++ 26 files changed, 2261 insertions(+), 78 deletions(-) create mode 100644 include/ump.h create mode 100644 include/ump_msg.h create mode 100644 src/rawmidi/ump.c create mode 100644 src/rawmidi/ump_local.h -- 2.35.3

1 8

[PATCH] ALSA: ti: Use pcm_for_each_format() macro for PCM format iteration
by Min-Hua Chen 20 May '23

20 May '23

Use pcm_for_each_format for the PCM format iteration and fix the following sparse warnings. sound/soc/ti/davinci-mcasp.c:1336:26: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/ti/davinci-mcasp.c:1358:26: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/ti/davinci-mcasp.c:1438:26: sparse: warning: restricted snd_pcm_format_t degrades to integer No functional changes. Signed-off-by: Min-Hua Chen <minhuadotchen(a)gmail.com> --- sound/soc/ti/davinci-mcasp.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index c0892be2992b..172fea764a31 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1328,15 +1328,16 @@ static int davinci_mcasp_hw_rule_slot_width(struct snd_pcm_hw_params *params, struct davinci_mcasp_ruledata *rd = rule->private; struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_mask nfmt; - int i, slot_width; + int slot_width; + snd_pcm_format_t i; snd_mask_none(&nfmt); slot_width = rd->mcasp->slot_width; - for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { - if (snd_mask_test(fmt, i)) { + pcm_for_each_format(i) { + if (snd_mask_test_format(fmt, i)) { if (snd_pcm_format_width(i) <= slot_width) { - snd_mask_set(&nfmt, i); + snd_mask_set_format(&nfmt, i); } } } @@ -1350,15 +1351,16 @@ static int davinci_mcasp_hw_rule_format_width(struct snd_pcm_hw_params *params, struct davinci_mcasp_ruledata *rd = rule->private; struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_mask nfmt; - int i, format_width; + int format_width; + snd_pcm_format_t i; snd_mask_none(&nfmt); format_width = rd->mcasp->max_format_width; - for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { - if (snd_mask_test(fmt, i)) { + pcm_for_each_format(i) { + if (snd_mask_test_format(fmt, i)) { if (snd_pcm_format_width(i) == format_width) { - snd_mask_set(&nfmt, i); + snd_mask_set_format(&nfmt, i); } } } @@ -1431,12 +1433,13 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params, struct snd_mask nfmt; int rate = params_rate(params); int slots = rd->mcasp->tdm_slots; - int i, count = 0; + int count = 0; + snd_pcm_format_t i; snd_mask_none(&nfmt); - for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { - if (snd_mask_test(fmt, i)) { + pcm_for_each_format(i) { + if (snd_mask_test_format(fmt, i)) { uint sbits = snd_pcm_format_width(i); unsigned int sysclk_freq; int ppm; @@ -1454,7 +1457,7 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params, sbits * slots * rate, false); if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) { - snd_mask_set(&nfmt, i); + snd_mask_set_format(&nfmt, i); count++; } } -- 2.34.1

2 4

[tiwai-sound:topic/midi20 20/36] sound/core/seq/seq_ports.c:138:37: warning: variable 'num' is uninitialized when used here
by kernel test robot 19 May '23

19 May '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20 head: cc8e2c3b2d2b9c2af16151d30335492e2d0e3240 commit: e046e543faaff41051415c97bcce0b8b31d3b3f9 [20/36] ALSA: seq: Check the conflicting port at port creation config: hexagon-randconfig-r016-20230517 compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project b0fb98227c90adf2536c9ad644a74d5e92961111) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=… git remote add tiwai-sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git git fetch --no-tags tiwai-sound topic/midi20 git checkout e046e543faaff41051415c97bcce0b8b31d3b3f9 # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash sound/core/seq/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202305192228.T2dDkOaw-lkp@intel.com/ All warnings (new ones prefixed by >>): >> sound/core/seq/seq_ports.c:138:37: warning: variable 'num' is uninitialized when used here [-Wuninitialized] sprintf(new_port->name, "port-%d", num); ^~~ sound/core/seq/seq_ports.c:117:9: note: initialize the variable 'num' to silence this warning int num; ^ = 0 1 warning generated. vim +/num +138 sound/core/seq/seq_ports.c ^1da177e4c3f41 Linus Torvalds 2005-04-16 108 ^1da177e4c3f41 Linus Torvalds 2005-04-16 109 e046e543faaff4 Takashi Iwai 2023-01-05 110 /* create a port, port number or a negative error code is returned 71105998845fb0 Takashi Iwai 2017-10-09 111 * the caller needs to unref the port via snd_seq_port_unlock() appropriately 71105998845fb0 Takashi Iwai 2017-10-09 112 */ e046e543faaff4 Takashi Iwai 2023-01-05 113 int snd_seq_create_port(struct snd_seq_client *client, int port, e046e543faaff4 Takashi Iwai 2023-01-05 114 struct snd_seq_client_port **port_ret) ^1da177e4c3f41 Linus Torvalds 2005-04-16 115 { 9244b2c3079faa Johannes Berg 2006-10-05 116 struct snd_seq_client_port *new_port, *p; e046e543faaff4 Takashi Iwai 2023-01-05 117 int num; e046e543faaff4 Takashi Iwai 2023-01-05 118 e046e543faaff4 Takashi Iwai 2023-01-05 119 *port_ret = NULL; ^1da177e4c3f41 Linus Torvalds 2005-04-16 120 ^1da177e4c3f41 Linus Torvalds 2005-04-16 121 /* sanity check */ 7eaa943c8ed8e9 Takashi Iwai 2008-08-08 122 if (snd_BUG_ON(!client)) e046e543faaff4 Takashi Iwai 2023-01-05 123 return -EINVAL; ^1da177e4c3f41 Linus Torvalds 2005-04-16 124 de20b572a30ac3 Clemens Ladisch 2015-01-25 125 if (client->num_ports >= SNDRV_SEQ_MAX_PORTS) { 04cc79a048ee21 Takashi Iwai 2014-02-04 126 pr_warn("ALSA: seq: too many ports for client %d\n", client->number); e046e543faaff4 Takashi Iwai 2023-01-05 127 return -EINVAL; ^1da177e4c3f41 Linus Torvalds 2005-04-16 128 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 129 ^1da177e4c3f41 Linus Torvalds 2005-04-16 130 /* create a new port */ ecca82b4b447f8 Takashi Iwai 2005-09-09 131 new_port = kzalloc(sizeof(*new_port), GFP_KERNEL); 24db8bbaa3fcfa Takashi Iwai 2015-03-10 132 if (!new_port) e046e543faaff4 Takashi Iwai 2023-01-05 133 return -ENOMEM; /* failure, out of memory */ ^1da177e4c3f41 Linus Torvalds 2005-04-16 134 /* init port data */ ^1da177e4c3f41 Linus Torvalds 2005-04-16 135 new_port->addr.client = client->number; ^1da177e4c3f41 Linus Torvalds 2005-04-16 136 new_port->addr.port = -1; ^1da177e4c3f41 Linus Torvalds 2005-04-16 137 new_port->owner = THIS_MODULE; ^1da177e4c3f41 Linus Torvalds 2005-04-16 @138 sprintf(new_port->name, "port-%d", num); ^1da177e4c3f41 Linus Torvalds 2005-04-16 139 snd_use_lock_init(&new_port->use_lock); ^1da177e4c3f41 Linus Torvalds 2005-04-16 140 port_subs_info_init(&new_port->c_src); ^1da177e4c3f41 Linus Torvalds 2005-04-16 141 port_subs_info_init(&new_port->c_dest); 71105998845fb0 Takashi Iwai 2017-10-09 142 snd_use_lock_use(&new_port->use_lock); ^1da177e4c3f41 Linus Torvalds 2005-04-16 143 44d30762cde76f Guo Zhengkui 2022-05-17 144 num = max(port, 0); 1a60d4c5a0c402 Ingo Molnar 2006-01-16 145 mutex_lock(&client->ports_mutex); f823b8a75527dc Takashi Iwai 2019-03-28 146 write_lock_irq(&client->ports_lock); 9244b2c3079faa Johannes Berg 2006-10-05 147 list_for_each_entry(p, &client->ports_list_head, list) { e046e543faaff4 Takashi Iwai 2023-01-05 148 if (p->addr.port == port) { e046e543faaff4 Takashi Iwai 2023-01-05 149 num = -EBUSY; e046e543faaff4 Takashi Iwai 2023-01-05 150 goto unlock; e046e543faaff4 Takashi Iwai 2023-01-05 151 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 152 if (p->addr.port > num) ^1da177e4c3f41 Linus Torvalds 2005-04-16 153 break; ^1da177e4c3f41 Linus Torvalds 2005-04-16 154 if (port < 0) /* auto-probe mode */ ^1da177e4c3f41 Linus Torvalds 2005-04-16 155 num = p->addr.port + 1; ^1da177e4c3f41 Linus Torvalds 2005-04-16 156 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 157 /* insert the new port */ 9244b2c3079faa Johannes Berg 2006-10-05 158 list_add_tail(&new_port->list, &p->list); ^1da177e4c3f41 Linus Torvalds 2005-04-16 159 client->num_ports++; ^1da177e4c3f41 Linus Torvalds 2005-04-16 160 new_port->addr.port = num; /* store the port number in the port */ 71105998845fb0 Takashi Iwai 2017-10-09 161 sprintf(new_port->name, "port-%d", num); e046e543faaff4 Takashi Iwai 2023-01-05 162 *port_ret = new_port; e046e543faaff4 Takashi Iwai 2023-01-05 163 unlock: f823b8a75527dc Takashi Iwai 2019-03-28 164 write_unlock_irq(&client->ports_lock); 1a60d4c5a0c402 Ingo Molnar 2006-01-16 165 mutex_unlock(&client->ports_mutex); ^1da177e4c3f41 Linus Torvalds 2005-04-16 166 e046e543faaff4 Takashi Iwai 2023-01-05 167 return num; ^1da177e4c3f41 Linus Torvalds 2005-04-16 168 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 169 :::::: The code at line 138 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2 :::::: TO: Linus Torvalds <torvalds(a)ppc970.osdl.org> :::::: CC: Linus Torvalds <torvalds(a)ppc970.osdl.org> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[RESEND PATCH 00/12] ASoC: codecs: do not store status in state containe
by Krzysztof Kozlowski 19 May '23

19 May '23

Hi, Resend due to missing cover letter, so adding per-series tags was not possible. Added Rb tag. Best regards, Krzysztof Krzysztof Kozlowski (12): ASoC: codecs: rt1308: do not store status in state container ASoC: codecs: rt1316: do not store status in state container ASoC: codecs: rt1318: do not store status in state container ASoC: codecs: rt5682: do not store status in state container ASoC: codecs: rt700: do not store status in state container ASoC: codecs: rt711-sdca: do not store status in state container ASoC: codecs: rt711: do not store status in state container ASoC: codecs: rt712-sdca-dmic: do not store status in state container ASoC: codecs: rt712-sdca: do not store status in state container ASoC: codecs: rt715-sdca: do not store status in state container ASoC: codecs: rt715: do not store status in state container ASoC: codecs: rt722-sdca: do not store status in state container sound/soc/codecs/rt1308-sdw.c | 5 +---- sound/soc/codecs/rt1308-sdw.h | 1 - sound/soc/codecs/rt1316-sdw.c | 5 +---- sound/soc/codecs/rt1316-sdw.h | 1 - sound/soc/codecs/rt1318-sdw.c | 5 +---- sound/soc/codecs/rt1318-sdw.h | 1 - sound/soc/codecs/rt5682-sdw.c | 5 +---- sound/soc/codecs/rt5682.h | 1 - sound/soc/codecs/rt700-sdw.c | 5 +---- sound/soc/codecs/rt700.h | 1 - sound/soc/codecs/rt711-sdca-sdw.c | 5 +---- sound/soc/codecs/rt711-sdca.h | 1 - sound/soc/codecs/rt711-sdw.c | 5 +---- sound/soc/codecs/rt711.h | 1 - sound/soc/codecs/rt712-sdca-dmic.c | 5 +---- sound/soc/codecs/rt712-sdca-dmic.h | 1 - sound/soc/codecs/rt712-sdca-sdw.c | 5 +---- sound/soc/codecs/rt712-sdca.h | 1 - sound/soc/codecs/rt715-sdca-sdw.c | 5 +---- sound/soc/codecs/rt715-sdca.h | 1 - sound/soc/codecs/rt715-sdw.c | 4 +--- sound/soc/codecs/rt715.h | 1 - sound/soc/codecs/rt722-sdca-sdw.c | 5 +---- sound/soc/codecs/rt722-sdca.h | 1 - 24 files changed, 12 insertions(+), 59 deletions(-) -- 2.34.1

2 16

[PATCH 0/7] ALSA: emu10k1: refactoring of the playback voice management
by Oswald Buddenhagen 19 May '23

19 May '23

Oswald Buddenhagen (7): ALSA: emu10k1: simplify freeing synth voices ALSA: emu10k1: don't forget to reset reclaimed synth voices ALSA: emu10k1: improve voice status display in /proc ALSA: emu10k1: make freeing untouched playback voices cheap ALSA: emu10k1: centralize freeing PCM voices ALSA: emu10k1: make snd_emu10k1_voice_alloc() assign voices' epcm ALSA: emu10k1: revamp playback voice allocator include/sound/emu10k1.h | 18 ++-- sound/pci/emu10k1/emu10k1_callback.c | 8 +- sound/pci/emu10k1/emumixer.c | 24 ++--- sound/pci/emu10k1/emupcm.c | 88 ++++++++--------- sound/pci/emu10k1/emuproc.c | 18 ++-- sound/pci/emu10k1/voice.c | 136 +++++++++++++-------------- 6 files changed, 136 insertions(+), 156 deletions(-) -- 2.40.0.152.g15d061e6df

2 13

[PATCH] ASoC: dt-bindings: dialog,da7219: convert to dtschema
by David Rau 19 May '23

19 May '23

- Convert Dialog DA7219 bindings to DT schema format. - Add Jack insertion detection polarity selection. - Remove unused `dlg,ldo-lvl` parameter. Signed-off-by: David Rau <David.Rau.opensource(a)dm.renesas.com> --- .../devicetree/bindings/sound/da7219.txt | 112 -------- .../bindings/sound/dialog,da7219.yaml | 240 ++++++++++++++++++ 2 files changed, 240 insertions(+), 112 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/da7219.txt create mode 100644 Documentation/devicetree/bindings/sound/dialog,da7219.yaml diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt deleted file mode 100644 index add1caf26ac2..000000000000 --- a/Documentation/devicetree/bindings/sound/da7219.txt +++ /dev/null @@ -1,112 +0,0 @@ -Dialog Semiconductor DA7219 Audio Codec bindings - -DA7219 is an audio codec with advanced accessory detect features. - -====== - -Required properties: -- compatible : Should be "dlg,da7219" -- reg: Specifies the I2C slave address - -- interrupts : IRQ line info for DA7219. - (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for - further information relating to interrupt properties) - -- VDD-supply: VDD power supply for the device -- VDDMIC-supply: VDDMIC power supply for the device -- VDDIO-supply: VDDIO power supply for the device - (See Documentation/devicetree/bindings/regulator/regulator.txt for further - information relating to regulators) - -Optional properties: -- interrupt-names : Name associated with interrupt line. Should be "wakeup" if - interrupt is to be used to wake system, otherwise "irq" should be used. -- wakeup-source: Flag to indicate this device can wake system (suspend/resume). - -- #clock-cells : Should be set to '<1>', two clock sources provided; -- clock-output-names : Names given for DAI clock outputs (WCLK & BCLK); - -- clocks : phandle and clock specifier for codec MCLK. -- clock-names : Clock name string for 'clocks' attribute, should be "mclk". - -- dlg,micbias-lvl : Voltage (mV) for Mic Bias - [<1600>, <1800>, <2000>, <2200>, <2400>, <2600>] -- dlg,mic-amp-in-sel : Mic input source type - ["diff", "se_p", "se_n"] - -Deprecated properties: -- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine - (LDO unavailable in production HW so property no longer required). - -====== - -Child node - 'da7219_aad': - -Optional properties: -- dlg,micbias-pulse-lvl : Mic bias higher voltage pulse level (mV). - [<2800>, <2900>] -- dlg,micbias-pulse-time : Mic bias higher voltage pulse duration (ms) -- dlg,btn-cfg : Periodic button press measurements for 4-pole jack (ms) - [<2>, <5>, <10>, <50>, <100>, <200>, <500>] -- dlg,mic-det-thr : Impedance threshold for mic detection measurement (Ohms) - [<200>, <500>, <750>, <1000>] -- dlg,jack-ins-deb : Debounce time for jack insertion (ms) - [<5>, <10>, <20>, <50>, <100>, <200>, <500>, <1000>] -- dlg,jack-det-rate: Jack type detection latency (3/4 pole) - ["32ms_64ms", "64ms_128ms", "128ms_256ms", "256ms_512ms"] -- dlg,jack-rem-deb : Debounce time for jack removal (ms) - [<1>, <5>, <10>, <20>] -- dlg,a-d-btn-thr : Impedance threshold between buttons A and D - [0x0 - 0xFF] -- dlg,d-b-btn-thr : Impedance threshold between buttons D and B - [0x0 - 0xFF] -- dlg,b-c-btn-thr : Impedance threshold between buttons B and C - [0x0 - 0xFF] -- dlg,c-mic-btn-thr : Impedance threshold between button C and Mic - [0x0 - 0xFF] -- dlg,btn-avg : Number of 8-bit readings for averaged button measurement - [<1>, <2>, <4>, <8>] -- dlg,adc-1bit-rpt : Repeat count for 1-bit button measurement - [<1>, <2>, <4>, <8>] - -====== - -Example: - - codec: da7219@1a { - compatible = "dlg,da7219"; - reg = <0x1a>; - - interrupt-parent = <&gpio6>; - interrupts = <11 IRQ_TYPE_LEVEL_LOW>; - - VDD-supply = <&reg_audio>; - VDDMIC-supply = <&reg_audio>; - VDDIO-supply = <&reg_audio>; - - #clock-cells = <1>; - clock-output-names = "dai-wclk", "dai-bclk"; - - clocks = <&clks 201>; - clock-names = "mclk"; - - dlg,ldo-lvl = <1200>; - dlg,micbias-lvl = <2600>; - dlg,mic-amp-in-sel = "diff"; - - da7219_aad { - dlg,btn-cfg = <50>; - dlg,mic-det-thr = <500>; - dlg,jack-ins-deb = <20>; - dlg,jack-det-rate = "32ms_64ms"; - dlg,jack-rem-deb = <1>; - - dlg,a-d-btn-thr = <0xa>; - dlg,d-b-btn-thr = <0x16>; - dlg,b-c-btn-thr = <0x21>; - dlg,c-mic-btn-thr = <0x3E>; - - dlg,btn-avg = <4>; - dlg,adc-1bit-rpt = <1>; - }; - }; diff --git a/Documentation/devicetree/bindings/sound/dialog,da7219.yaml b/Documentation/devicetree/bindings/sound/dialog,da7219.yaml new file mode 100644 index 000000000000..32dfc4559052 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/dialog,da7219.yaml @@ -0,0 +1,240 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/dialog,da7219.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Dialog Semiconductor DA7219 Audio Codec + +maintainers: + - David Rau <David.Rau.opensource(a)dm.renesas.com> + +description: + The DA7219 is an ultra low-power audio codec with + in-built advanced accessory detection (AAD) for mobile + computing and accessory applications, which supports + sample rates up to 96 kHz at 24-bit resolution. + +properties: + compatible: + enum: + - dlg,da7219 + + reg: + description: + The I2C slave address of the DA7219. + maxItems: 1 + + interrupts: + description: + Interrupt for DA7219 IRQ line. + maxItems: 1 + + VDD-supply: + description: + VDD power supply for the device. + + VDDMIC-supply: + description: + VDDMIC power supply for the device. + + VDDIO-supply: + description: + VDDIO power supply for the device. + + interrupt-names: + description: + Name associated with interrupt line. + Should be "wakeup" if interrupt is to be used to wake system, + otherwise "irq" should be used. + + wakeup-source: + description: + Flag to indicate this device can wake system (suspend/resume). + + "#clock-cells": + description: + Two clock sources provided. + const: 1 + + clock-output-names: + description: + Names given for DAI clock outputs (WCLK & BCLK). + + clocks: + description: + phandle and clock specifier for codec MCLK. + + clock-names: + description: + Clock name string for "clocks" attribute. + const: mclk + + dlg,micbias-lvl: + enum: [1600, 1800, 2000, 2200, 2400, 2600] + description: + Voltage (mV) for Mic Bias. + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,mic-amp-in-sel: + enum: ["diff", "se_p", "se_n"] + description: + Mic input source type. + + diff - Differential. + + se_p - MIC_P. + Positive differential analog microphone input. + + se_n - MIC_N. + Negative differential analog microphone input. + $ref: /schemas/types.yaml#/definitions/string + + "da7219_aad": + type: object + description: + Configuration of advanced accessory detection. + properties: + dlg,micbias-pulse-lvl: + enum: [2800, 2900] + description: + Mic bias higher voltage pulse level (mV). + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,micbias-pulse-time: + description: + Mic bias higher voltage pulse duration (ms). + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + + dlg,btn-cfg: + enum: [2, 5, 10, 50, 100, 200, 500] + description: + Periodic button press measurements for 4-pole jack (ms). + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,mic-det-thr: + enum: [200, 500, 750, 1000] + description: + Impedance threshold for mic detection measurement (Ohms). + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,jack-ins-deb: + enum: [5, 10, 20, 50, 100, 200, 500, 1000] + description: + Debounce time for jack insertion (ms). + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,jack-ins-det-pty: + enum: ["low", "high"] + description: + Polarity for jack insertion detection. + $ref: /schemas/types.yaml#/definitions/string + + dlg,jack-det-rate: + enum: ["32ms_64ms", "64ms_128ms", "128ms_256ms", "256ms_512ms"] + description: + Jack type detection latency (3/4 pole). + $ref: /schemas/types.yaml#/definitions/string + + dlg,jack-rem-deb: + enum: [1, 5, 10, 20] + description: + Debounce time for jack removal (ms). + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,a-d-btn-thr: + description: + Impedance threshold between buttons A and D. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + + dlg,d-b-btn-thr: + description: + Impedance threshold between buttons D and B. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + + dlg,b-c-btn-thr: + description: + Impedance threshold between buttons B and C. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + + dlg,c-mic-btn-thr: + description: + Impedance threshold between button C and Mic. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + + dlg,btn-avg: + enum: [1, 2, 4, 8] + description: + Number of 8-bit readings for averaged button measurement. + $ref: /schemas/types.yaml#/definitions/uint32 + + dlg,adc-1bit-rpt: + enum: [1, 2, 4, 8] + description: + Repeat count for 1-bit button measurement. + $ref: /schemas/types.yaml#/definitions/uint32 + +required: + - compatible + - reg + - interrupts + - VDD-supply + - VDDMIC-supply + - VDDIO-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + codec: da7219@1a { + compatible = "dlg,da7219"; + reg = <0x1a>; + + interrupt-parent = <&gpio6>; + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; + + VDD-supply = <&vdd_reg>; + VDDMIC-supply = <&vddmic_reg>; + VDDIO-supply = <&vddio_reg>; + + #clock-cells = <1>; + clock-output-names = "dai-wclk", "dai-bclk"; + + clocks = <&clks 201>; + clock-names = "mclk"; + + dlg,micbias-lvl = <2600>; + dlg,mic-amp-in-sel = "diff"; + + da7219_aad { + dlg,btn-cfg = <50>; + dlg,mic-det-thr = <500>; + dlg,jack-ins-deb = <20>; + dlg,jack-ins-det-pty = "low"; + dlg,jack-det-rate = "32ms_64ms"; + dlg,jack-rem-deb = <1>; + + dlg,a-d-btn-thr = <0xa>; + dlg,d-b-btn-thr = <0x16>; + dlg,b-c-btn-thr = <0x21>; + dlg,c-mic-btn-thr = <0x3E>; + + dlg,btn-avg = <4>; + dlg,adc-1bit-rpt = <1>; + }; + }; + }; -- 2.17.1

3 4