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

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

Pull sound fixes from Takashi Iwai:
 "This is a usual small bump in the middle, we've got a set of ASoC
  fixes in this week as shown in diffstat.

  The only change in the core stuff is about (somewhat minor) PCM
  debugfs error handling. The major changes are rather for Intel SOF and
  topology coverage, as well as other platform (rockchip, samsung, stm)
  and codec fixes.

  As non-ASoC changes, a couple of new HD-audio chip fixes and a typo
  correction of USB-audio driver validation code are found"

* tag 'sound-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
  ALSA: hda: Add Tigerlake/Jasperlake PCI ID
  ALSA: usb-audio: Fix copy&paste error in the validator
  ALSA: hda/realtek - Add support for ALC711
  ASoC: SOF: control: return true when kcontrol values change
  ASoC: stm32: sai: fix sysclk management on shutdown
  ASoC: Intel: sof-rt5682: add a check for devm_clk_get
  ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting
  ASoC: simple_card_utils.h: Fix potential multiple redefinition error
  ASoC: msm8916-wcd-digital: add missing MIX2 path for RX1/2
  ASoC: core: Fix pcm code debugfs error
  ASoc: rockchip: i2s: Fix RPM imbalance
  ASoC: wm_adsp: Don't generate kcontrols without READ flags
  ASoC: intel: bytcr_rt5651: add null check to support_button_press
  ASoC: intel: sof_rt5682: add remove function to disable jack
  ASoC: rt5682: add NULL handler to set_jack function
  ASoC: intel: sof_rt5682: use separate route map for dmic
  ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture
  ASoC: SOF: Intel: initialise and verify FW crash dump data.
  ASoC: SOF: Intel: hda: fix warnings during FW load
  ASoC: SOF: pcm: harden PCM STOP sequence
  ...
parents fa8a74de 4750c212

include/sound/simple_card_utils.h

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			       struct link_info *li);



#ifdef DEBUG

inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

					 char *name,

					 struct asoc_simple_dai *dai)

{
@@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, 
		dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));

}



inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

{

	struct snd_soc_card *card = simple_priv_to_card(priv);

	struct device *dev = simple_priv_to_dev(priv);

sound/pci/hda/hda_intel.c

+6 −0
Original line number Diff line number Diff line
@@ -2399,6 +2399,12 @@ static const struct pci_device_id azx_ids[] = { 
	/* Icelake */

	{ PCI_DEVICE(0x8086, 0x34c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Jasperlake */

	{ PCI_DEVICE(0x8086, 0x38c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Tigerlake */

	{ PCI_DEVICE(0x8086, 0xa0c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Elkhart Lake */

	{ PCI_DEVICE(0x8086, 0x4b55),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

sound/pci/hda/patch_realtek.c

+3 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0700:

	case 0x10ec0701:

	case 0x10ec0703:

	case 0x10ec0711:

		alc_update_coef_idx(codec, 0x10, 1<<15, 0);

		break;

	case 0x10ec0662:
@@ -8019,6 +8020,7 @@ static int patch_alc269(struct hda_codec *codec) 
	case 0x10ec0700:

	case 0x10ec0701:

	case 0x10ec0703:

	case 0x10ec0711:

		spec->codec_variant = ALC269_TYPE_ALC700;

		spec->gen.mixer_nid = 0; /* ALC700 does not have any loopback mixer path */

		alc_update_coef_idx(codec, 0x4a, 1 << 15, 0); /* Combo jack auto trigger control */
@@ -9233,6 +9235,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { 
	HDA_CODEC_ENTRY(0x10ec0700, "ALC700", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0701, "ALC701", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0703, "ALC703", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0711, "ALC711", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0867, "ALC891", patch_alc662),

	HDA_CODEC_ENTRY(0x10ec0880, "ALC880", patch_alc880),

	HDA_CODEC_ENTRY(0x10ec0882, "ALC882", patch_alc882),

sound/soc/codecs/max98373.c

+12 −8
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static void max98373_slot_config(struct i2c_client *i2c, 
		max98373->i_slot = value & 0xF;

	else

		max98373->i_slot = 1;



	if (dev->of_node) {

		max98373->reset_gpio = of_get_named_gpio(dev->of_node,

						"maxim,reset-gpio", 0);

		if (!gpio_is_valid(max98373->reset_gpio)) {
@@ -912,6 +912,10 @@ static void max98373_slot_config(struct i2c_client *i2c, 
			dev_dbg(dev, "maxim,reset-gpio=%d",

				max98373->reset_gpio);

		}

	} else {

		/* this makes reset_gpio as invalid */

		max98373->reset_gpio = -1;

	}



	if (!device_property_read_u32(dev, "maxim,spkfb-slot-no", &value))

		max98373->spkfb_slot = value & 0xF;

sound/soc/codecs/msm8916-wcd-digital.c

+22 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ static const char *const rx_mix1_text[] = { 
	"ZERO", "IIR1", "IIR2", "RX1", "RX2", "RX3"

};



static const char * const rx_mix2_text[] = {

	"ZERO", "IIR1", "IIR2"

};



static const char *const dec_mux_text[] = {

	"ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2"

};
@@ -270,6 +274,16 @@ static const struct soc_enum rx3_mix1_inp_enum[] = { 
	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),

};



/* RX1 MIX2 */

static const struct soc_enum rx_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B3_CTL,

		0, 3, rx_mix2_text);



/* RX2 MIX2 */

static const struct soc_enum rx2_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B3_CTL,

		0, 3, rx_mix2_text);



/* DEC */

static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE(

				LPASS_CDC_CONN_TX_B1_CTL, 0, 6, dec_mux_text);
@@ -309,6 +323,10 @@ static const struct snd_kcontrol_new rx3_mix1_inp2_mux = SOC_DAPM_ENUM( 
				"RX3 MIX1 INP2 Mux", rx3_mix1_inp_enum[1]);

static const struct snd_kcontrol_new rx3_mix1_inp3_mux = SOC_DAPM_ENUM(

				"RX3 MIX1 INP3 Mux", rx3_mix1_inp_enum[2]);

static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX1 MIX2 INP1 Mux", rx_mix2_inp1_chain_enum);

static const struct snd_kcontrol_new rx2_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum);



/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */

static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0);
@@ -740,6 +758,10 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { 
			 &rx3_mix1_inp2_mux),

	SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,

			 &rx3_mix1_inp3_mux),

	SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx1_mix2_inp1_mux),

	SND_SOC_DAPM_MUX("RX2 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx2_mix2_inp1_mux),



	SND_SOC_DAPM_MUX("CIC1 MUX", SND_SOC_NOPM, 0, 0, &cic1_mux),

	SND_SOC_DAPM_MUX("CIC2 MUX", SND_SOC_NOPM, 0, 0, &cic2_mux),

CRA Git | Maintained and supported by SUSTech CRA and CCSE