projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[platform/kernel/linux-exynos.git]
/
include
/
linux
/
mfd
/
arizona
/
pdata.h
diff --git
a/include/linux/mfd/arizona/pdata.h
b/include/linux/mfd/arizona/pdata.h
index
f672267
..
43db4fa
100644
(file)
--- a/
include/linux/mfd/arizona/pdata.h
+++ b/
include/linux/mfd/arizona/pdata.h
@@
-121,6
+121,9
@@
struct arizona_pdata {
/** GPIO used for mic isolation with HPDET */
int hpdet_id_gpio;
+ /** Channel to use for headphone detection */
+ unsigned int hpdet_channel;
+
/** Extra debounce timeout used during initial mic detection (ms) */
int micd_detect_debounce;