Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.15

Browse Source
This commit is contained in:
Mark Brown 2021-08-25 14:14:30 +01:00
commit 2d02e7d7d0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/codecs/rt5682.c
View File

@ -44,7 +44,6 @@ static const struct reg_sequence patch_list[] = {
{RT5682_I2C_CTRL, 0x000f}, {RT5682_I2C_CTRL, 0x000f},
{RT5682_PLL2_INTERNAL, 0x8266}, {RT5682_PLL2_INTERNAL, 0x8266},
{RT5682_SAR_IL_CMD_3, 0x8365}, {RT5682_SAR_IL_CMD_3, 0x8365},
{RT5682_SAR_IL_CMD_6, 0x0180},
}; };
void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev) void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev)

2
sound/soc/codecs/wm_adsp.c
View File

@ -747,6 +747,8 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp) static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)
{ {
wm_adsp_debugfs_clear(dsp); wm_adsp_debugfs_clear(dsp);
debugfs_remove_recursive(dsp->debugfs_root);
dsp->debugfs_root = NULL;
} }
#else #else
static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp, static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,

2
sound/soc/intel/common/soc-acpi-intel-cml-match.c
View File

@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
}, },
{ {
.id = "DLGS7219", .id = "DLGS7219",
.drv_name = "cml_da7219_max98357a", .drv_name = "cml_da7219_mx98357a",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &max98390_spk_codecs, .quirk_data = &max98390_spk_codecs,
.sof_fw_filename = "sof-cml.ri", .sof_fw_filename = "sof-cml.ri",

2
sound/soc/intel/common/soc-acpi-intel-kbl-match.c
View File

@ -87,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
}, },
{ {
.id = "DLGS7219", .id = "DLGS7219",
.drv_name = "kbl_da7219_max98357a", .drv_name = "kbl_da7219_mx98357a",
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_7219_98357_codecs, .quirk_data = &kbl_7219_98357_codecs,