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

broonie · broonie · commit a617f7d45c49 · 2021-08-30T12:30:31.000+01:00
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
@@ -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)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
@@ -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,
diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -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",
diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -747,6 +747,8 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp,`
`747`	`747`	`static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)`
`748`	`748`	`{`
`749`	`749`	`wm_adsp_debugfs_clear(dsp);`
	`750`	`+ debugfs_remove_recursive(dsp->debugfs_root);`
	`751`	`+ dsp->debugfs_root = NULL;`
`750`	`752`	`}`
`751`	`753`	`#else`
`752`	`754`	`static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`.id = "DLGS7219",`
`78`		`- .drv_name = "cml_da7219_max98357a",`
	`78`	`+ .drv_name = "cml_da7219_mx98357a",`
`79`	`79`	`.machine_quirk = snd_soc_acpi_codec_list,`
`80`	`80`	`.quirk_data = &max98390_spk_codecs,`
`81`	`81`	`.sof_fw_filename = "sof-cml.ri",`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {`
`87`	`87`	`},`
`88`	`88`	`{`
`89`	`89`	`.id = "DLGS7219",`
`90`		`- .drv_name = "kbl_da7219_max98357a",`
	`90`	`+ .drv_name = "kbl_da7219_mx98357a",`
`91`	`91`	`.fw_filename = "intel/dsp_fw_kbl.bin",`
`92`	`92`	`.machine_quirk = snd_soc_acpi_codec_list,`
`93`	`93`	`.quirk_data = &kbl_7219_98357_codecs,`