summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-09 08:41:53 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-09 08:41:53 +0100
commit9a2dd570591ea1d53284208ab8838c0ab2a08340 (patch)
tree19bdbaded0ca8717198067911a1a91c3d7731a3b /drivers/regulator
parent9211f0a6a91ada1ee28b3fb5f30d79c8a67c73b1 (diff)
parent2c523b344dfa65a3738e7039832044aa133c75fb (diff)
downloadlinux-9a2dd570591ea1d53284208ab8838c0ab2a08340.tar.bz2
Merge 5.6-rc5 into driver-core-next
We need the driver core and debugfs changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/stm32-vrefbuf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c
index bdfaf7edb75a..992bc18101ef 100644
--- a/drivers/regulator/stm32-vrefbuf.c
+++ b/drivers/regulator/stm32-vrefbuf.c
@@ -88,7 +88,7 @@ static int stm32_vrefbuf_disable(struct regulator_dev *rdev)
}
val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);
- val = (val & ~STM32_ENVR) | STM32_HIZ;
+ val &= ~STM32_ENVR;
writel_relaxed(val, priv->base + STM32_VREFBUF_CSR);
pm_runtime_mark_last_busy(priv->dev);
@@ -175,6 +175,7 @@ static const struct regulator_desc stm32_vrefbuf_regu = {
.volt_table = stm32_vrefbuf_voltages,
.n_voltages = ARRAY_SIZE(stm32_vrefbuf_voltages),
.ops = &stm32_vrefbuf_volt_ops,
+ .off_on_delay = 1000,
.type = REGULATOR_VOLTAGE,
.owner = THIS_MODULE,
};