diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:05:58 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:34 -0700 |
| commit | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (patch) | |
| tree | 3accafab470e063df54a08bde52a6062e562d467 /include/linux/platform_data | |
| parent | a25960e811a1aa56814deed47e257c1cddc90084 (diff) | |
| parent | 9ccd6e0d99208ca9a7bb514cc956b1de6800940b (diff) | |
| download | olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.tar.xz olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.zip | |
Merge branch 'mindtribe_dev' into android-3.10-bringup
Conflicts:
arch/arm/boot/dts/omap3_h1.dts
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c
Both resolved.
Change-Id: I42c070961bff246b07179dcaae1fc784dddb0328
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/serial-omap.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/platform_data/serial-omap.h b/include/linux/platform_data/serial-omap.h index 9990f7cd03c..b430bbc3093 100644 --- a/include/linux/platform_data/serial-omap.h +++ b/include/linux/platform_data/serial-omap.h @@ -45,10 +45,13 @@ struct omap_uart_port_info { bool wakeup_capable; bool open_close_pm; unsigned int rx_trig; + bool rts_wait; int (*get_context_loss_count)(struct device *); void (*enable_wakeup)(struct device *, bool); - void (*wake_peer)(struct uart_port *); + void (*wake_peer)(struct uart_port *); + void (*rts_enable_fn)(void); + void (*rts_disable_fn)(void); }; extern void omap_uart_remove_wakeup(struct device *dev); |