ASoC: Intel: ssp-common: module name change

As we applied new naming convention to functions and structures,
changing module name as well to reflect the new naming.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240327162408.63953-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 4b9e498e330373be1903fa38dee092729da20f2b..e17d1a517567fde5e37f00d4ddd985754ac36e13 100644 (file)
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -197,6 +197,12 @@ config SND_SOC_ACPI_INTEL_MATCH
        # this option controls the compilation of ACPI matching tables and
        # helpers and is not meant to be selected by the user.
 
+config SND_SOC_ACPI_INTEL_SSP_COMMON
+       tristate
+       select SND_SOC_ACPI if ACPI
+       # this option provides helpers to detect codec type and is not meant
+       # to be selected by the user.
+
 endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
 
 config SND_SOC_INTEL_KEEMBAY

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index b7a6ac4b6c0ca6b3457ff49e69eb574e8eac4dcd..4d6ef68da1303b9565c1ad09c70876216111a20b 100644 (file)
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -41,9 +41,6 @@ config SND_SOC_INTEL_SOF_CIRRUS_COMMON
 config SND_SOC_INTEL_SOF_NUVOTON_COMMON
        tristate
 
-config SND_SOC_INTEL_SOF_SSP_COMMON
-       tristate
-
 config SND_SOC_INTEL_SOF_BOARD_HELPERS
        tristate
 
@@ -503,7 +500,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
        select SND_SOC_INTEL_SOF_BOARD_HELPERS
        select SND_SOC_INTEL_SOF_MAXIM_COMMON
        select SND_SOC_INTEL_SOF_REALTEK_COMMON
-       select SND_SOC_INTEL_SOF_SSP_COMMON
+       select SND_SOC_ACPI_INTEL_SSP_COMMON
        help
           This adds support for ASoC machine driver for SOF platforms
           with rt5650 or rt5682 codec.
@@ -521,7 +518,7 @@ config SND_SOC_INTEL_SOF_CS42L42_MACH
        select SND_SOC_INTEL_HDA_DSP_COMMON
        select SND_SOC_INTEL_SOF_BOARD_HELPERS
        select SND_SOC_INTEL_SOF_MAXIM_COMMON
-       select SND_SOC_INTEL_SOF_SSP_COMMON
+       select SND_SOC_ACPI_INTEL_SSP_COMMON
        help
           This adds support for ASoC machine driver for SOF platforms
           with cs42l42 codec.
@@ -574,7 +571,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH
        select SND_SOC_INTEL_SOF_MAXIM_COMMON
        select SND_SOC_INTEL_SOF_NUVOTON_COMMON
        select SND_SOC_INTEL_SOF_REALTEK_COMMON
-       select SND_SOC_INTEL_SOF_SSP_COMMON
+       select SND_SOC_ACPI_INTEL_SSP_COMMON
        help
           This adds support for ASoC machine driver for SOF platforms
           with nau8825 codec.
@@ -626,7 +623,7 @@ config SND_SOC_INTEL_SOF_DA7219_MACH
        select SND_SOC_DMIC
        select SND_SOC_INTEL_SOF_BOARD_HELPERS
        select SND_SOC_INTEL_SOF_MAXIM_COMMON
-       select SND_SOC_INTEL_SOF_SSP_COMMON
+       select SND_SOC_ACPI_INTEL_SSP_COMMON
        help
          This adds support for ASoC machine driver for SOF platforms
          with Dialog DA7219 I2S audio codec.
@@ -646,7 +643,7 @@ config SND_SOC_INTEL_SOF_SSP_AMP_MACH
        select SND_SOC_INTEL_SOF_BOARD_HELPERS
        select SND_SOC_INTEL_SOF_REALTEK_COMMON
        select SND_SOC_INTEL_SOF_CIRRUS_COMMON
-       select SND_SOC_INTEL_SOF_SSP_COMMON
+       select SND_SOC_ACPI_INTEL_SSP_COMMON
        help
           This adds support for ASoC machine driver for SOF platforms
           with RT1308/CS35L41 I2S audio codec.

diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c
index 8819ab5694bf69c08da5d9c3e9a7ce3cfdd37623..ba5be5423626ba306f252fa355a6dbab7fe41e67 100644 (file)
--- a/sound/soc/intel/boards/sof_board_helpers.c
+++ b/sound/soc/intel/boards/sof_board_helpers.c
@@ -635,4 +635,4 @@ MODULE_DESCRIPTION("ASoC Intel SOF Machine Driver Board Helpers");
 MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
 MODULE_LICENSE("GPL");
 MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
-MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_SSP_COMMON);
+MODULE_IMPORT_NS(SND_SOC_ACPI_INTEL_SSP_COMMON);

diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile
index 15c8a64368c57c912a9ca42bb735db166371bfbe..dcd552d815a20641e6a07b9990c26793359f2e17 100644 (file)
--- a/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@ -18,5 +18,5 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m
 obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
 obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o
 
-snd-soc-intel-sof-ssp-common-objs += soc-acpi-intel-ssp-common.o
-obj-$(CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON) += snd-soc-intel-sof-ssp-common.o
+snd-soc-acpi-intel-ssp-common-objs += soc-acpi-intel-ssp-common.o
+obj-$(CONFIG_SND_SOC_ACPI_INTEL_SSP_COMMON) += snd-soc-acpi-intel-ssp-common.o

diff --git a/sound/soc/intel/common/soc-acpi-intel-ssp-common.c b/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
index 716243a4fc9ada923352a85616f5055cf388768a..40b68c20a12a0df98bce24a23a765cc13a36d996 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
@@ -79,7 +79,7 @@ snd_soc_acpi_intel_detect_codec_type(struct device *dev)
 
        return CODEC_NONE;
 }
-EXPORT_SYMBOL_NS(snd_soc_acpi_intel_detect_codec_type, SND_SOC_INTEL_SOF_SSP_COMMON);
+EXPORT_SYMBOL_NS(snd_soc_acpi_intel_detect_codec_type, SND_SOC_ACPI_INTEL_SSP_COMMON);
 
 enum snd_soc_acpi_intel_codec
 snd_soc_acpi_intel_detect_amp_type(struct device *dev)
@@ -96,7 +96,7 @@ snd_soc_acpi_intel_detect_amp_type(struct device *dev)
 
        return CODEC_NONE;
 }
-EXPORT_SYMBOL_NS(snd_soc_acpi_intel_detect_amp_type, SND_SOC_INTEL_SOF_SSP_COMMON);
+EXPORT_SYMBOL_NS(snd_soc_acpi_intel_detect_amp_type, SND_SOC_ACPI_INTEL_SSP_COMMON);
 
 const char *
 snd_soc_acpi_intel_get_codec_name(enum snd_soc_acpi_intel_codec codec_type)
@@ -118,7 +118,7 @@ snd_soc_acpi_intel_get_codec_name(enum snd_soc_acpi_intel_codec codec_type)
 
        return NULL;
 }
-EXPORT_SYMBOL_NS(snd_soc_acpi_intel_get_codec_name, SND_SOC_INTEL_SOF_SSP_COMMON);
+EXPORT_SYMBOL_NS(snd_soc_acpi_intel_get_codec_name, SND_SOC_ACPI_INTEL_SSP_COMMON);
 
 MODULE_DESCRIPTION("ASoC Intel SOF Common Machine Driver Helpers");
 MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");