Unverified Commit a617f7d4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus

parents e22ce8eb e6d0b92a

sound/soc/codecs/rt5682.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static const struct reg_sequence patch_list[] = { 
	{RT5682_I2C_CTRL, 0x000f},

	{RT5682_PLL2_INTERNAL, 0x8266},

	{RT5682_SAR_IL_CMD_3, 0x8365},

	{RT5682_SAR_IL_CMD_6, 0x0180},

};



void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev)

sound/soc/codecs/wm_adsp.c

+2 −0
Original line number Diff line number Diff line
@@ -747,6 +747,8 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp, 
static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)

{

	wm_adsp_debugfs_clear(dsp);

	debugfs_remove_recursive(dsp->debugfs_root);

	dsp->debugfs_root = NULL;

}

#else

static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,

sound/soc/intel/common/soc-acpi-intel-cml-match.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { 
	},

	{

		.id = "DLGS7219",

		.drv_name = "cml_da7219_max98357a",

		.drv_name = "cml_da7219_mx98357a",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &max98390_spk_codecs,

		.sof_fw_filename = "sof-cml.ri",

sound/soc/intel/common/soc-acpi-intel-kbl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = { 
	},

	{

		.id = "DLGS7219",

		.drv_name = "kbl_da7219_max98357a",

		.drv_name = "kbl_da7219_mx98357a",

		.fw_filename = "intel/dsp_fw_kbl.bin",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &kbl_7219_98357_codecs,