diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/gpio/driver.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/gpio/driver.h')
| -rw-r--r-- | include/linux/gpio/driver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 5382b5183b7e..0ea328e71ec9 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h | |||
| @@ -201,6 +201,8 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) | |||
| 201 | * @reg_set: output set register (out=high) for generic GPIO | 201 | * @reg_set: output set register (out=high) for generic GPIO |
| 202 | * @reg_clr: output clear register (out=low) for generic GPIO | 202 | * @reg_clr: output clear register (out=low) for generic GPIO |
| 203 | * @reg_dir: direction setting register for generic GPIO | 203 | * @reg_dir: direction setting register for generic GPIO |
| 204 | * @bgpio_dir_inverted: indicates that the direction register is inverted | ||
| 205 | * (gpiolib private state variable) | ||
| 204 | * @bgpio_bits: number of register bits used for a generic GPIO i.e. | 206 | * @bgpio_bits: number of register bits used for a generic GPIO i.e. |
| 205 | * <register width> * 8 | 207 | * <register width> * 8 |
| 206 | * @bgpio_lock: used to lock chip->bgpio_data. Also, this is needed to keep | 208 | * @bgpio_lock: used to lock chip->bgpio_data. Also, this is needed to keep |
| @@ -267,6 +269,7 @@ struct gpio_chip { | |||
| 267 | void __iomem *reg_set; | 269 | void __iomem *reg_set; |
| 268 | void __iomem *reg_clr; | 270 | void __iomem *reg_clr; |
| 269 | void __iomem *reg_dir; | 271 | void __iomem *reg_dir; |
| 272 | bool bgpio_dir_inverted; | ||
| 270 | int bgpio_bits; | 273 | int bgpio_bits; |
| 271 | spinlock_t bgpio_lock; | 274 | spinlock_t bgpio_lock; |
| 272 | unsigned long bgpio_data; | 275 | unsigned long bgpio_data; |
