diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:05:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:05:37 -0700 |
| commit | 5262f25f0983ff6f2c21e3dadcfd0c809e5aa286 (patch) | |
| tree | a80cc717cef84707d6751042b40e1307f838daf4 /include | |
| parent | acd53127c4adbd34570b221e7ea1f7fc94aea923 (diff) | |
| parent | f451e76f896922137f8316cb071ae2cab78091ad (diff) | |
| download | linux-5262f25f0983ff6f2c21e3dadcfd0c809e5aa286.tar.bz2 | |
Merge tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
"Misc fixes"
* tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction
HSI: nokia-modem: Reduce missing driver message to debug level
HSI: cmt_speech: fix timestamp interface
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/hsi/cs-protocol.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h index 4957bba57cbe..f153d6ea7c62 100644 --- a/include/uapi/linux/hsi/cs-protocol.h +++ b/include/uapi/linux/hsi/cs-protocol.h @@ -76,6 +76,15 @@ struct cs_buffer_config { }; /* + * struct for monotonic timestamp taken when the + * last control command was received + */ +struct cs_timestamp { + __u32 tv_sec; /* seconds */ + __u32 tv_nsec; /* nanoseconds */ +}; + +/* * Struct describing the layout and contents of the driver mmap area. * This information is meant as read-only information for the application. */ @@ -91,11 +100,8 @@ struct cs_mmap_config_block { __u32 rx_ptr; __u32 rx_ptr_boundary; __u32 reserved3[2]; - /* - * if enabled with CS_FEAT_TSTAMP_RX_CTRL, monotonic - * timestamp taken when the last control command was received - */ - struct timespec tstamp_rx_ctrl; + /* enabled with CS_FEAT_TSTAMP_RX_CTRL */ + struct cs_timestamp tstamp_rx_ctrl; }; #define CS_IO_MAGIC 'C' |