diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iio/types.h | 4 | ||||
| -rw-r--r-- | include/linux/mfd/tps65910.h | 3 | ||||
| -rw-r--r-- | include/linux/platform_data/serial-omap.h | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h index a0aff63cf74..75fdea40e92 100644 --- a/include/linux/iio/types.h +++ b/include/linux/iio/types.h @@ -34,6 +34,10 @@ enum iio_chan_type { IIO_PASSIVE, IIO_GESTURE, IIO_FUSION, + IIO_SIGN_MOTION, + IIO_STEP_COUNTER, + IIO_TILT, + IIO_STEP_DETECTOR, }; enum iio_modifier { diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h index 20e433e551e..7f0ec4340a3 100644 --- a/include/linux/mfd/tps65910.h +++ b/include/linux/mfd/tps65910.h @@ -878,8 +878,9 @@ struct tps65910_board { int vmbch2_threshold; bool en_ck32k_xtal; bool en_dev_slp; + bool sleepsig_pol; bool pm_off; - struct tps65910_sleep_keepon_data *slp_keepon; + struct tps65910_sleep_keepon_data slp_keepon; bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO]; unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS]; struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS]; diff --git a/include/linux/platform_data/serial-omap.h b/include/linux/platform_data/serial-omap.h index afba9011b52..9990f7cd03c 100644 --- a/include/linux/platform_data/serial-omap.h +++ b/include/linux/platform_data/serial-omap.h @@ -48,10 +48,14 @@ struct omap_uart_port_info { int (*get_context_loss_count)(struct device *); void (*enable_wakeup)(struct device *, bool); + void (*wake_peer)(struct uart_port *); }; extern void omap_uart_remove_wakeup(struct device *dev); extern void omap_uart_enable_wakeup(struct device *dev, bool enable); extern int omap_pm_get_dev_context_loss_count(struct device *dev); +extern int omap_serial_ext_uart_enable(u8 port_id); +extern int omap_serial_ext_uart_disable(u8 port_id); + #endif /* __OMAP_SERIAL_H__ */ |