Unverified Commit 3e4555ab authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

parents 7c310f16 987da3fe

include/sound/soc-acpi.h

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], 
struct snd_soc_acpi_mach *

snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines);



/* acpi check hid */

bool snd_soc_acpi_check_hid(const u8 hid[ACPI_ID_LEN]);



/**

 * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are

 * related to the hardware, except for the firmware and topology file names.

include/uapi/sound/snd_sst_tokens.h

+16 −1
Original line number Diff line number Diff line
@@ -222,6 +222,17 @@ 
 * %SKL_TKN_MM_U32_NUM_IN_FMT:  Number of input formats

 * %SKL_TKN_MM_U32_NUM_OUT_FMT: Number of output formats

 *

 * %SKL_TKN_U32_ASTATE_IDX:     Table Index for the A-State entry to be filled

 *                              with kcps and clock source

 *

 * %SKL_TKN_U32_ASTATE_COUNT:   Number of valid entries in A-State table

 *

 * %SKL_TKN_U32_ASTATE_KCPS:    Specifies the core load threshold (in kilo

 *                              cycles per second) below which DSP is clocked

 *                              from source specified by clock source.

 *

 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry

 *

 * module_id and loadable flags dont have tokens as these values will be

 * read from the DSP FW manifest

 *
@@ -309,7 +320,11 @@ enum SKL_TKNS { 
	SKL_TKN_MM_U32_NUM_IN_FMT,

	SKL_TKN_MM_U32_NUM_OUT_FMT,



	SKL_TKN_MAX = SKL_TKN_MM_U32_NUM_OUT_FMT,

	SKL_TKN_U32_ASTATE_IDX,

	SKL_TKN_U32_ASTATE_COUNT,

	SKL_TKN_U32_ASTATE_KCPS,

	SKL_TKN_U32_ASTATE_CLK_SRC,

	SKL_TKN_MAX = SKL_TKN_U32_ASTATE_CLK_SRC,

};



#endif

sound/soc/codecs/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_SGTL5000 if I2C

	select SND_SOC_SI476X if MFD_SI476X_CORE

	select SND_SOC_SIRF_AUDIO_CODEC

	select SND_SOC_SN95031 if INTEL_SCU_IPC

	select SND_SOC_SPDIF

	select SND_SOC_SSM2518 if I2C

	select SND_SOC_SSM2602_SPI if SPI_MASTER
@@ -818,9 +817,6 @@ config SND_SOC_SIRF_AUDIO_CODEC 
	tristate "SiRF SoC internal audio codec"

	select REGMAP_MMIO



config SND_SOC_SN95031

	tristate



config SND_SOC_SPDIF

	tristate "S/PDIF CODEC"

sound/soc/codecs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ snd-soc-sigmadsp-i2c-objs := sigmadsp-i2c.o 
snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o

snd-soc-si476x-objs := si476x.o

snd-soc-sirf-audio-codec-objs := sirf-audio-codec.o

snd-soc-sn95031-objs := sn95031.o

snd-soc-spdif-tx-objs := spdif_transmitter.o

snd-soc-spdif-rx-objs := spdif_receiver.o

snd-soc-ssm2518-objs := ssm2518.o

sound/soc/codecs/sn95031.c

deleted100644 → 0
+0 −936

File deleted.

Preview size limit exceeded, changes collapsed.