Merge remote-tracking branch 'asoc/topic/intel' into asoc-next (0c2964cb) · Commits · 戴 / test

include/sound/soc.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
		int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
		unsigned int dai_fmt);

		#ifdef CONFIG_DMI
		int snd_soc_set_dmi_name(struct snd_soc_card card, const char flavour);
		#else
		static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,
		const char *flavour)
		{
		return 0;
		}
		#endif

		/* Utility functions to get clock rates from various things */
		int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);

+1 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)
		unsigned int offset;
		unsigned int counter = 0;

		offset = snd_hdac_chip_readl(bus, LLCH);
		offset = snd_hdac_chip_readw(bus, LLCH);

		/* Lets walk the linked capabilities list */
		do {

+2 −2

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream,

		format = snd_hdac_calc_stream_format(params_rate(hparams),
		params_channels(hparams), params_format(hparams),
		24, 0);
		dai->driver->playback.sig_bits, 0);

		pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt);
		if (!pcm)
		@@ -1419,8 +1419,8 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdac,
		hdmi_dais[i].playback.rate_min = rate_min;
		hdmi_dais[i].playback.channels_min = 2;
		hdmi_dais[i].playback.channels_max = 2;
		hdmi_dais[i].playback.sig_bits = bps;
		hdmi_dais[i].ops = &hdmi_dai_ops;

		i++;
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -2835,6 +2835,27 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Wyse 3040"),
		},
		},
		{
		.ident = "Lenovo Thinkpad Tablet 10",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad 10"),
		},
		},
		{
		.ident = "Lenovo Thinkpad Tablet 10",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Tablet B"),
		},
		},
		{
		.ident = "Lenovo Thinkpad Tablet 10",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Miix 2 10"),
		},
		},
		{}
		};

+24 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,30 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
		platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
		If unsure select "N".

		config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
		tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
		depends on X86_INTEL_LPSS && I2C && ACPI
		select SND_SOC_DA7213
		select SND_SST_ATOM_HIFI2_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 & CherryTrail
		platforms with DA7212/7213 audio codec.
		If unsure select "N".

		config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
		tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
		depends on X86_INTEL_LPSS && I2C && ACPI
		select SND_SST_ATOM_HIFI2_PLATFORM
		select SND_SST_IPC_ACPI
		select SND_SOC_INTEL_SST_MATCH if ACPI
		help
		This adds support for ASoC machine driver for the MinnowBoard Max or
		Up boards and provides access to I2S signals on the Low-Speed
		connector
		If unsure select "N".

		config SND_SOC_INTEL_SKYLAKE
		tristate
		select SND_HDA_EXT_CORE