diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 10:02:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 10:02:59 +0300 |
| commit | a30514a076cfe4b1962980e946a759f5556cf4a5 (patch) | |
| tree | bd1238ee26ffaa2940f536da52e77eb576f87549 /drivers/iio/imu | |
| parent | f805ef1ce5d695c260986fdf2e28f5d6c98cf3a8 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
| download | linux-a30514a076cfe4b1962980e946a759f5556cf4a5.tar.xz | |
Merge 5.14-rc6 into staging-next
We need the IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/imu')
| -rw-r--r-- | drivers/iio/imu/adis.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c index a5b421f42287..b9a06ca29bee 100644 --- a/drivers/iio/imu/adis.c +++ b/drivers/iio/imu/adis.c @@ -411,12 +411,11 @@ int __adis_initial_startup(struct adis *adis) int ret; /* check if the device has rst pin low */ - gpio = devm_gpiod_get_optional(&adis->spi->dev, "reset", GPIOD_ASIS); + gpio = devm_gpiod_get_optional(&adis->spi->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(gpio)) return PTR_ERR(gpio); if (gpio) { - gpiod_set_value_cansleep(gpio, 1); msleep(10); /* bring device out of reset */ gpiod_set_value_cansleep(gpio, 0); |