From e18788afebd12a53b3e173d5b1390a785346da2e Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sun, 28 May 2017 16:10:21 +0100 Subject: [PATCH] Revert "iio: hi8435: cleanup reset gpio" This reverts commit 61305664a542f874283f74bf0b27ddb31f5045d7. This commit was applied prematurely and will break some existing situations where the signal is inverted as part of voltage level conversions. Signed-off-by: Jonathan Cameron --- drivers/iio/adc/hi8435.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c index 1115913e3b13..adf7dc712937 100644 --- a/drivers/iio/adc/hi8435.c +++ b/drivers/iio/adc/hi8435.c @@ -476,15 +476,13 @@ static int hi8435_probe(struct spi_device *spi) priv->spi = spi; reset_gpio = devm_gpiod_get(&spi->dev, NULL, GPIOD_OUT_LOW); - if (!IS_ERR(reset_gpio)) { - /* need >=100ns low pulse to reset chip */ - gpiod_set_raw_value_cansleep(reset_gpio, 0); - udelay(1); - gpiod_set_raw_value_cansleep(reset_gpio, 1); - } else { - /* s/w reset chip if h/w reset is not available */ + if (IS_ERR(reset_gpio)) { + /* chip s/w reset if h/w reset failed */ hi8435_writeb(priv, HI8435_CTRL_REG, HI8435_CTRL_SRST); hi8435_writeb(priv, HI8435_CTRL_REG, 0); + } else { + udelay(5); + gpiod_set_value(reset_gpio, 1); } spi_set_drvdata(spi, idev);