Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df91a210 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents a1eb3000 e2304803

include/drm/drm_edid.h

+12 −0
Original line number Diff line number Diff line
@@ -403,6 +403,18 @@ static inline int drm_eld_size(const uint8_t *eld) 
	return DRM_ELD_HEADER_BLOCK_SIZE + eld[DRM_ELD_BASELINE_ELD_LEN] * 4;

}



/**

 * drm_eld_get_conn_type - Get device type hdmi/dp connected

 * @eld: pointer to an ELD memory structure

 *

 * The caller need to use %DRM_ELD_CONN_TYPE_HDMI or %DRM_ELD_CONN_TYPE_DP to

 * identify the display type connected.

 */

static inline u8 drm_eld_get_conn_type(const uint8_t *eld)

{

	return eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & DRM_ELD_CONN_TYPE_MASK;

}



struct edid *drm_do_get_edid(struct drm_connector *connector,

	int (*get_edid_block)(void *data, u8 *buf, unsigned int block,

			      size_t len),

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ config SND_SOC_GTM601 
config SND_SOC_HDAC_HDMI

	tristate

	select SND_HDA_EXT_CORE

	select SND_PCM_ELD

	select HDMI



config SND_SOC_ICS43432

sound/soc/codecs/hdac_hdmi.c

+1097 −123

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/hdac_hdmi.h

0 → 100644
+6 −0
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);



#endif /* __HDAC_HDMI_H__ */

sound/soc/intel/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ config SND_SOC_INTEL_SKYLAKE 
	tristate

	select SND_HDA_EXT_CORE

	select SND_SOC_TOPOLOGY

	select SND_HDA_I915

	select SND_SOC_INTEL_SST



config SND_SOC_INTEL_SKL_RT286_MACH
@@ -172,6 +173,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH 
	select SND_SOC_INTEL_SKYLAKE

	select SND_SOC_RT286

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	help

	   This adds support for ASoC machine driver for Skylake platforms

	   with RT286 I2S audio codec.
@@ -186,6 +188,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH 
	select SND_SOC_NAU8825

	select SND_SOC_SSM4567

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	help

	  This adds support for ASoC Onboard Codec I2S machine driver. This will

	  create an alsa sound card for NAU88L25 + SSM4567.
@@ -200,6 +203,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH 
	select SND_SOC_NAU8825

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	help

	  This adds support for ASoC Onboard Codec I2S machine driver. This will

	  create an alsa sound card for NAU88L25 + MAX98357A.