diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-30 12:57:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-30 12:57:26 +0100 |
| commit | 6dfae59d37aec535db5e462db1a1ff76c5e3fa25 (patch) | |
| tree | 47ab16ca5cd789ff9d457688b4e1678f719c1f59 /include | |
| parent | 1ba0b52ea73bd46ff053edea21f5630f5277fefe (diff) | |
| parent | 24bd2afda8ce633385a3c96aa51181008d7252da (diff) | |
Merge remote-tracking branch 'regulator/for-next' into tmp
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/driver.h | 4 | ||||
| -rw-r--r-- | include/linux/soc/qcom/smd-rpm.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 9a911bb5fb61..29d920516e0b 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -277,9 +277,9 @@ enum regulator_type { * @curr_table: Current limit mapping table (if table based mapping) * * @vsel_range_reg: Register for range selector when using pickable ranges - * and regulator_regmap_X_voltage_X_pickable functions. + * and ``regulator_map_*_voltage_*_pickable`` functions. * @vsel_range_mask: Mask for register bitfield used for range selector - * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ + * @vsel_reg: Register for selector when using ``regulator_map_*_voltage_*`` * @vsel_mask: Mask for register bitfield used for selector * @vsel_step: Specify the resolution of selector stepping when setting * voltage. If 0, then no stepping is done (requested selector is diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h index 9e4fdd861a51..da304ce8c8f7 100644 --- a/include/linux/soc/qcom/smd-rpm.h +++ b/include/linux/soc/qcom/smd-rpm.h @@ -10,6 +10,7 @@ struct qcom_smd_rpm; /* * Constants used for addressing resources in the RPM. */ +#define QCOM_SMD_RPM_BBYB 0x62796262 #define QCOM_SMD_RPM_BOBB 0x62626f62 #define QCOM_SMD_RPM_BOOST 0x61747362 #define QCOM_SMD_RPM_BUS_CLK 0x316b6c63 |