mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 13:23:02 -04:00
Merge tag 'regulator-fix-v7.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "There's one fix here for a data entry error in the voltage mapping in the fp9931 driver, and a device ID addition for a LDO in the Qualcomm PM8350b that's just a trivial quirk" * tag 'regulator-fix-v7.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: fp9931: Fix VPOS/VNEG voltage selector table regulator: qcom-rpmh: Add support for PM8350B regulator: dt-bindings: qcom,rpmh: Add support for PM8350B
This commit is contained in:
@@ -47,6 +47,7 @@ description: |
|
||||
For PM8150, smps1 - smps10, ldo1 - ldo18
|
||||
For PM8150L, smps1 - smps8, ldo1 - ldo11, bob, flash, rgb
|
||||
For PM8350, smps1 - smps12, ldo1 - ldo10
|
||||
For PM8350B, ldo1
|
||||
For PM8350C, smps1 - smps10, ldo1 - ldo13, bob
|
||||
For PM8450, smps1 - smps6, ldo1 - ldo4
|
||||
For PM8550, smps1 - smps6, ldo1 - ldo17, bob1 - bob2
|
||||
@@ -82,6 +83,7 @@ properties:
|
||||
- qcom,pm8150-rpmh-regulators
|
||||
- qcom,pm8150l-rpmh-regulators
|
||||
- qcom,pm8350-rpmh-regulators
|
||||
- qcom,pm8350b-rpmh-regulators
|
||||
- qcom,pm8350c-rpmh-regulators
|
||||
- qcom,pm8450-rpmh-regulators
|
||||
- qcom,pm8550-rpmh-regulators
|
||||
@@ -337,6 +339,15 @@ allOf:
|
||||
patternProperties:
|
||||
"^vdd-s([1-9]|1[0-2])-supply$": true
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- qcom,pm8350b-rpmh-regulators
|
||||
then:
|
||||
properties:
|
||||
vdd-l1-supply: true
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
|
||||
@@ -37,48 +37,18 @@ struct fp9931_data {
|
||||
};
|
||||
|
||||
static const unsigned int VPOSNEG_table[] = {
|
||||
7040000,
|
||||
7040000,
|
||||
7040000,
|
||||
7040000,
|
||||
7040000,
|
||||
7040000,
|
||||
7260000,
|
||||
7490000,
|
||||
7710000,
|
||||
7930000,
|
||||
8150000,
|
||||
8380000,
|
||||
8600000,
|
||||
8820000,
|
||||
9040000,
|
||||
9270000,
|
||||
9490000,
|
||||
9710000,
|
||||
9940000,
|
||||
10160000,
|
||||
10380000,
|
||||
10600000,
|
||||
10830000,
|
||||
11050000,
|
||||
11270000,
|
||||
11490000,
|
||||
11720000,
|
||||
11940000,
|
||||
12160000,
|
||||
12380000,
|
||||
12610000,
|
||||
12830000,
|
||||
13050000,
|
||||
13280000,
|
||||
13500000,
|
||||
13720000,
|
||||
13940000,
|
||||
14170000,
|
||||
14390000,
|
||||
14610000,
|
||||
14830000,
|
||||
15060000,
|
||||
7040000, 7040000, 7040000, 7040000, 7040000, /* 00h-04h */
|
||||
7260000, 7490000, 7710000, 7930000, 8150000, 8380000, /* 05h-0Ah */
|
||||
8600000, 8820000, 9040000, 9270000, 9490000, 9710000, /* 0Bh-10h */
|
||||
9940000, 10160000, 10380000, 10600000, 10830000, 11050000, /* 11h-16h */
|
||||
11270000, 11490000, 11720000, 11940000, 12160000, 12380000, /* 17h-1Ch */
|
||||
12610000, 12830000, 13050000, 13280000, 13500000, 13720000, /* 1Dh-22h */
|
||||
13940000, 14170000, 14390000, 14610000, 14830000, 15060000, /* 23h-28h */
|
||||
/* 29h-3Fh: clamped to 15.06V per datasheet */
|
||||
15060000, 15060000, 15060000, 15060000, 15060000, 15060000,
|
||||
15060000, 15060000, 15060000, 15060000, 15060000, 15060000,
|
||||
15060000, 15060000, 15060000, 15060000, 15060000, 15060000,
|
||||
15060000, 15060000, 15060000, 15060000, 15060000,
|
||||
};
|
||||
|
||||
static const struct hwmon_channel_info *fp9931_info[] = {
|
||||
|
||||
@@ -1269,6 +1269,11 @@ static const struct rpmh_vreg_init_data pm8350_vreg_data[] = {
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct rpmh_vreg_init_data pm8350b_vreg_data[] = {
|
||||
RPMH_VREG("ldo1", LDO, 1, &pmic5_nldo, "vdd-l1"),
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct rpmh_vreg_init_data pm8350c_vreg_data[] = {
|
||||
RPMH_VREG("smps1", SMPS, 1, &pmic5_hfsmps515, "vdd-s1"),
|
||||
RPMH_VREG("smps2", SMPS, 2, &pmic5_ftsmps510, "vdd-s2"),
|
||||
@@ -1868,6 +1873,10 @@ static const struct of_device_id __maybe_unused rpmh_regulator_match_table[] = {
|
||||
.compatible = "qcom,pm8350-rpmh-regulators",
|
||||
.data = pm8350_vreg_data,
|
||||
},
|
||||
{
|
||||
.compatible = "qcom,pm8350b-rpmh-regulators",
|
||||
.data = pm8350b_vreg_data,
|
||||
},
|
||||
{
|
||||
.compatible = "qcom,pm8350c-rpmh-regulators",
|
||||
.data = pm8350c_vreg_data,
|
||||
|
||||
Reference in New Issue
Block a user