diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 23:34:02 +0300 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 23:34:02 +0300 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /include/linux/spi/ad7879.h | |
| parent | d67b1b03254c501fef371b0e5916c94a52bfc2c5 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| download | linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.xz | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'include/linux/spi/ad7879.h')
| -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; }; |