Skip to content

Commit ae55826

Browse files
torvaldstorvalds
committed
Merge tag 'sound-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A fair amount of commits at this time due to ASoC PR merge, but all look small and easy, mostly device-specific fixes spanned in various drivers. Hopefully this should be the last big chunk for 6.1" * tag 'sound-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits) ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360 ALSA: hda/realtek: fix speakers for Samsung Galaxy Book Pro ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open() ASoC: stm32: dfsdm: manage cb buffers cleanup ASoC: sof_es8336: reduce pop noise on speaker ASoC: SOF: topology: No need to assign core ID if token parsing failed ASoC: soc-utils: Remove __exit for snd_soc_util_exit() ASoC: rt5677: fix legacy dai naming ASoC: rt5514: fix legacy dai naming ASoC: SOF: ipc3-topology: use old pipeline teardown flow with SOF2.1 and older ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake ASoC: Intel: soc-acpi: add ES83x6 support to IceLake ASoC: tas2780: Fix set_tdm_slot in case of single slot ASoC: tas2764: Fix set_tdm_slot in case of single slot ASoC: tas2770: Fix set_tdm_slot in case of single slot ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N ASoC: core: Fix use-after-free in snd_soc_exit() MAINTAINERS: update Tzung-Bi's email address ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01 ASoC: amd: yc: Add Alienware m17 R5 AMD into DMI table ...
2 parents 4ab9ffd + 1abfd71 commit ae55826

File tree

26 files changed

+176
-98
lines changed

26 files changed

+176
-98
lines changed

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ TripleX Chung <[email protected]> <[email protected]>
416416
TripleX Chung <[email protected]> <[email protected]>
417417
Tsuneo Yoshioka <[email protected]>
418418
Tycho Andersen <[email protected]> <[email protected]>
419+
Tzung-Bi Shih <[email protected]> <[email protected]>
419420
Uwe Kleine-König <[email protected]>
420421
Uwe Kleine-König <[email protected]>
421422
Uwe Kleine-König <[email protected]>

‎Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Audio codec controlled by ChromeOS EC
88

99
maintainers:
1010
- Cheng-Yi Chiang <[email protected]>
11-
- Tzung-Bi Shih <tzungbi@google.com>
11+
- Tzung-Bi Shih <tzungbi@kernel.org>
1212

1313
description: |
1414
Google's ChromeOS EC codec is a digital mic codec provided by the

‎Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Realtek rt1015p codec devicetree bindings
88

99
maintainers:
10-
- Tzung-Bi Shih <tzungbi@google.com>
10+
- Tzung-Bi Shih <tzungbi@kernel.org>
1111

1212
description: |
1313
Rt1015p is a rt1015 variant which does not support I2C and

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4911,7 +4911,7 @@ F: drivers/platform/chrome/
49114911

49124912
CHROMEOS EC CODEC DRIVER
49134913
M: Cheng-Yi Chiang <[email protected]>
4914-
M: Tzung-Bi Shih <tzungbi@google.com>
4914+
M: Tzung-Bi Shih <tzungbi@kernel.org>
49154915
R: Guenter Roeck <[email protected]>
49164916
L: [email protected]
49174917
S: Maintained

‎include/sound/sof/info.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ enum sof_ipc_ext_data {
3636
SOF_IPC_EXT_USER_ABI_INFO = 4,
3737
};
3838

39+
/* Build u32 number in format MMmmmppp */
40+
#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \
41+
((MAJOR) << 24) | ((MINOR) << 12) | (PATCH)))
42+
3943
/* FW version - SOF_IPC_GLB_VERSION */
4044
struct sof_ipc_fw_version {
4145
struct sof_ipc_hdr hdr;

‎sound/hda/intel-dsp-config.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@ static const struct config_entry config_table[] = {
320320
{}
321321
}
322322
},
323+
{
324+
.flags = FLAG_SOF,
325+
.device = 0x34c8,
326+
.codec_hid = &essx_83x6,
327+
},
323328
{
324329
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
325330
.device = 0x34c8,

‎sound/pci/hda/patch_realtek.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9436,6 +9436,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
94369436
SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),
94379437
SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),
94389438
SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
9439+
SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP),
9440+
SND_PCI_QUIRK(0x144d, 0xc1a6, "Samsung Galaxy Book Pro 360 (NP930QBD)", ALC298_FIXUP_SAMSUNG_AMP),
94399441
SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
94409442
SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP),
94419443
SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP),

‎sound/soc/amd/yc/acp6x-mach.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
206206
DMI_MATCH(DMI_PRODUCT_NAME, "UM5302TA"),
207207
}
208208
},
209+
{
210+
.driver_data = &acp6x_card,
211+
.matches = {
212+
DMI_MATCH(DMI_BOARD_VENDOR, "Alienware"),
213+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"),
214+
}
215+
},
209216
{}
210217
};
211218

‎sound/soc/codecs/rt5514-spi.c‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,14 @@ static int rt5514_spi_pcm_new(struct snd_soc_component *component,
298298
}
299299

300300
static const struct snd_soc_component_driver rt5514_spi_component = {
301-
.name = DRV_NAME,
302-
.probe = rt5514_spi_pcm_probe,
303-
.open = rt5514_spi_pcm_open,
304-
.hw_params = rt5514_spi_hw_params,
305-
.hw_free = rt5514_spi_hw_free,
306-
.pointer = rt5514_spi_pcm_pointer,
307-
.pcm_construct = rt5514_spi_pcm_new,
301+
.name = DRV_NAME,
302+
.probe = rt5514_spi_pcm_probe,
303+
.open = rt5514_spi_pcm_open,
304+
.hw_params = rt5514_spi_hw_params,
305+
.hw_free = rt5514_spi_hw_free,
306+
.pointer = rt5514_spi_pcm_pointer,
307+
.pcm_construct = rt5514_spi_pcm_new,
308+
.legacy_dai_naming = 1,
308309
};
309310

310311
/**

‎sound/soc/codecs/rt5677-spi.c‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,16 @@ static int rt5677_spi_pcm_probe(struct snd_soc_component *component)
396396
}
397397

398398
static const struct snd_soc_component_driver rt5677_spi_dai_component = {
399-
.name = DRV_NAME,
400-
.probe = rt5677_spi_pcm_probe,
401-
.open = rt5677_spi_pcm_open,
402-
.close = rt5677_spi_pcm_close,
403-
.hw_params = rt5677_spi_hw_params,
404-
.hw_free = rt5677_spi_hw_free,
405-
.prepare = rt5677_spi_prepare,
406-
.pointer = rt5677_spi_pcm_pointer,
407-
.pcm_construct = rt5677_spi_pcm_new,
399+
.name = DRV_NAME,
400+
.probe = rt5677_spi_pcm_probe,
401+
.open = rt5677_spi_pcm_open,
402+
.close = rt5677_spi_pcm_close,
403+
.hw_params = rt5677_spi_hw_params,
404+
.hw_free = rt5677_spi_hw_free,
405+
.prepare = rt5677_spi_prepare,
406+
.pointer = rt5677_spi_pcm_pointer,
407+
.pcm_construct = rt5677_spi_pcm_new,
408+
.legacy_dai_naming = 1,
408409
};
409410

410411
/* Select a suitable transfer command for the next transfer to ensure

0 commit comments

Comments
 (0)