GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HSI changes for the v4.2 series

Browse source 
* misc. fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJViKusAAoJENju1/PIO/qauE8QAKIaXtsWQDhje1tXZO1swNNe
 R4k2rQvnqROJZqLY4Yg4iF5heM+ZTKBc9IjoW48fakF1+m4Z1vo08mDaamHyaJHi
 AKbfH5IYBaQ65aTTTtYRtrZOjOS8dn5ePHuPt85YOzlPszknxPDKZ1bVBs1Ukyo/
 z0VsmD0unNe5x1WBFet3wgrY3wXBrdbKgKhhowgnRRqG1/c9r11dj5rgnc3K2LSt
 Y3gPC7ubmlFp58L/m1a4LCJwCNNx9Ub1S62rN8uOgSNpgPPJg8z4LY6PqmNhL8MZ
 GWBa56TgfCL056jyYlPOsBGgHkTuiwMiJRkelCpK8cVXCh/+DbUM5KjXBkWFFO7I
 UgaoxAJpIG32OZ/COyy8SpNYiq0YEemCwDQq0Tpd3ME9Dy+kjuK2GDsdc+DFhkHK
 L5zkWmqZqH/uiriuU7n1EPI0fE9pyP8+xXffDHhgaPaQekKJO521kQpUhP8Px3pi
 yM8TbLksrkQa7ZrT/etmL8kBoXiqh06ySNOPBuSGwj/EMgLlidAsJfoG73vLONDe
 O52H8X4TOhW6iG6DXfqLWnwQ6Ve7yMbnaeW6Ih5LPRzLr0H848P1N425QW4hVahz
 Lux1fMYmijOgXU4ZEz5tMhnBQUe9xLpIhLcVFTHAKqwS7c+mChpjVyDgWBQSakC/
 e7P4G2Ei+v7ovMnLbppN
 =CTGh
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-06-23 16:05:37 -07:00
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'