diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/gpio.h | 2 | ||||
-rw-r--r-- | include/linux/i2c/pcf857x.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 365ea09ed3b0..a9432fc6b8ba 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h | |||
@@ -60,6 +60,8 @@ struct device_node; | |||
60 | * @get: returns value for signal "offset"; for output signals this | 60 | * @get: returns value for signal "offset"; for output signals this |
61 | * returns either the value actually sensed, or zero | 61 | * returns either the value actually sensed, or zero |
62 | * @direction_output: configures signal "offset" as output, or returns error | 62 | * @direction_output: configures signal "offset" as output, or returns error |
63 | * @set_debounce: optional hook for setting debounce time for specified gpio in | ||
64 | * interrupt triggered gpio chips | ||
63 | * @set: assigns output value for signal "offset" | 65 | * @set: assigns output value for signal "offset" |
64 | * @to_irq: optional hook supporting non-static gpio_to_irq() mappings; | 66 | * @to_irq: optional hook supporting non-static gpio_to_irq() mappings; |
65 | * implementation may not sleep | 67 | * implementation may not sleep |
diff --git a/include/linux/i2c/pcf857x.h b/include/linux/i2c/pcf857x.h index 0767a2a6b2f1..781e6bd06c34 100644 --- a/include/linux/i2c/pcf857x.h +++ b/include/linux/i2c/pcf857x.h | |||
@@ -10,6 +10,7 @@ | |||
10 | * @setup: optional callback issued once the GPIOs are valid | 10 | * @setup: optional callback issued once the GPIOs are valid |
11 | * @teardown: optional callback issued before the GPIOs are invalidated | 11 | * @teardown: optional callback issued before the GPIOs are invalidated |
12 | * @context: optional parameter passed to setup() and teardown() | 12 | * @context: optional parameter passed to setup() and teardown() |
13 | * @irq: optional interrupt number | ||
13 | * | 14 | * |
14 | * In addition to the I2C_BOARD_INFO() state appropriate to each chip, | 15 | * In addition to the I2C_BOARD_INFO() state appropriate to each chip, |
15 | * the i2c_board_info used with the pcf875x driver must provide its | 16 | * the i2c_board_info used with the pcf875x driver must provide its |
@@ -39,6 +40,8 @@ struct pcf857x_platform_data { | |||
39 | int gpio, unsigned ngpio, | 40 | int gpio, unsigned ngpio, |
40 | void *context); | 41 | void *context); |
41 | void *context; | 42 | void *context; |
43 | |||
44 | int irq; | ||
42 | }; | 45 | }; |
43 | 46 | ||
44 | #endif /* __LINUX_PCF857X_H */ | 47 | #endif /* __LINUX_PCF857X_H */ |