Commit 65f0d241 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents e609571b 20c7842e

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

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2020 Texas Instruments Incorporated

# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Texas Instruments J721e Common Processor Board Audio Support



maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>

  - Peter Ujfalusi <peter.ujfalusi@gmail.com>



description: |

  The audio support on the board is using pcm3168a codec connected to McASP10

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

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2020 Texas Instruments Incorporated

# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-ivi-audio.yaml#
@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Texas Instruments J721e Common Processor Board Audio Support



maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>

  - Peter Ujfalusi <peter.ujfalusi@gmail.com>



description: |

  The Infotainment board plugs into the Common Processor Board, the support of the

Documentation/sound/alsa-configuration.rst

+1 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ Module for Digigram miXart8 sound cards. 


This module supports multiple cards.

Note: One miXart8 board will be represented as 4 alsa cards.

See MIXART.txt for details.

See Documentation/sound/cards/mixart.rst for details.



When the driver is compiled as a module and the hotplug firmware

is supported, the firmware data is loaded via hotplug automatically.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -12848,7 +12848,7 @@ F: include/misc/ocxl* 
F:	include/uapi/misc/ocxl.h









OMAP AUDIO SUPPORT









M:	Peter Ujfalusi <peter.ujfalusi@ti.com>









M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>









M:	Jarkko Nikula <jarkko.nikula@bitmer.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









L:	linux-omap@vger.kernel.org








@@ -17541,7 +17541,7 @@ F:	arch/xtensa/







F:	drivers/irqchip/irq-xtensa-*

















TEXAS INSTRUMENTS ASoC DRIVERS









M:	Peter Ujfalusi <peter.ujfalusi@ti.com>









M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	sound/soc/ti/








@@ -17851,7 +17851,7 @@ F:	Documentation/devicetree/bindings/net/nfc/trf7970a.txt







F:	drivers/nfc/trf7970a.c

















TI TWL4030 SERIES SOC CODEC DRIVER









M:	Peter Ujfalusi <peter.ujfalusi@ti.com>









M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	sound/soc/codecs/twl4030*

























drivers/clk/tegra/clk-tegra30.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -1256,6 +1256,8 @@ static struct tegra_clk_init_table init_table[] __initdata = {







	{ TEGRA30_CLK_I2S3_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },









	{ TEGRA30_CLK_I2S4_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },









	{ TEGRA30_CLK_VIMCLK_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },









	{ TEGRA30_CLK_HDA, TEGRA30_CLK_PLL_P, 102000000, 0 },









	{ TEGRA30_CLK_HDA2CODEC_2X, TEGRA30_CLK_PLL_P, 48000000, 0 },









	/* must be the last entry */









	{ TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0 },









};