Skip to content

Commit eb966e0

Browse files
torvaldstorvalds
committed
Merge tag 'sound-fix-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A collection of fixes gathered since the previous pull. We see a bit large LOCs at a HD-audio quirk, but that's only bulk COEF data, hence it's safe to take. In addition to that, there were two minor fixes for MIDI 2.0 handling for ALSA core, and the rest are all rather random small and device-specific fixes" * tag 'sound-fix-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: fsl-asoc-card: Dynamically allocate memory for snd_soc_dai_link_components ASoC: amd: yc: Support mic on Lenovo Thinkpad E16 Gen 2 ALSA: hda/realtek: Implement sound init sequence for Samsung Galaxy Book3 Pro 360 ALSA: hda/realtek: cs35l41: Fixup remaining asus strix models ASoC: SOF: ipc4-topology: Preserve the DMA Link ID for ChainDMA on unprepare ASoC: SOF: ipc4-topology: Only handle dai_config with HW_PARAMS for ChainDMA ALSA: ump: Force 1 Group for MIDI1 FBs ALSA: ump: Don't update FB name for static blocks ALSA: usb-audio: Add a quirk for Sonix HD USB Camera ASoC: TAS2781: Fix tasdev_load_calibrated_data() ASoC: tegra: select CONFIG_SND_SIMPLE_CARD_UTILS ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable ALSA: usb-audio: Move HD Webcam quirk to the right place ALSA: hda: tas2781: mark const variables as __maybe_unused ALSA: usb-audio: Fix microphone sound on HD webcam. ASoC: sof: amd: fix for firmware reload failure in Vangogh platform ASoC: Intel: Fix RT5650 SSP lookup ASOC: SOF: Intel: hda-loader: only wait for HDaudio IOC for IPC4 devices ASoC: SOF: imx8m: Fix DSP control regmap retrieval
2 parents 0ba9b15 + e8b96a6 commit eb966e0

File tree

17 files changed

+434
-46
lines changed

17 files changed

+434
-46
lines changed

‎include/sound/tas2781-tlv.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#define __TAS2781_TLV_H__
1717

1818
static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);
19-
static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);
20-
static const DECLARE_TLV_DB_SCALE(tas2563_dvc_tlv, -12150, 50, 1);
19+
static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);
20+
static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2563_dvc_tlv, -12150, 50, 1);
2121

2222
/* pow(10, db/20) * pow(2,30) */
23-
static const unsigned char tas2563_dvc_table[][4] = {
23+
static const __maybe_unused unsigned char tas2563_dvc_table[][4] = {
2424
{ 0X00, 0X00, 0X00, 0X00 }, /* -121.5db */
2525
{ 0X00, 0X00, 0X03, 0XBC }, /* -121.0db */
2626
{ 0X00, 0X00, 0X03, 0XF5 }, /* -120.5db */

‎sound/core/ump.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,12 @@ static void fill_fb_info(struct snd_ump_endpoint *ump,
733733
info->block_id, info->direction, info->active,
734734
info->first_group, info->num_groups, info->midi_ci_version,
735735
info->sysex8_streams, info->flags);
736+
737+
if ((info->flags & SNDRV_UMP_BLOCK_IS_MIDI1) && info->num_groups != 1) {
738+
info->num_groups = 1;
739+
ump_dbg(ump, "FB %d: corrected groups to 1 for MIDI1\n",
740+
info->block_id);
741+
}
736742
}
737743

738744
/* check whether the FB info gets updated by the current message */
@@ -806,6 +812,13 @@ static int ump_handle_fb_name_msg(struct snd_ump_endpoint *ump,
806812
if (!fb)
807813
return -ENODEV;
808814

815+
if (ump->parsed &&
816+
(ump->info.flags & SNDRV_UMP_EP_INFO_STATIC_BLOCKS)) {
817+
ump_dbg(ump, "Skipping static FB name update (blk#%d)\n",
818+
fb->info.block_id);
819+
return 0;
820+
}
821+
809822
ret = ump_append_string(ump, fb->info.name, sizeof(fb->info.name),
810823
buf->raw, 3);
811824
/* notify the FB name update to sequencer, too */

‎sound/pci/hda/patch_realtek.c‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4800,6 +4800,8 @@ static void alc298_fixup_samsung_amp(struct hda_codec *codec,
48004800
}
48014801
}
48024802

4803+
#include "samsung_helper.c"
4804+
48034805
#if IS_REACHABLE(CONFIG_INPUT)
48044806
static void gpio2_mic_hotkey_event(struct hda_codec *codec,
48054807
struct hda_jack_callback *event)
@@ -7429,6 +7431,7 @@ enum {
74297431
ALC236_FIXUP_HP_MUTE_LED,
74307432
ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
74317433
ALC298_FIXUP_SAMSUNG_AMP,
7434+
ALC298_FIXUP_SAMSUNG_AMP2,
74327435
ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
74337436
ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
74347437
ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
@@ -9055,6 +9058,10 @@ static const struct hda_fixup alc269_fixups[] = {
90559058
.chained = true,
90569059
.chain_id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET
90579060
},
9061+
[ALC298_FIXUP_SAMSUNG_AMP2] = {
9062+
.type = HDA_FIXUP_FUNC,
9063+
.v.func = alc298_fixup_samsung_amp2
9064+
},
90589065
[ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
90599066
.type = HDA_FIXUP_VERBS,
90609067
.v.verbs = (const struct hda_verb[]) {
@@ -10359,10 +10366,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1035910366
SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),
1036010367
SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),
1036110368
SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
10362-
SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC245_FIXUP_CS35L41_SPI_2),
10363-
SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),
10369+
SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
10370+
SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
1036410371
SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
10365-
SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2),
10372+
SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
1036610373
SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
1036710374
SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
1036810375
SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
@@ -10406,6 +10413,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1040610413
SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
1040710414
SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),
1040810415
SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),
10416+
SND_PCI_QUIRK(0x144d, 0xc1ca, "Samsung Galaxy Book3 Pro 360 (NP960QFG-KB1US)", ALC298_FIXUP_SAMSUNG_AMP2),
1040910417
SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
1041010418
SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
1041110419
SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
@@ -10843,6 +10851,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
1084310851
{.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"},
1084410852
{.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"},
1084510853
{.id = ALC298_FIXUP_SAMSUNG_AMP, .name = "alc298-samsung-amp"},
10854+
{.id = ALC298_FIXUP_SAMSUNG_AMP2, .name = "alc298-samsung-amp2"},
1084610855
{.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"},
1084710856
{.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},
1084810857
{.id = ALC274_FIXUP_HP_MIC, .name = "alc274-hp-mic-detect"},

0 commit comments

Comments
 (0)