Unverified Commit 6cbfa11d authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: Select catpt and deprecate haswell 



Prevent sound/soc/intel/haswell code compile and select catpt instead as
a recommended solution. Userspace-exposed members are compatible with
what is exposed by deprecated solution thus no harm is done. The only
visible difference is the newly added 'Loopback Mute' kcontrol.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200929141247.8058-15-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 053743f0

sound/soc/intel/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE 
	# Haswell/Broadwell/Baytrail legacy and will be set

	# when these platforms are enabled



config SND_SOC_INTEL_HASWELL

	tristate "Haswell/Broadwell Platforms"

config SND_SOC_INTEL_CATPT

	tristate "Haswell and Broadwell"

	depends on ACPI || COMPILE_TEST

	depends on SND_DMA_SGBUF

	depends on DMADEVICES && ACPI

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_ACPI

	select SND_SOC_INTEL_SST_FIRMWARE

	select DW_DMAC_CORE

	select SND_SOC_ACPI_INTEL_MATCH

	help

	  If you have a Intel Haswell or Broadwell platform connected to

	  an I2S codec, then enable this option by saying Y or m. This is

	  typically used for Chromebooks. This is a recommended option.

	  This option is mutually exclusive with the SOF support on

	  Broadwell. If you want to enable SOF on Broadwell, you need to

	  deselect this option first.

	  Enable support for Intel(R) Haswell and Broadwell platforms

	  with I2S codec present. This is a recommended option.

	  Say Y or m if you have such device.

	  If unsure, say N.



config SND_SOC_INTEL_HASWELL

	tristate

	select SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_BAYTRAIL

	tristate "Baytrail (legacy) Platforms"

sound/soc/intel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
obj-$(CONFIG_SND_SOC) += common/



# Platform Support

obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/

obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/

obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/

obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/

obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/

obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/

sound/soc/intel/boards/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES 
	  interface.

	  If unsure select N.



if SND_SOC_INTEL_HASWELL

if SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_HASWELL_MACH

	tristate "Haswell Lynxpoint"
@@ -40,9 +40,9 @@ config SND_SOC_INTEL_HASWELL_MACH 
	  Say Y or m if you have such a device.

	  If unsure select "N".



endif ## SND_SOC_INTEL_HASWELL

endif ## SND_SOC_INTEL_CATPT



if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL

if SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL



config SND_SOC_INTEL_BDW_RT5650_MACH

	tristate "Broadwell with RT5650 codec"
@@ -83,7 +83,7 @@ config SND_SOC_INTEL_BROADWELL_MACH 
	  Ultrabook platforms.

	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".

endif ## SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL

endif ## SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL



if SND_SOC_INTEL_BAYTRAIL

sound/soc/intel/catpt/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
snd-soc-catpt-objs := device.o dsp.o loader.o ipc.o messages.o pcm.o sysfs.o



# tell define_trace.h where to find the trace header

CFLAGS_device.o := -I$(src)



obj-$(CONFIG_SND_SOC_INTEL_CATPT) += snd-soc-catpt.o