diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-29 06:28:52 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-29 06:28:52 -0400 |
commit | 85abf3ec5fa663c9638ef2d10d9623880a26458e (patch) | |
tree | ce1cc6166cd34b4a49299ccf4aefaac657a34fcf /include/sound | |
parent | 49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d (diff) | |
parent | 2bd1f73f4242ee19d8c610bcffe6e7a813451ce0 (diff) |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/hdaudio.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 6a2e030c836c..b97c59eab7ab 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h | |||
@@ -74,6 +74,7 @@ struct hdac_device { | |||
74 | 74 | ||
75 | /* misc flags */ | 75 | /* misc flags */ |
76 | atomic_t in_pm; /* suspend/resume being performed */ | 76 | atomic_t in_pm; /* suspend/resume being performed */ |
77 | bool link_power_control:1; | ||
77 | 78 | ||
78 | /* sysfs */ | 79 | /* sysfs */ |
79 | struct hdac_widget_tree *widgets; | 80 | struct hdac_widget_tree *widgets; |
@@ -184,6 +185,8 @@ struct hdac_bus_ops { | |||
184 | /* get a response from the last command */ | 185 | /* get a response from the last command */ |
185 | int (*get_response)(struct hdac_bus *bus, unsigned int addr, | 186 | int (*get_response)(struct hdac_bus *bus, unsigned int addr, |
186 | unsigned int *res); | 187 | unsigned int *res); |
188 | /* control the link power */ | ||
189 | int (*link_power)(struct hdac_bus *bus, bool enable); | ||
187 | }; | 190 | }; |
188 | 191 | ||
189 | /* | 192 | /* |
@@ -311,6 +314,7 @@ static inline void snd_hdac_codec_link_down(struct hdac_device *codec) | |||
311 | int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val); | 314 | int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val); |
312 | int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr, | 315 | int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr, |
313 | unsigned int *res); | 316 | unsigned int *res); |
317 | int snd_hdac_link_power(struct hdac_device *codec, bool enable); | ||
314 | 318 | ||
315 | bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset); | 319 | bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset); |
316 | void snd_hdac_bus_stop_chip(struct hdac_bus *bus); | 320 | void snd_hdac_bus_stop_chip(struct hdac_bus *bus); |