Merge tag 'regulator-fix-v5.6-rc4' of... (43c63729) · Commits · 戴 / test

Merge tag 'regulator-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator fixes from Mark Brown: "A couple of small fixes, one for a minor issue in the stm32-vrefbuf driver and a documentation fix in the Qualcomm code" * tag 'regulator-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling regulator: qcom_spmi: Fix docs for PM8004

Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ The regulator node houses sub-nodes for each regulator within the device. Each
		sub-node is identified using the node's name, with valid values listed for each
		of the PMICs below.

		pm8005:
		pm8004:
		s2, s5

		pm8005:

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,
		};