leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/hdac' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Browse Source
This commit is contained in:
Mark Brown 2016-02-26 11:15:20 +09:00
commit 349bc80818
4 changed files with 1122 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/drm/drm_edid.h
View File

@ -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; 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, struct edid *drm_do_get_edid(struct drm_connector *connector,
int (*get_edid_block)(void *data, u8 *buf, unsigned int block, int (*get_edid_block)(void *data, u8 *buf, unsigned int block,
size_t len), size_t len),

1
sound/soc/codecs/Kconfig
View File

@ -490,6 +490,7 @@ config SND_SOC_GTM601
config SND_SOC_HDAC_HDMI config SND_SOC_HDAC_HDMI
tristate tristate
select SND_HDA_EXT_CORE select SND_HDA_EXT_CORE
select SND_PCM_ELD
select HDMI select HDMI
config SND_SOC_ICS43432 config SND_SOC_ICS43432

1233
sound/soc/codecs/hdac_hdmi.c
View File

File diff suppressed because it is too large Load Diff

6
sound/soc/codecs/hdac_hdmi.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef __HDAC_HDMI_H__
#define __HDAC_HDMI_H__
int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int pcm);
#endif /* __HDAC_HDMI_H__ */