diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:31:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:31:51 +1100 |
commit | f3a4bb333c89e0c5ef6ded82668aaf734ae74a0e (patch) | |
tree | c5c57c82cdaaf2d41febb27f44de302c06fd5a81 /include | |
parent | b4bb54ec4494db5680123ba0c4f00d4b66a4ab5c (diff) | |
parent | ec51b7f538c440bfa5a4d538133c659071c02155 (diff) |
Merge remote branch 'input-current/for-linus'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/spi/ad7879.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/spi/ad7879.h b/include/linux/spi/ad7879.h index 4231104c9afa..6334cee1a3be 100644 --- a/include/linux/spi/ad7879.h +++ b/include/linux/spi/ad7879.h @@ -28,8 +28,12 @@ struct ad7879_platform_data { * 1 = 4, 2 = 8, 3 = 16 (median > averaging) */ u8 median; - /* 1 = AUX/VBAT/GPIO set to GPIO Output */ - u8 gpio_output; - /* Initial GPIO pin state (valid if gpio_output = 1) */ - u8 gpio_default; + /* 1 = AUX/VBAT/GPIO export GPIO to gpiolib + * requires CONFIG_GPIOLIB + */ + bool gpio_export; + /* identifies the first GPIO number handled by this chip; + * or, if negative, requests dynamic ID allocation. + */ + s32 gpio_base; }; |