diff options
| author | Mark Brown <broonie@kernel.org> | 2021-08-25 15:14:30 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-25 15:14:30 +0200 |
| commit | 2d02e7d7d04f54fa573685a92c4a34eb8a76c9de (patch) | |
| tree | ec7782d350908aafe00a6e7e282a163da65354e6 /sound | |
| parent | Merge series "ASoC: mediatek: Add support for MT8195 SoC" from Trevor Wu <tre... (diff) | |
| parent | ASoC: wm_adsp: Put debugfs_remove_recursive back in (diff) | |
| download | linux-2d02e7d7d04f54fa573685a92c4a34eb8a76c9de.tar.xz linux-2d02e7d7d04f54fa573685a92c4a34eb8a76c9de.zip | |
Merge branch 'for-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.15
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 7dc01ae6bb66..fcf442b8a732 100644 --- 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 index bbe27ab3b1fc..f7c800927cb2 100644 --- 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 index 42ef51c3fb4f..b591c6fd13fd 100644 --- 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 index ba5ff468c265..741bf2f9e081 100644 --- 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, |