Commit 6719f657 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel-kconfig' into asoc-linus

parents 7ff60f58 8ceffd22

sound/soc/intel/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -30,11 +30,15 @@ config SND_SST_IPC_ACPI 
config SND_SOC_INTEL_SST

	tristate

	select SND_SOC_INTEL_SST_ACPI if ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	depends on (X86 || COMPILE_TEST)



config SND_SOC_INTEL_SST_ACPI

	tristate



config SND_SOC_INTEL_SST_MATCH

	tristate



config SND_SOC_INTEL_HASWELL

	tristate
@@ -57,7 +61,7 @@ config SND_SOC_INTEL_HASWELL_MACH 
config SND_SOC_INTEL_BYT_RT5640_MACH

	tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"

	depends on X86_INTEL_LPSS && I2C

	depends on DW_DMAC_CORE=y && (SND_SOC_INTEL_BYTCR_RT5640_MACH = n)

	depends on DW_DMAC_CORE=y && (SND_SST_IPC_ACPI = n)

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_BAYTRAIL

	select SND_SOC_RT5640
@@ -69,7 +73,7 @@ config SND_SOC_INTEL_BYT_RT5640_MACH 
config SND_SOC_INTEL_BYT_MAX98090_MACH

	tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"

	depends on X86_INTEL_LPSS && I2C

	depends on DW_DMAC_CORE=y

	depends on DW_DMAC_CORE=y && (SND_SST_IPC_ACPI = n)

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_BAYTRAIL

	select SND_SOC_MAX98090
@@ -97,6 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH 
	select SND_SOC_RT5640

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5640 audio codec.
@@ -109,6 +114,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH 
	select SND_SOC_RT5651

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5651 audio codec.
@@ -121,6 +127,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH 
        select SND_SOC_RT5670

        select SND_SST_MFLD_PLATFORM

        select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

        help

          This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

          platforms with RT5672 audio codec.
@@ -133,6 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH 
	select SND_SOC_RT5645

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

	  platforms with RT5645/5650 audio codec.
@@ -145,6 +153,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH 
	select SND_SOC_TS3A227E

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

      This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

      platforms with MAX98090 audio codec it also can support TI jack chip as aux device.

sound/soc/intel/common/Makefile

+3 −6
Original line number Diff line number Diff line 
snd-soc-sst-dsp-objs := sst-dsp.o

ifneq ($(CONFIG_SND_SST_IPC_ACPI),)

snd-soc-sst-acpi-objs := sst-match-acpi.o

else

snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o

endif



snd-soc-sst-acpi-objs := sst-acpi.o

snd-soc-sst-match-objs := sst-match-acpi.o

snd-soc-sst-ipc-objs := sst-ipc.o



snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o



obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o

obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

obj-$(CONFIG_SND_SOC_INTEL_SST_MATCH) += snd-soc-sst-match.o

sound/soc/intel/common/sst-acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { 
	.dma_size = SST_LPT_DSP_DMA_SIZE,

};



#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI)

static struct sst_acpi_mach baytrail_machines[] = {

	{ "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL },

	{ "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL },
@@ -231,11 +232,14 @@ static struct sst_acpi_desc sst_acpi_baytrail_desc = { 
	.sst_id = SST_DEV_ID_BYT,

	.resindex_dma_base = -1,

};

#endif



static const struct acpi_device_id sst_acpi_match[] = {

	{ "INT33C8", (unsigned long)&sst_acpi_haswell_desc },

	{ "INT3438", (unsigned long)&sst_acpi_broadwell_desc },

#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI)

	{ "80860F28", (unsigned long)&sst_acpi_baytrail_desc },

#endif

	{ }

};

MODULE_DEVICE_TABLE(acpi, sst_acpi_match);

sound/soc/intel/common/sst-match-acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -41,3 +41,6 @@ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines) 
	return NULL;

}

EXPORT_SYMBOL_GPL(sst_acpi_find_machine);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel Common ACPI Match module");