Skip to content

Commit 65f0d24

Browse files
torvaldstorvalds
committed
Merge tag 'sound-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Here are some piled fixes, hopefully the last big one for 5.11. All changes are device-specific small fixes, and majority of commits are for ASoC while USB-audio got a bit large changes for addressing the regression for devices with quirks" * tag 'sound-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (31 commits) ALSA: hda/hdmi - enable runtime pm for CI AMD display audio ALSA: firewire-tascam: Fix integer overflow in midi_port_work() ALSA: fireface: Fix integer overflow in transmit_midi_msg() ALSA: hda/tegra: fix tegra-hda on tegra30 soc clk: tegra30: Add hda clock default rates to clock driver ALSA: doc: Fix reference to mixart.rst ALSA: usb-audio: Fix implicit feedback sync setup for Pioneer devices ALSA: usb-audio: Annotate the endpoint index in audioformat ALSA: usb-audio: Avoid unnecessary interface re-setup ALSA: usb-audio: Choose audioformat of a counter-part substream ALSA: usb-audio: Fix the missing endpoints creations for quirks ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machines ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad X395 ASoC: amd: Replacing MSI with Legacy IRQ model ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad E14 Gen 2 ASoC: meson: axg-tdm-interface: fix loopback ASoC: meson: axg-tdmin: fix axg skew offset ASoC: max98373: don't access volatile registers in bias level off ASoC: rt711: mutex between calibration and power state changes ASoC: Intel: haswell: Add missing pm_ops ...
2 parents e609571 + 20c7842 commit 65f0d24

37 files changed

+370
-128
lines changed

‎Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2020 Texas Instruments Incorporated
3+
# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
24
%YAML 1.2
35
---
46
$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
79
title: Texas Instruments J721e Common Processor Board Audio Support
810

911
maintainers:
10-
- Peter Ujfalusi <peter.ujfalusi@ti.com>
12+
- Peter Ujfalusi <peter.ujfalusi@gmail.com>
1113

1214
description: |
1315
The audio support on the board is using pcm3168a codec connected to McASP10

‎Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2020 Texas Instruments Incorporated
3+
# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
24
%YAML 1.2
35
---
46
$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-ivi-audio.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
79
title: Texas Instruments J721e Common Processor Board Audio Support
810

911
maintainers:
10-
- Peter Ujfalusi <peter.ujfalusi@ti.com>
12+
- Peter Ujfalusi <peter.ujfalusi@gmail.com>
1113

1214
description: |
1315
The Infotainment board plugs into the Common Processor Board, the support of the

‎Documentation/sound/alsa-configuration.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ Module for Digigram miXart8 sound cards.
15011501

15021502
This module supports multiple cards.
15031503
Note: One miXart8 board will be represented as 4 alsa cards.
1504-
See MIXART.txt for details.
1504+
See Documentation/sound/cards/mixart.rst for details.
15051505

15061506
When the driver is compiled as a module and the hotplug firmware
15071507
is supported, the firmware data is loaded via hotplug automatically.

‎MAINTAINERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12848,7 +12848,7 @@ F: include/misc/ocxl*
1284812848
F: include/uapi/misc/ocxl.h
1284912849

1285012850
OMAP AUDIO SUPPORT
12851-
M: Peter Ujfalusi <peter.ujfalusi@ti.com>
12851+
M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
1285212852
M: Jarkko Nikula <jarkko.nikula@bitmer.com>
1285312853
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1285412854
L: linux-omap@vger.kernel.org
@@ -17541,7 +17541,7 @@ F: arch/xtensa/
1754117541
F: drivers/irqchip/irq-xtensa-*
1754217542

1754317543
TEXAS INSTRUMENTS ASoC DRIVERS
17544-
M: Peter Ujfalusi <peter.ujfalusi@ti.com>
17544+
M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
1754517545
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1754617546
S: Maintained
1754717547
F: sound/soc/ti/
@@ -17851,7 +17851,7 @@ F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt
1785117851
F: drivers/nfc/trf7970a.c
1785217852

1785317853
TI TWL4030 SERIES SOC CODEC DRIVER
17854-
M: Peter Ujfalusi <peter.ujfalusi@ti.com>
17854+
M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
1785517855
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1785617856
S: Maintained
1785717857
F: sound/soc/codecs/twl4030*

‎drivers/clk/tegra/clk-tegra30.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,8 @@ static struct tegra_clk_init_table init_table[] __initdata = {
12561256
{ TEGRA30_CLK_I2S3_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },
12571257
{ TEGRA30_CLK_I2S4_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },
12581258
{ TEGRA30_CLK_VIMCLK_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },
1259+
{ TEGRA30_CLK_HDA, TEGRA30_CLK_PLL_P, 102000000, 0 },
1260+
{ TEGRA30_CLK_HDA2CODEC_2X, TEGRA30_CLK_PLL_P, 48000000, 0 },
12591261
/* must be the last entry */
12601262
{ TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0 },
12611263
};

‎sound/firewire/fireface/ff-transaction.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static void transmit_midi_msg(struct snd_ff *ff, unsigned int port)
8888

8989
/* Set interval to next transaction. */
9090
ff->next_ktime[port] = ktime_add_ns(ktime_get(),
91-
ff->rx_bytes[port] * 8 * NSEC_PER_SEC / 31250);
91+
ff->rx_bytes[port] * 8 * (NSEC_PER_SEC / 31250));
9292

9393
if (quad_count == 1)
9494
tcode = TCODE_WRITE_QUADLET_REQUEST;

‎sound/firewire/tascam/tascam-transaction.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ static void midi_port_work(struct work_struct *work)
209209

210210
/* Set interval to next transaction. */
211211
port->next_ktime = ktime_add_ns(ktime_get(),
212-
port->consume_bytes * 8 * NSEC_PER_SEC / 31250);
212+
port->consume_bytes * 8 * (NSEC_PER_SEC / 31250));
213213

214214
/* Start this transaction. */
215215
port->idling = false;

‎sound/pci/hda/hda_intel.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,8 @@ static const struct pci_device_id azx_ids[] = {
25982598
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
25992599
/* ATI HDMI */
26002600
{ PCI_DEVICE(0x1002, 0x0002),
2601-
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
2601+
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
2602+
AZX_DCAPS_PM_RUNTIME },
26022603
{ PCI_DEVICE(0x1002, 0x1308),
26032604
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
26042605
{ PCI_DEVICE(0x1002, 0x157a),
@@ -2660,9 +2661,11 @@ static const struct pci_device_id azx_ids[] = {
26602661
{ PCI_DEVICE(0x1002, 0xaab0),
26612662
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
26622663
{ PCI_DEVICE(0x1002, 0xaac0),
2663-
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
2664+
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
2665+
AZX_DCAPS_PM_RUNTIME },
26642666
{ PCI_DEVICE(0x1002, 0xaac8),
2665-
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
2667+
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
2668+
AZX_DCAPS_PM_RUNTIME },
26662669
{ PCI_DEVICE(0x1002, 0xaad8),
26672670
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
26682671
AZX_DCAPS_PM_RUNTIME },

‎sound/pci/hda/hda_tegra.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
388388
* in powers of 2, next available ratio is 16 which can be
389389
* used as a limiting factor here.
390390
*/
391-
if (of_device_is_compatible(np, "nvidia,tegra194-hda"))
391+
if (of_device_is_compatible(np, "nvidia,tegra30-hda"))
392392
chip->bus.core.sdo_limit = 16;
393393

394394
/* codec detection */

‎sound/pci/hda/patch_realtek.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7970,6 +7970,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
79707970
SND_PCI_QUIRK(0x103c, 0x8760, "HP", ALC285_FIXUP_HP_MUTE_LED),
79717971
SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
79727972
SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
7973+
SND_PCI_QUIRK(0x103c, 0x8780, "HP ZBook Fury 17 G7 Mobile Workstation",
7974+
ALC285_FIXUP_HP_GPIO_AMP_INIT),
7975+
SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation",
7976+
ALC285_FIXUP_HP_GPIO_AMP_INIT),
79737977
SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
79747978
SND_PCI_QUIRK(0x103c, 0x87f4, "HP", ALC287_FIXUP_HP_GPIO_LED),
79757979
SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),

0 commit comments

Comments
 (0)