提交 e88d6979 编写于 作者: M Mark Kettenis 提交者: Tom Rini

regulator: fix: enable gpio when requested

The fix in commit b7adcdd0 has the side-effect that the regulator
will be disabled when requesting the relevant gpio in
regulator_common_ofdata_to_platdata() and enabled in
regulator_pre_probe() when the regulator was already enabled.
This leads to a short interruption in the 3.3V power to the PCIe
slot on the firefly-rk3399 which makes an ADATA SX8000NP NVMe SSD
unhappy.

Fix this by setting the GPIOD_IS_OUT_ACTIVE flag again when the
'regulator-boot-on' property is set, but check for this property
explicitly instead of relying on the "boot_on" member of
the uclass platdata.
Signed-off-by: NMark Kettenis <kettenis@openbsd.org>
Tested-by: NPatrice Chotard <patrice.chotard@st.com>
上级 287be329
......@@ -466,9 +466,6 @@ static int regulator_pre_probe(struct udevice *dev)
(uc_pdata->min_uA == uc_pdata->max_uA))
uc_pdata->flags |= REGULATOR_FLAG_AUTOSET_UA;
if (uc_pdata->boot_on)
regulator_set_enable(dev, uc_pdata->boot_on);
return 0;
}
......
......@@ -19,6 +19,8 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev,
if (!dev_read_bool(dev, "enable-active-high"))
flags |= GPIOD_ACTIVE_LOW;
if (dev_read_bool(dev, "regulator-boot-on"))
flags |= GPIOD_IS_OUT_ACTIVE;
/* Get optional enable GPIO desc */
gpio = &dev_pdata->gpio;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册