Commit 16b57114 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents c7bb6d80 7ba8ba3f

include/sound/soc.h

+4 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ 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);



int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);



/* Utility functions to get clock rates from various things */

int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);

int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -1093,6 +1095,8 @@ struct snd_soc_card { 
	const char *name;

	const char *long_name;

	const char *driver_name;

	char dmi_longname[80];



	struct device *dev;

	struct snd_card *snd_card;

	struct module *owner;

sound/hda/ext/hdac_ext_stream.c

+9 −6
Original line number Diff line number Diff line
@@ -128,14 +128,17 @@ void snd_hdac_ext_stream_decouple(struct hdac_ext_bus *ebus, 
{

	struct hdac_stream *hstream = &stream->hstream;

	struct hdac_bus *bus = &ebus->bus;

	u32 val;

	int mask = AZX_PPCTL_PROCEN(hstream->index);



	spin_lock_irq(&bus->reg_lock);

	if (decouple)

		snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, 0,

				AZX_PPCTL_PROCEN(hstream->index));

	else

		snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL,

					AZX_PPCTL_PROCEN(hstream->index), 0);

	val = readw(bus->ppcap + AZX_REG_PP_PPCTL) & mask;



	if (decouple && !val)

		snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, mask);

	else if (!decouple && val)

		snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, 0);



	stream->decoupled = decouple;

	spin_unlock_irq(&bus->reg_lock);

}

sound/soc/codecs/hdac_hdmi.c

+818 −509

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/hdac_hdmi.h

+4 −1
Original line number Diff line number Diff line 
#ifndef __HDAC_HDMI_H__

#define __HDAC_HDMI_H__



int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int pcm);

int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int pcm,

				struct snd_soc_jack *jack);



int hdac_hdmi_jack_port_init(struct snd_soc_codec *codec,

			struct snd_soc_dapm_context *dapm);

#endif /* __HDAC_HDMI_H__ */

sound/soc/codecs/rt298.c

+7 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Broxton P")

		}

	},

	{

		.ident = "Intel Gemini Lake",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corp"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake")

		}

	},

	{ }

};