diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-10-05 16:54:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-05 16:54:56 +0100 |
| commit | c6e70a6fd5ceff381059e600156d78c1b94b7c60 (patch) | |
| tree | cfbe62ca93677505433a4127632d4b8b74e5bb52 /include/linux | |
| parent | Linux 5.9-rc8 (diff) | |
| parent | regulator: bd9576: Fix print (diff) | |
| download | wireguard-linux-c6e70a6fd5ceff381059e600156d78c1b94b7c60.tar.xz wireguard-linux-c6e70a6fd5ceff381059e600156d78c1b94b7c60.zip | |
Merge remote-tracking branch 'regulator/for-5.10' into regulator-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/driver.h | 3 | ||||
| -rw-r--r-- | include/linux/soc/qcom/smd-rpm.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 8539f34ae42b..11cade73726c 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -533,9 +533,6 @@ int regulator_set_current_limit_regmap(struct regulator_dev *rdev, int regulator_get_current_limit_regmap(struct regulator_dev *rdev); void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data); -void regulator_lock(struct regulator_dev *rdev); -void regulator_unlock(struct regulator_dev *rdev); - /* * Helper functions intended to be used by regulator drivers prior registering * their regulators. diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h index da304ce8c8f7..f2645ec52520 100644 --- a/include/linux/soc/qcom/smd-rpm.h +++ b/include/linux/soc/qcom/smd-rpm.h @@ -19,6 +19,10 @@ struct qcom_smd_rpm; #define QCOM_SMD_RPM_CLK_BUF_A 0x616B6C63 #define QCOM_SMD_RPM_LDOA 0x616f646c #define QCOM_SMD_RPM_LDOB 0x626F646C +#define QCOM_SMD_RPM_RWCX 0x78637772 +#define QCOM_SMD_RPM_RWMX 0x786d7772 +#define QCOM_SMD_RPM_RWLC 0x636c7772 +#define QCOM_SMD_RPM_RWLM 0x6d6c7772 #define QCOM_SMD_RPM_MEM_CLK 0x326b6c63 #define QCOM_SMD_RPM_MISC_CLK 0x306b6c63 #define QCOM_SMD_RPM_NCPA 0x6170636E |