]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Revert "iio: hi8435: cleanup reset gpio"
authorJonathan Cameron <jic23@kernel.org>
Sun, 28 May 2017 15:10:21 +0000 (16:10 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 3 Jun 2017 08:55:24 +0000 (09:55 +0100)
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 <jic23@kernel.org>
drivers/iio/adc/hi8435.c

index 1115913e3b137ba124154fe710ff585a1fed51ae..adf7dc712937c4bc1d47b923f82a319b50e65b6e 100644 (file)
@@ -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);