diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-25 16:32:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-25 16:32:28 -0500 |
| commit | 525d0ae7a2ee1b70f09936dbac56b0d4920fa005 (patch) | |
| tree | 684d4e6657b54d7279826eff9b6088e4ba0e16ef /include | |
| parent | d9ac2d99787d08c0e3f777dac5aeaa3fed61b692 (diff) | |
| parent | fbbe83c52bc0d52398de72d7df1857cc9b36244e (diff) | |
| download | linux-stable-525d0ae7a2ee1b70f09936dbac56b0d4920fa005.tar.gz linux-stable-525d0ae7a2ee1b70f09936dbac56b0d4920fa005.tar.bz2 linux-stable-525d0ae7a2ee1b70f09936dbac56b0d4920fa005.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2018-01-25
Here's one last bluetooth-next pull request for the 4.16 kernel:
- Improved support for Intel controllers
- New set_parity method to serdev (agreed with maintainers to be taken
through bluetooth-next)
- Fix error path in hci_bcm (missing call to serdev close)
- New ID for BCM4343A0 UART controller
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serdev.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/serdev.h b/include/linux/serdev.h index d609e6dc5bad..a73d87b483b4 100644 --- a/include/linux/serdev.h +++ b/include/linux/serdev.h @@ -76,6 +76,12 @@ static inline struct serdev_device_driver *to_serdev_device_driver(struct device return container_of(d, struct serdev_device_driver, driver); } +enum serdev_parity { + SERDEV_PARITY_NONE, + SERDEV_PARITY_EVEN, + SERDEV_PARITY_ODD, +}; + /* * serdev controller structures */ @@ -86,6 +92,7 @@ struct serdev_controller_ops { int (*open)(struct serdev_controller *); void (*close)(struct serdev_controller *); void (*set_flow_control)(struct serdev_controller *, bool); + int (*set_parity)(struct serdev_controller *, enum serdev_parity); unsigned int (*set_baudrate)(struct serdev_controller *, unsigned int); void (*wait_until_sent)(struct serdev_controller *, long); int (*get_tiocm)(struct serdev_controller *); @@ -298,6 +305,9 @@ static inline int serdev_device_set_rts(struct serdev_device *serdev, bool enabl return serdev_device_set_tiocm(serdev, 0, TIOCM_RTS); } +int serdev_device_set_parity(struct serdev_device *serdev, + enum serdev_parity parity); + /* * serdev hooks into TTY core */ |