Merge branch 'regulator-5.11' into regulator-5.12

This commit is contained in:
Mark Brown
2021-01-04 17:09:23 +00:00

View File

@@ -889,7 +889,7 @@ config REGULATOR_QCOM_RPM
config REGULATOR_QCOM_RPMH config REGULATOR_QCOM_RPMH
tristate "Qualcomm Technologies, Inc. RPMh regulator driver" tristate "Qualcomm Technologies, Inc. RPMh regulator driver"
depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST) depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST)
depends on QCOM_COMMAND_DB || !QCOM_COMMAND_DB depends on QCOM_COMMAND_DB || (QCOM_COMMAND_DB=n && COMPILE_TEST)
help help
This driver supports control of PMIC regulators via the RPMh hardware This driver supports control of PMIC regulators via the RPMh hardware
block found on Qualcomm Technologies Inc. SoCs. RPMh regulator block found on Qualcomm Technologies Inc. SoCs. RPMh regulator