History

Merge branch 'regulator-5.7' into regulator-next

Mark Brown committed 6 years ago

Commit 24bd2af2 parents bae4cb9 86332c321 files · +834 −45Browse files

Showing the changes to include/linux (2 of 21 files). Show all

Unified · Split

2 files
  1. include/linux/regulator/driver.h +2 −2
  2. include/linux/soc/qcom/smd-rpm.h +1 −0
include/linux/regulator/driver.h+2−2
@@ -277,9 +277,9 @@ enum regulator_type { · 276 unmodified lines
277 * @curr_table: Current limit mapping table (if table based mapping)277 * @curr_table: Current limit mapping table (if table based mapping)
278 *278 *
279 * @vsel_range_reg: Register for range selector when using pickable ranges279 * @vsel_range_reg: Register for range selector when using pickable ranges
280 * and regulator_regmap_X_voltage_X_pickable functions.280 * and ``regulator_map_*_voltage_*_pickable`` functions.
281 * @vsel_range_mask: Mask for register bitfield used for range selector281 * @vsel_range_mask: Mask for register bitfield used for range selector
282 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_282 * @vsel_reg: Register for selector when using ``regulator_map_*_voltage_*``
283 * @vsel_mask: Mask for register bitfield used for selector283 * @vsel_mask: Mask for register bitfield used for selector
284 * @vsel_step: Specify the resolution of selector stepping when setting284 * @vsel_step: Specify the resolution of selector stepping when setting
285 * voltage. If 0, then no stepping is done (requested selector is285 * voltage. If 0, then no stepping is done (requested selector is
include/linux/soc/qcom/smd-rpm.h+1−0
@@ -10,6 +10,7 @@ struct qcom_smd_rpm; · 9 unmodified lines
10/*10/*
11 * Constants used for addressing resources in the RPM.11 * Constants used for addressing resources in the RPM.
12 */12 */
13#define QCOM_SMD_RPM_BBYB 0x62796262
13#define QCOM_SMD_RPM_BOBB 0x62626f6214#define QCOM_SMD_RPM_BOBB 0x62626f62
14#define QCOM_SMD_RPM_BOOST 0x6174736215#define QCOM_SMD_RPM_BOOST 0x61747362
15#define QCOM_SMD_RPM_BUS_CLK 0x316b6c6316#define QCOM_SMD_RPM_BUS_CLK 0x316b6c63

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t