breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-01-25 15:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Browse Source 
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
This commit is contained in:
Linus Torvalds
2015-06-23 16:05:37 -07:00
parent acd53127c4 f451e76f89
commit 5262f25f09
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/uapi/linux/hsi/cs-protocol.h
View File

@@ -75,6 +75,15 @@ struct cs_buffer_config {
__u32 reserved[4];
};
/*
* 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'