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
Showing the changes to include/uapi (1 of 3 files). Show all
Unified · Split
| @@ -75,6 +75,15 @@ struct cs_buffer_config { · 74 unmodified lines | ||
| 75 | 75 | __u32 reserved[4]; |
| 76 | 76 | }; |
| 77 | 77 | |
| 78 | +/* | |
| 79 | + * struct for monotonic timestamp taken when the | |
| 80 | + * last control command was received | |
| 81 | + */ | |
| 82 | +struct cs_timestamp { | |
| 83 | + __u32 tv_sec; /* seconds */ | |
| 84 | + __u32 tv_nsec; /* nanoseconds */ | |
| 85 | +}; | |
| 86 | + | |
| 78 | 87 | /* |
| 79 | 88 | * Struct describing the layout and contents of the driver mmap area. |
| 80 | 89 | * This information is meant as read-only information for the application. |
| @@ -91,11 +100,8 @@ struct cs_mmap_config_block { · 10 unmodified lines | ||
| 91 | 100 | __u32 rx_ptr; |
| 92 | 101 | __u32 rx_ptr_boundary; |
| 93 | 102 | __u32 reserved3[2]; |
| 94 | − /* | |
| 95 | − * if enabled with CS_FEAT_TSTAMP_RX_CTRL, monotonic | |
| 96 | − * timestamp taken when the last control command was received | |
| 97 | − */ | |
| 98 | − struct timespec tstamp_rx_ctrl; | |
| 103 | + /* enabled with CS_FEAT_TSTAMP_RX_CTRL */ | |
| 104 | + struct cs_timestamp tstamp_rx_ctrl; | |
| 99 | 105 | }; |
| 100 | 106 | |
| 101 | 107 | #define CS_IO_MAGIC 'C' |