mirror of https://gitee.com/openkylin/linux.git
HSI changes for the v4.2 series
* 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:
commit
5262f25f09
|
@ -451,9 +451,14 @@ static void cs_hsi_read_on_control_complete(struct hsi_msg *msg)
|
|||
dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd);
|
||||
cs_release_cmd(msg);
|
||||
if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) {
|
||||
struct timespec *tstamp =
|
||||
struct timespec tspec;
|
||||
struct cs_timestamp *tstamp =
|
||||
&hi->mmap_cfg->tstamp_rx_ctrl;
|
||||
do_posix_clock_monotonic_gettime(tstamp);
|
||||
|
||||
ktime_get_ts(&tspec);
|
||||
|
||||
tstamp->tv_sec = (__u32) tspec.tv_sec;
|
||||
tstamp->tv_nsec = (__u32) tspec.tv_nsec;
|
||||
}
|
||||
spin_unlock(&hi->lock);
|
||||
|
||||
|
|
|
@ -112,7 +112,8 @@ static int nokia_modem_gpio_probe(struct device *dev)
|
|||
modem->gpio_amount = gpio_count;
|
||||
|
||||
for (i = 0; i < gpio_count; i++) {
|
||||
modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i);
|
||||
modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i,
|
||||
GPIOD_OUT_LOW);
|
||||
if (IS_ERR(modem->gpios[i].gpio)) {
|
||||
dev_err(dev, "Could not get gpio %d\n", i);
|
||||
return PTR_ERR(modem->gpios[i].gpio);
|
||||
|
@ -125,10 +126,6 @@ static int nokia_modem_gpio_probe(struct device *dev)
|
|||
return err;
|
||||
}
|
||||
|
||||
err = gpiod_direction_output(modem->gpios[i].gpio, 0);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = gpiod_export(modem->gpios[i].gpio, 0);
|
||||
if (err)
|
||||
return err;
|
||||
|
@ -208,7 +205,7 @@ static int nokia_modem_probe(struct device *dev)
|
|||
|
||||
err = device_attach(&modem->ssi_protocol->device);
|
||||
if (err == 0) {
|
||||
dev_err(dev, "Missing ssi-protocol driver\n");
|
||||
dev_dbg(dev, "Missing ssi-protocol driver\n");
|
||||
err = -EPROBE_DEFER;
|
||||
goto error3;
|
||||
} else if (err < 0) {
|
||||
|
@ -231,7 +228,7 @@ static int nokia_modem_probe(struct device *dev)
|
|||
|
||||
err = device_attach(&modem->cmt_speech->device);
|
||||
if (err == 0) {
|
||||
dev_err(dev, "Missing cmt-speech driver\n");
|
||||
dev_dbg(dev, "Missing cmt-speech driver\n");
|
||||
err = -EPROBE_DEFER;
|
||||
goto error4;
|
||||
} else if (err < 0) {
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue