Commit be4a3385 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Although the incoming fixes haven't settled down yet, all changes here
  are small and mostly device-specific fixes, so nothing look worrisome.

   - Yet another USB-audio regression fixes

   - HD-audio ID fix and device-specific quirks

   - SOF Intel / SoundWire fixes including topology

   - ASoC Qualcomm and Mediatek fixes"

* tag 'sound-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: hda/via: Apply the workaround generically for Clevo machines
  ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
  ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup
  ASoC: mediatek: mt8192-mt6359: add format constraints for RT5682
  ASoC: ak4458: correct reset polarity
  ASoC: SOF: SND_INTEL_DSP_CONFIG dependency
  ASoC: SOF: Intel: soundwire: fix select/depend unmet dependencies
  ALSA: hda: intel-dsp-config: add PCI id for TGL-H
  ALSA: usb-audio: workaround for iface reset issue
  ALSA: pcm: One more dependency for hw constraints
  ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256
  ASoC: Intel: Skylake: Zero snd_ctl_elem_value
  ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
  ASoC: qcom: Fix number of HDMI RDMA channels on sc7180
  ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
  ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
  ASoC: topology: Properly unregister DAI on removal
  ASoC: topology: Fix memory corruption in soc_tplg_denum_create_values()
  ASoC: qcom: lpass-ipq806x: fix bitwidth regmap field
  ASoC: AMD Renoir - refine DMI entries for some Lenovo products
  ...
parents 757fed1d 4961167b

include/dt-bindings/sound/apq8016-lpass.h

+3 −4
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
#ifndef __DT_APQ8016_LPASS_H

#define __DT_APQ8016_LPASS_H



#define MI2S_PRIMARY	0

#define MI2S_SECONDARY	1

#define MI2S_TERTIARY	2

#define MI2S_QUATERNARY	3

#include <dt-bindings/sound/qcom,lpass.h>



/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */



#endif /* __DT_APQ8016_LPASS_H */

include/dt-bindings/sound/qcom,lpass.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __DT_QCOM_LPASS_H

#define __DT_QCOM_LPASS_H



#define MI2S_PRIMARY	0

#define MI2S_SECONDARY	1

#define MI2S_TERTIARY	2

#define MI2S_QUATERNARY	3

#define MI2S_QUINARY	4



#define LPASS_DP_RX	5



#define LPASS_MCLK0	0



#endif /* __DT_QCOM_LPASS_H */

include/dt-bindings/sound/sc7180-lpass.h

+2 −4
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 
#ifndef __DT_SC7180_LPASS_H

#define __DT_SC7180_LPASS_H



#define MI2S_PRIMARY	0

#define MI2S_SECONDARY	1

#define LPASS_DP_RX	2

#include <dt-bindings/sound/qcom,lpass.h>



#define LPASS_MCLK0	0

/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */



#endif /* __DT_APQ8016_LPASS_H */

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params, 
struct snd_pcm_hw_rule {

	unsigned int cond;

	int var;

	int deps[4];

	int deps[5];



	snd_pcm_hw_rule_func_t func;

	void *private;

sound/core/pcm_native.c

+2 −2
Original line number Diff line number Diff line
@@ -382,8 +382,8 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, 
			continue;



		/*

		 * The 'deps' array includes maximum three dependencies

		 * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fourth

		 * The 'deps' array includes maximum four dependencies

		 * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fifth

		 * member of this array is a sentinel and should be

		 * negative value.

		 *