summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-12-01 06:39:38 -0500
committerTakashi Iwai <tiwai@suse.de>2015-12-10 08:41:07 -0500
commite2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (patch)
tree5cccbc6953734de5a81082e6adbd8ebac4a4ca4b /include/sound
parent788d441a164caea0a5d82e1d5bcd161820bfe62a (diff)
ALSA: hda - Move audio component accesses to hdac_i915.c
A couple of i915_audio_component ops have been added and accessed directly from patch_hdmi.c. Ideally all these should be factored out into hdac_i915.c. This patch does it, adds two new helper functions for setting N/CTS and fetching ELD bytes. One bonus is that the hackish widget vs port mapping is also moved to hdac_i915.c, so that it can be fixed / enhanced more cleanly. Reviewed-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/hda_i915.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h
index 930b41e5acf4..fa341fcb5829 100644
--- a/include/sound/hda_i915.h
+++ b/include/sound/hda_i915.h
@@ -10,6 +10,9 @@
10int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable); 10int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);
11int snd_hdac_display_power(struct hdac_bus *bus, bool enable); 11int snd_hdac_display_power(struct hdac_bus *bus, bool enable);
12int snd_hdac_get_display_clk(struct hdac_bus *bus); 12int snd_hdac_get_display_clk(struct hdac_bus *bus);
13int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, int rate);
14int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid,
15 bool *audio_enabled, char *buffer, int max_bytes);
13int snd_hdac_i915_init(struct hdac_bus *bus); 16int snd_hdac_i915_init(struct hdac_bus *bus);
14int snd_hdac_i915_exit(struct hdac_bus *bus); 17int snd_hdac_i915_exit(struct hdac_bus *bus);
15int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *); 18int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *);
@@ -26,6 +29,17 @@ static inline int snd_hdac_get_display_clk(struct hdac_bus *bus)
26{ 29{
27 return 0; 30 return 0;
28} 31}
32static inline int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid,
33 int rate)
34{
35 return 0;
36}
37static inline int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid,
38 bool *audio_enabled, char *buffer,
39 int max_bytes)
40{
41 return -ENODEV;
42}
29static inline int snd_hdac_i915_init(struct hdac_bus *bus) 43static inline int snd_hdac_i915_init(struct hdac_bus *bus)
30{ 44{
31 return -ENODEV; 45 return -ENODEV;