diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 14:38:15 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 14:38:15 +0900 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /include/linux/spi | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
| download | kernel-crypto-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.gz kernel-crypto-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.xz kernel-crypto-ab386128f20c44c458a90039ab1bdc265ac474c9.zip | |
Merge branch 'master' into percpu
Diffstat (limited to 'include/linux/spi')
| -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 4231104c9af..6334cee1a3b 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; }; |