ASoC: Intel: updates for 6.10 - part6

Merge series from Pierre-Louis Bossart <[email protected]>:

Last batch of cleanups from Brent Lu, with Chromebooks now supported
with fewer modular machine drivers.

diff --combined sound/soc/intel/boards/Kconfig
index b122b8aedd9a960e1657d63ffa2e0a0d5d1a068b,e7ea6fe3dcd1bcba974c0b0a291e601f7b721ed2..17bd0f883b9e2a4073d71da840335c2c5eece191
--- 1/sound/soc/intel/boards/Kconfig
--- 2/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@@ -301,26 -301,21 +301,21 @@@ config SND_SOC_INTEL_DA7219_MAX98357A_G
        tristate
        select SND_SOC_DA7219
        select SND_SOC_MAX98357A
-       select SND_SOC_MAX98390
        select SND_SOC_DMIC
        select SND_SOC_HDAC_HDMI
        select SND_SOC_INTEL_HDA_DSP_COMMON
  
- config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
-       tristate
-       select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
- 
  if SND_SOC_INTEL_APL
  
  config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
-       tristate "Broxton with DA7219 and MAX98357A/MAX98390 in I2S Mode"
+       tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
        depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI
-       select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+       select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
        help
           This adds support for ASoC machine driver for Broxton-P platforms
-          with DA7219 + MAX98357A/MAX98390 I2S audio codec.
+          with DA7219 + MAX98357A I2S audio codec.
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
  
@@@ -433,30 -428,21 +428,21 @@@ if SND_SOC_SOF_GEMINILAK
  
  config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
        tristate "GLK with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI
-       depends on MFD_INTEL_LPSS || COMPILE_TEST
-       depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
-       select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+       imply SND_SOC_INTEL_SOF_DA7219_MACH
        help
           This adds support for ASoC machine driver for Geminilake platforms
-          with DA7219 + MAX98357A I2S audio codec.
+          with DA7219 + MAX98357A I2S audio codec. This option is deprecated
+          and please use SND_SOC_INTEL_SOF_DA7219_MACH instead.
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
  
  config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
        tristate "GLK with RT5682 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI
-       depends on MFD_INTEL_LPSS || COMPILE_TEST
-       depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
-       select SND_SOC_RT5682_I2C
-       select SND_SOC_RT5682S
-       select SND_SOC_MAX98357A
-       select SND_SOC_DMIC
-       select SND_SOC_HDAC_HDMI
-       select SND_SOC_INTEL_HDA_DSP_COMMON
+       imply SND_SOC_INTEL_SOF_RT5682_MACH
        help
           This adds support for ASoC machine driver for Geminilake platforms
-          with RT5682 + MAX98357A I2S audio codec.
+          with RT5682 + MAX98357A I2S audio codec. This option is deprecated
+          and please use SND_SOC_INTEL_SOF_RT5682_MACH instead.
           Say Y if you have such a device.
           If unsure select "N".
  
@@@ -487,6 -473,7 +473,7 @@@ config SND_SOC_INTEL_SOF_RT5682_MAC
        depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
                    (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
                   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
+       select SND_SOC_MAX98357A
        select SND_SOC_MAX98373_I2C
        select SND_SOC_MAX98390
        select SND_SOC_RT1011
@@@ -584,12 -571,11 +571,11 @@@ if (SND_SOC_SOF_COMETLAKE && SND_SOC_SO
  
  config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
        tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI
-       depends on MFD_INTEL_LPSS || COMPILE_TEST
-       select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+       imply SND_SOC_INTEL_SOF_DA7219_MACH
        help
           This adds support for ASoC machine driver for Cometlake platforms
-          with DA7219 + MAX98357A I2S audio codec.
+          with DA7219 + MAX98357A I2S audio codec. This option is deprecated
+          and please use SND_SOC_INTEL_SOF_DA7219_MACH instead.
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
  
@@@ -614,6 -600,7 +600,7 @@@ config SND_SOC_INTEL_SOF_DA7219_MAC
        select SND_SOC_DA7219
        select SND_SOC_MAX98357A
        select SND_SOC_MAX98373_I2C
+       select SND_SOC_MAX98390
        select SND_SOC_DMIC
        select SND_SOC_INTEL_SOF_BOARD_HELPERS
        select SND_SOC_INTEL_SOF_MAXIM_COMMON
@@@ -690,7 -677,6 +677,7 @@@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MAC
        select SND_SOC_CS42L43_SDW
        select MFD_CS42L43
        select MFD_CS42L43_SDW
 +      select SND_SOC_CS35L56_SPI
        select SND_SOC_CS35L56_SDW
        select SND_SOC_DMIC
        select SND_SOC_INTEL_HDA_DSP_COMMON

diff --combined sound/soc/intel/boards/Makefile
index 1c099e717ecad199f9e96e553cc05374d1bfb477,949e064908586e2ab0f775219a39d6574e9f753e..9630050557304a0bbe2c165fb6f6c4dce017e4e8
--- 1/sound/soc/intel/boards/Makefile
--- 2/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@@ -7,7 -7,6 +7,6 @@@ snd-soc-sst-bxt-da7219_max98357a-objs :
  snd-soc-sst-bxt-rt298-objs := bxt_rt298.o
  snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o
  snd-soc-sst-sof-wm8804-objs := sof_wm8804.o
- snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o
  snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o
  snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o
  snd-soc-sst-bytcr-wm5102-objs := bytcr_wm5102.o
@@@ -37,7 -36,6 +36,7 @@@ snd-soc-ehl-rt5660-objs := ehl_rt5660.
  snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o
  snd-soc-sof-sdw-objs += sof_sdw.o                             \
                        sof_sdw_maxim.o sof_sdw_rt_amp.o        \
 +                      bridge_cs35l56.o                        \
                        sof_sdw_rt5682.o sof_sdw_rt700.o        \
                        sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o   \
                        sof_sdw_rt712_sdca.o sof_sdw_rt722_sdca.o       \
@@@ -52,11 -50,10 +51,10 @@@ obj-$(CONFIG_SND_SOC_INTEL_SOF_ES8336_M
  obj-$(CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH) += snd-soc-sof_nau8825.o
  obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH) += snd-soc-sof_da7219.o
  obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-hsw-rt5640.o
- obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
+ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
  obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
  obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
  obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o
- obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o
  obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-bdw-rt286.o
  obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o
  obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o