Unverified Commit 2f4d6de5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: cleanups for 5.18 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Updates to clean-up the GPIOLIB dependency and a quirk for HP
SoundWire devices.
parents 3066987e ce73ef6e

drivers/soundwire/dmi-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { 
	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"),

		},

		.driver_data = (void *)intel_tgl_bios,

	},

sound/soc/intel/boards/Kconfig

+29 −20
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH 
	tristate "Baytrail and Baytrail-CR with RT5640 codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_RT5640

	help
@@ -115,6 +116,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH 
	tristate "Baytrail and Baytrail-CR with RT5651 codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_RT5651

	help
@@ -127,6 +129,7 @@ config SND_SOC_INTEL_BYTCR_WM5102_MACH 
	tristate "Baytrail and Baytrail-CR with WM5102 codec"

	depends on MFD_ARIZONA && MFD_WM5102 && SPI_MASTER && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_WM5102

	help
@@ -139,6 +142,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH 
	tristate "Cherrytrail & Braswell with RT5672 codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_RT5670

	help
@@ -163,6 +167,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH 
	tristate "Cherrytrail & Braswell with MAX98090 & TI codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_MAX98090

	select SND_SOC_TS3A227E

	help
@@ -187,6 +192,7 @@ config SND_SOC_INTEL_BYT_CHT_CX2072X_MACH 
	tristate "Baytrail & Cherrytrail with CX2072X codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_CX2072X

	help
@@ -211,6 +217,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH 
	tristate "Baytrail & Cherrytrail with ES8316 codec"

	depends on I2C && ACPI

	depends on X86_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_ACPI

	select SND_SOC_ES8316

	help
@@ -242,7 +249,7 @@ if SND_SOC_INTEL_SKL 


config SND_SOC_INTEL_SKL_RT286_MACH

	tristate "SKL with RT286 I2S mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT286

	select SND_SOC_DMIC
@@ -255,7 +262,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH

	tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_NAU8825

	select SND_SOC_SSM4567
@@ -269,7 +276,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH

	tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_NAU8825

	select SND_SOC_MAX98357A
@@ -300,7 +307,7 @@ if SND_SOC_INTEL_APL 


config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH

	tristate "Broxton with DA7219 and MAX98357A/MAX98390 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	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
@@ -312,7 +319,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_BXT_RT298_MACH

	tristate "Broxton with RT298 I2S mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT298

	select SND_SOC_DMIC
@@ -332,6 +339,7 @@ config SND_SOC_INTEL_SOF_WM8804_MACH 
	tristate "SOF with Wolfson/Cirrus WM8804 codec"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_WM8804_I2C

	help

	  This adds support for ASoC machine driver for Intel platforms
@@ -345,7 +353,7 @@ if SND_SOC_INTEL_KBL 


config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH

	tristate "KBL with RT5663 and MAX98927 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT5663

	select SND_SOC_MAX98927
@@ -377,7 +385,7 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH 


config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH

	tristate "KBL with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC

	help
@@ -387,7 +395,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH

	tristate "KBL with DA7219 and MAX98927 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_DA7219

	select SND_SOC_MAX98927
@@ -404,6 +412,7 @@ config SND_SOC_INTEL_KBL_RT5660_MACH 
	tristate "KBL with RT5660 in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	select SND_SOC_RT5660

	select SND_SOC_HDAC_HDMI

	help
@@ -417,7 +426,7 @@ if SND_SOC_SOF_GEMINILAKE 


config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH

	tristate "GLK with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	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
@@ -429,7 +438,7 @@ config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH

	tristate "GLK with RT5682 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	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
@@ -451,7 +460,6 @@ if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC 
config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH

	tristate "Skylake+ with HDA Codecs"

	depends on SND_HDA_CODEC_HDMI

	depends on GPIOLIB

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DMIC
@@ -468,7 +476,7 @@ endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC 
if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL

config SND_SOC_INTEL_SOF_RT5682_MACH

	tristate "SOF with rt5682 codec in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	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))
@@ -523,8 +531,9 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH 


config SND_SOC_INTEL_SOF_ES8336_MACH

	tristate "SOF with ES8336 codec in I2S mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on GPIOLIB || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_ES8316

	select SND_SOC_DMIC
@@ -537,7 +546,7 @@ config SND_SOC_INTEL_SOF_ES8336_MACH 


config SND_SOC_INTEL_SOF_NAU8825_MACH

	tristate "SOF with nau8825 codec in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\

		    (MFD_INTEL_LPSS || COMPILE_TEST))

	select SND_SOC_NAU8825
@@ -560,7 +569,7 @@ if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK) 


config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH

	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	help
@@ -571,7 +580,7 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH

	tristate "CML with RT1011 and RT5682 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	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_RT1011
@@ -591,7 +600,7 @@ if SND_SOC_SOF_JASPERLAKE 


config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH

	tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	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_HDA_DSP_COMMON
@@ -608,7 +617,7 @@ endif ## SND_SOC_SOF_JASPERLAKE 


config SND_SOC_INTEL_SOF_SSP_AMP_MACH

	tristate "SOF with amplifiers in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT1308

	select SND_SOC_CS35L41_I2C
@@ -627,7 +636,7 @@ if SND_SOC_SOF_ELKHARTLAKE 


config SND_SOC_INTEL_EHL_RT5660_MACH

	tristate "EHL with RT5660 in I2S mode"

	depends on I2C && ACPI && GPIOLIB

	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_RT5660
@@ -643,7 +652,7 @@ if SND_SOC_SOF_INTEL_SOUNDWIRE 


config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH

	tristate "SoundWire generic machine driver"

	depends on I2C && ACPI && GPIOLIB

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST

	depends on SOUNDWIRE

sound/soc/intel/boards/sof_sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |