Unverified Commit fc7f6a05 authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from asoc/for-5.10

parents 3650b228 6e5329c6

sound/soc/codecs/cs42l51.c

+21 −1
Original line number Diff line number Diff line
@@ -254,8 +254,28 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { 
		&cs42l51_adcr_mux_controls),

};



static int mclk_event(struct snd_soc_dapm_widget *w,

		      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(comp);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		return clk_prepare_enable(cs42l51->mclk_handle);

	case SND_SOC_DAPM_POST_PMD:

		/* Delay mclk shutdown to fulfill power-down sequence requirements */

		msleep(20);

		clk_disable_unprepare(cs42l51->mclk_handle);

		break;

	}



	return 0;

}



static const struct snd_soc_dapm_widget cs42l51_dapm_mclk_widgets[] = {

	SND_SOC_DAPM_CLOCK_SUPPLY("MCLK")

	SND_SOC_DAPM_SUPPLY("MCLK", SND_SOC_NOPM, 0, 0, mclk_event,

			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

};



static const struct snd_soc_dapm_route cs42l51_routes[] = {

sound/soc/codecs/wsa881x.c

+2 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,8 @@ static struct snd_soc_dai_driver wsa881x_dais[] = { 
		.id = 0,

		.playback = {

			.stream_name = "SPKR Playback",

			.rates = SNDRV_PCM_RATE_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_max = 48000,

			.rate_min = 48000,

			.channels_min = 1,

sound/soc/intel/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -15,22 +15,6 @@ config SND_SOC_INTEL_SST_TOPLEVEL 


if SND_SOC_INTEL_SST_TOPLEVEL



config SND_SST_IPC

	tristate

	# This option controls the IPC core for HiFi2 platforms



config SND_SST_IPC_PCI

	tristate

	select SND_SST_IPC

	# This option controls the PCI-based IPC for HiFi2 platforms

	#  (Medfield, Merrifield).



config SND_SST_IPC_ACPI

	tristate

	select SND_SST_IPC

	# This option controls the ACPI-based IPC for HiFi2 platforms

	# (Baytrail, Cherrytrail)



config SND_SOC_INTEL_SST

	tristate
@@ -57,7 +41,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM 
config SND_SST_ATOM_HIFI2_PLATFORM_PCI

	tristate "PCI HiFi2 (Merrifield) Platforms"

	depends on X86 && PCI

	select SND_SST_IPC_PCI

	select SND_SST_ATOM_HIFI2_PLATFORM

	help

	  If you have a Intel Merrifield/Edison platform, then
@@ -70,7 +53,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI 
	tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"

	default ACPI

	depends on X86 && ACPI && PCI

	select SND_SST_IPC_ACPI

	select SND_SST_ATOM_HIFI2_PLATFORM

	select SND_SOC_ACPI_INTEL_MATCH

	select IOSF_MBI

sound/soc/intel/atom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ snd-soc-sst-atom-hifi2-platform-objs := sst-mfld-platform-pcm.o \ 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-soc-sst-atom-hifi2-platform.o



# DSP driver

obj-$(CONFIG_SND_SST_IPC) += sst/
 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += sst/

sound/soc/intel/atom/sst/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ snd-intel-sst-core-objs := sst.o sst_ipc.o sst_stream.o sst_drv_interface.o sst_ 
snd-intel-sst-pci-objs += sst_pci.o

snd-intel-sst-acpi-objs += sst_acpi.o



obj-$(CONFIG_SND_SST_IPC) += snd-intel-sst-core.o

obj-$(CONFIG_SND_SST_IPC_PCI) += snd-intel-sst-pci.o

obj-$(CONFIG_SND_SST_IPC_ACPI) += snd-intel-sst-acpi.o
 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-intel-sst-core.o

obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI) += snd-intel-sst-pci.o

obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) += snd-intel-sst-acpi.o