aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/wm97xx.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 13:25:42 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 13:25:42 -0400
commit942bb7b5d67dcfb19d7340038feb7caa666830e7 (patch)
tree6e2d9f439884ac18dc9b783649b24e5fd40b51eb /include/linux/wm97xx.h
parent48bdce4a2e0b1d3be6ed6da14d25adfe9385d2dc (diff)
parent34d278534db050b93d79175d59a32a70ac25f9b5 (diff)
Merge branch 'wm97xx'
Diffstat (limited to 'include/linux/wm97xx.h')
-rw-r--r--include/linux/wm97xx.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h
index ed01c7df54a3..4d13732e9cf0 100644
--- a/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h
@@ -282,6 +282,7 @@ struct wm97xx {
282 unsigned pen_is_down:1; /* Pen is down */ 282 unsigned pen_is_down:1; /* Pen is down */
283 unsigned aux_waiting:1; /* aux measurement waiting */ 283 unsigned aux_waiting:1; /* aux measurement waiting */
284 unsigned pen_probably_down:1; /* used in polling mode */ 284 unsigned pen_probably_down:1; /* used in polling mode */
285 u16 suspend_mode; /* PRP in suspend mode */
285}; 286};
286 287
287/* 288/*
@@ -297,6 +298,8 @@ void wm97xx_config_gpio(struct wm97xx *wm, u32 gpio,
297 enum wm97xx_gpio_sticky sticky, 298 enum wm97xx_gpio_sticky sticky,
298 enum wm97xx_gpio_wake wake); 299 enum wm97xx_gpio_wake wake);
299 300
301void wm97xx_set_suspend_mode(struct wm97xx *wm, u16 mode);
302
300/* codec AC97 IO access */ 303/* codec AC97 IO access */
301int wm97xx_reg_read(struct wm97xx *wm, u16 reg); 304int wm97xx_reg_read(struct wm97xx *wm, u16 reg);
302void wm97xx_reg_write(struct wm97xx *wm, u16 reg, u16 val); 305void wm97xx_reg_write(struct wm97xx *wm, u16 reg, u16 val);