From f93eb561a03c58d5055e58b8cd51bec983085a3e Mon Sep 17 00:00:00 2001 From: Brent Lu Date: Wed, 10 Apr 2024 17:26:00 +0800 Subject: [PATCH 1/4] kmod: sof_remove: add snd_soc_sof_da7219 Machine driver sof_da7219_max98373 has been renamed as snd_soc_sof_da7219. Add the new module to the script and keep the old one for backward compatibility. Signed-off-by: Brent Lu --- tools/kmod/sof_remove.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/kmod/sof_remove.sh b/tools/kmod/sof_remove.sh index 49071013..b0f4fb6f 100755 --- a/tools/kmod/sof_remove.sh +++ b/tools/kmod/sof_remove.sh @@ -152,6 +152,7 @@ remove_module imx_common #------------------------------------------- remove_module snd_soc_sof_rt5682 remove_module snd_soc_sof_da7219_max98373 +remove_module snd_soc_sof_da7219 remove_module snd_soc_sst_bdw_rt5677_mach remove_module snd_soc_bdw_rt286 remove_module snd_soc_sst_broadwell From 2ab6bd801c3fa0fb7b16d77d180ec0e8779118c0 Mon Sep 17 00:00:00 2001 From: Brent Lu Date: Wed, 10 Apr 2024 17:30:42 +0800 Subject: [PATCH 2/4] kmod: sof_remove: add snd_soc_intel_sof_nuvoton_common An new helper module has been created for nuvoton speaker amplifier. Add the new module to the script. Signed-off-by: Brent Lu --- tools/kmod/sof_remove.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/kmod/sof_remove.sh b/tools/kmod/sof_remove.sh index b0f4fb6f..f3ad3d94 100755 --- a/tools/kmod/sof_remove.sh +++ b/tools/kmod/sof_remove.sh @@ -179,6 +179,7 @@ remove_module snd_soc_ehl_rt5660 remove_module snd_soc_intel_sof_board_helpers remove_module snd_soc_intel_hda_dsp_common remove_module snd_soc_intel_sof_maxim_common +remove_module snd_soc_intel_sof_nuvoton_common remove_module snd_soc_intel_sof_realtek_common #------------------------------------------- From 689497d912379d703161eafe6e8ee51a2f1fe392 Mon Sep 17 00:00:00 2001 From: Brent Lu Date: Wed, 10 Apr 2024 17:33:03 +0800 Subject: [PATCH 3/4] kmod: sof_remove: add snd_soc_intel_sof_cirrus_common An new helper module has been created for cirrus logic speaker amplifier. Add the new module to the script. Signed-off-by: Brent Lu --- tools/kmod/sof_remove.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/kmod/sof_remove.sh b/tools/kmod/sof_remove.sh index f3ad3d94..6baef9be 100755 --- a/tools/kmod/sof_remove.sh +++ b/tools/kmod/sof_remove.sh @@ -178,6 +178,7 @@ remove_module snd_soc_sof_es8336 remove_module snd_soc_ehl_rt5660 remove_module snd_soc_intel_sof_board_helpers remove_module snd_soc_intel_hda_dsp_common +remove_module snd_soc_intel_sof_cirrus_common remove_module snd_soc_intel_sof_maxim_common remove_module snd_soc_intel_sof_nuvoton_common remove_module snd_soc_intel_sof_realtek_common From 9aeccab44dec8e61d8d6f896865049cb3a0fd287 Mon Sep 17 00:00:00 2001 From: Brent Lu Date: Wed, 10 Apr 2024 17:39:13 +0800 Subject: [PATCH 4/4] kmod: fix acpi-intel-match dependency Kernel module snd_soc_acpi_intel_match is required by snd_soc_intel_sof_board_helpers to detect codec type and need to be removed before snd_soc_acpi module. RMMOD snd_soc_acpi_intel_match rmmod: ERROR: Module snd_soc_acpi_intel_match is in use by: snd_soc_intel_sof_board_helpers snd_soc_acpi_intel_match 110592 1 snd_soc_intel_sof_board_helpers snd_soc_acpi 16384 1 snd_soc_acpi_intel_match Signed-off-by: Brent Lu --- tools/kmod/sof_remove.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/kmod/sof_remove.sh b/tools/kmod/sof_remove.sh index 6baef9be..b7e30d48 100755 --- a/tools/kmod/sof_remove.sh +++ b/tools/kmod/sof_remove.sh @@ -137,7 +137,6 @@ remove_module snd_sof_intel_hda_common remove_module snd_sof_intel_hda remove_module snd_sof_intel_ipc remove_module snd_sof_xtensa_dsp -remove_module snd_soc_acpi_intel_match #------------------------------------------- # Helpers @@ -177,6 +176,7 @@ remove_module snd_soc_sof_sdw remove_module snd_soc_sof_es8336 remove_module snd_soc_ehl_rt5660 remove_module snd_soc_intel_sof_board_helpers +remove_module snd_soc_acpi_intel_match remove_module snd_soc_intel_hda_dsp_common remove_module snd_soc_intel_sof_cirrus_common remove_module snd_soc_intel_sof_maxim_common