Skip to content

L
linux
Commit a1a7b4f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'regulator-fix-v5.11-rc2' of... 

Merge tag 'regulator-fix-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A few minor driver specific fixes, mostly DT bindings document bits,
  plus a new device ID"

* tag 'regulator-fix-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: qcom-rpmh: add QCOM_COMMAND_DB dependency
  regulator: qcom-rpmh-regulator: correct hfsmps515 definition
  dt-bindings: regulator: qcom,rpmh-regulator: add pm8009 revision
  regulator: bd718x7: Add enable times
  regulator: pf8x00: Use specific compatible strings for devices
parents fc37784d 36836f5b
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 5 deletions
Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
View file @ a1a7b4f3
...@@ -19,7 +19,9 @@ description: | ...@@ -19,7 +19,9 @@ description: |
properties: properties:
compatible: compatible:
enum: enum:
- nxp,pf8x00 - nxp,pf8100
- nxp,pf8121a
- nxp,pf8200
reg: reg:
maxItems: 1 maxItems: 1
...@@ -118,7 +120,7 @@ examples: ...@@ -118,7 +120,7 @@ examples:
#size-cells = <0>; #size-cells = <0>;
pmic@8 { pmic@8 {
compatible = "nxp,pf8x00"; compatible = "nxp,pf8100";
reg = <0x08>; reg = <0x08>;
regulators { regulators {
......
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt
View file @ a1a7b4f3
...@@ -44,6 +44,7 @@ First Level Nodes - PMIC ...@@ -44,6 +44,7 @@ First Level Nodes - PMIC
Definition: Must be one of below: Definition: Must be one of below:
"qcom,pm8005-rpmh-regulators" "qcom,pm8005-rpmh-regulators"
"qcom,pm8009-rpmh-regulators" "qcom,pm8009-rpmh-regulators"
"qcom,pm8009-1-rpmh-regulators"
"qcom,pm8150-rpmh-regulators" "qcom,pm8150-rpmh-regulators"
"qcom,pm8150l-rpmh-regulators" "qcom,pm8150l-rpmh-regulators"
"qcom,pm8350-rpmh-regulators" "qcom,pm8350-rpmh-regulators"
......
drivers/regulator/Kconfig
View file @ a1a7b4f3
...@@ -881,6 +881,7 @@ config REGULATOR_QCOM_RPM ...@@ -881,6 +881,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=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
......
drivers/regulator/bd718x7-regulator.c
View file @ a1a7b4f3
...@@ -15,6 +15,36 @@ ...@@ -15,6 +15,36 @@
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
#include <linux/slab.h> #include <linux/slab.h>
/* Typical regulator startup times as per data sheet in uS */
#define BD71847_BUCK1_STARTUP_TIME 144
#define BD71847_BUCK2_STARTUP_TIME 162
#define BD71847_BUCK3_STARTUP_TIME 162
#define BD71847_BUCK4_STARTUP_TIME 240
#define BD71847_BUCK5_STARTUP_TIME 270
#define BD71847_BUCK6_STARTUP_TIME 200
#define BD71847_LDO1_STARTUP_TIME 440
#define BD71847_LDO2_STARTUP_TIME 370
#define BD71847_LDO3_STARTUP_TIME 310
#define BD71847_LDO4_STARTUP_TIME 400
#define BD71847_LDO5_STARTUP_TIME 530
#define BD71847_LDO6_STARTUP_TIME 400
#define BD71837_BUCK1_STARTUP_TIME 160
#define BD71837_BUCK2_STARTUP_TIME 180
#define BD71837_BUCK3_STARTUP_TIME 180
#define BD71837_BUCK4_STARTUP_TIME 180
#define BD71837_BUCK5_STARTUP_TIME 160
#define BD71837_BUCK6_STARTUP_TIME 240
#define BD71837_BUCK7_STARTUP_TIME 220
#define BD71837_BUCK8_STARTUP_TIME 200
#define BD71837_LDO1_STARTUP_TIME 440
#define BD71837_LDO2_STARTUP_TIME 370
#define BD71837_LDO3_STARTUP_TIME 310
#define BD71837_LDO4_STARTUP_TIME 400
#define BD71837_LDO5_STARTUP_TIME 310
#define BD71837_LDO6_STARTUP_TIME 400
#define BD71837_LDO7_STARTUP_TIME 530
/* /*
* BD718(37/47/50) have two "enable control modes". ON/OFF can either be * BD718(37/47/50) have two "enable control modes". ON/OFF can either be
* controlled by software - or by PMIC internal HW state machine. Whether * controlled by software - or by PMIC internal HW state machine. Whether
...@@ -613,6 +643,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -613,6 +643,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD718XX_REG_BUCK1_CTRL, .enable_reg = BD718XX_REG_BUCK1_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK1_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -646,6 +677,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -646,6 +677,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD718XX_REG_BUCK2_CTRL, .enable_reg = BD718XX_REG_BUCK2_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK2_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -680,6 +712,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -680,6 +712,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.linear_range_selectors = bd71847_buck3_volt_range_sel, .linear_range_selectors = bd71847_buck3_volt_range_sel,
.enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK3_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -706,6 +739,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -706,6 +739,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_range_mask = BD71847_BUCK4_RANGE_MASK, .vsel_range_mask = BD71847_BUCK4_RANGE_MASK,
.linear_range_selectors = bd71847_buck4_volt_range_sel, .linear_range_selectors = bd71847_buck4_volt_range_sel,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK4_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -727,6 +761,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -727,6 +761,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = BD718XX_3RD_NODVS_BUCK_MASK, .vsel_mask = BD718XX_3RD_NODVS_BUCK_MASK,
.enable_reg = BD718XX_REG_3RD_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_3RD_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK5_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -750,6 +785,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -750,6 +785,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = BD718XX_4TH_NODVS_BUCK_MASK, .vsel_mask = BD718XX_4TH_NODVS_BUCK_MASK,
.enable_reg = BD718XX_REG_4TH_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_4TH_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71847_BUCK6_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -775,6 +811,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -775,6 +811,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.linear_range_selectors = bd718xx_ldo1_volt_range_sel, .linear_range_selectors = bd718xx_ldo1_volt_range_sel,
.enable_reg = BD718XX_REG_LDO1_VOLT, .enable_reg = BD718XX_REG_LDO1_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO1_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -796,6 +833,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -796,6 +833,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.n_voltages = ARRAY_SIZE(ldo_2_volts), .n_voltages = ARRAY_SIZE(ldo_2_volts),
.enable_reg = BD718XX_REG_LDO2_VOLT, .enable_reg = BD718XX_REG_LDO2_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO2_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -818,6 +856,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -818,6 +856,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = BD718XX_LDO3_MASK, .vsel_mask = BD718XX_LDO3_MASK,
.enable_reg = BD718XX_REG_LDO3_VOLT, .enable_reg = BD718XX_REG_LDO3_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO3_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -840,6 +879,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -840,6 +879,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = BD718XX_LDO4_MASK, .vsel_mask = BD718XX_LDO4_MASK,
.enable_reg = BD718XX_REG_LDO4_VOLT, .enable_reg = BD718XX_REG_LDO4_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO4_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -865,6 +905,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -865,6 +905,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.linear_range_selectors = bd71847_ldo5_volt_range_sel, .linear_range_selectors = bd71847_ldo5_volt_range_sel,
.enable_reg = BD718XX_REG_LDO5_VOLT, .enable_reg = BD718XX_REG_LDO5_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO5_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -889,6 +930,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { ...@@ -889,6 +930,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = {
.vsel_mask = BD718XX_LDO6_MASK, .vsel_mask = BD718XX_LDO6_MASK,
.enable_reg = BD718XX_REG_LDO6_VOLT, .enable_reg = BD718XX_REG_LDO6_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71847_LDO6_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -942,6 +984,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -942,6 +984,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD718XX_REG_BUCK1_CTRL, .enable_reg = BD718XX_REG_BUCK1_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK1_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -975,6 +1018,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -975,6 +1018,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD718XX_REG_BUCK2_CTRL, .enable_reg = BD718XX_REG_BUCK2_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK2_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -1005,6 +1049,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1005,6 +1049,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD71837_REG_BUCK3_CTRL, .enable_reg = BD71837_REG_BUCK3_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK3_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -1033,6 +1078,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1033,6 +1078,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = DVS_BUCK_RUN_MASK, .vsel_mask = DVS_BUCK_RUN_MASK,
.enable_reg = BD71837_REG_BUCK4_CTRL, .enable_reg = BD71837_REG_BUCK4_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK4_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_parse_cb = buck_set_hw_dvs_levels, .of_parse_cb = buck_set_hw_dvs_levels,
}, },
...@@ -1065,6 +1111,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1065,6 +1111,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.linear_range_selectors = bd71837_buck5_volt_range_sel, .linear_range_selectors = bd71837_buck5_volt_range_sel,
.enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK5_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1088,6 +1135,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1088,6 +1135,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD71837_BUCK6_MASK, .vsel_mask = BD71837_BUCK6_MASK,
.enable_reg = BD718XX_REG_2ND_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_2ND_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK6_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1109,6 +1157,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1109,6 +1157,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD718XX_3RD_NODVS_BUCK_MASK, .vsel_mask = BD718XX_3RD_NODVS_BUCK_MASK,
.enable_reg = BD718XX_REG_3RD_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_3RD_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK7_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1132,6 +1181,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1132,6 +1181,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD718XX_4TH_NODVS_BUCK_MASK, .vsel_mask = BD718XX_4TH_NODVS_BUCK_MASK,
.enable_reg = BD718XX_REG_4TH_NODVS_BUCK_CTRL, .enable_reg = BD718XX_REG_4TH_NODVS_BUCK_CTRL,
.enable_mask = BD718XX_BUCK_EN, .enable_mask = BD718XX_BUCK_EN,
.enable_time = BD71837_BUCK8_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1157,6 +1207,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1157,6 +1207,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.linear_range_selectors = bd718xx_ldo1_volt_range_sel, .linear_range_selectors = bd718xx_ldo1_volt_range_sel,
.enable_reg = BD718XX_REG_LDO1_VOLT, .enable_reg = BD718XX_REG_LDO1_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO1_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1178,6 +1229,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1178,6 +1229,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.n_voltages = ARRAY_SIZE(ldo_2_volts), .n_voltages = ARRAY_SIZE(ldo_2_volts),
.enable_reg = BD718XX_REG_LDO2_VOLT, .enable_reg = BD718XX_REG_LDO2_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO2_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1200,6 +1252,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1200,6 +1252,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD718XX_LDO3_MASK, .vsel_mask = BD718XX_LDO3_MASK,
.enable_reg = BD718XX_REG_LDO3_VOLT, .enable_reg = BD718XX_REG_LDO3_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO3_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1222,6 +1275,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1222,6 +1275,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD718XX_LDO4_MASK, .vsel_mask = BD718XX_LDO4_MASK,
.enable_reg = BD718XX_REG_LDO4_VOLT, .enable_reg = BD718XX_REG_LDO4_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO4_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1246,6 +1300,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1246,6 +1300,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD71837_LDO5_MASK, .vsel_mask = BD71837_LDO5_MASK,
.enable_reg = BD718XX_REG_LDO5_VOLT, .enable_reg = BD718XX_REG_LDO5_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO5_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1272,6 +1327,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1272,6 +1327,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD718XX_LDO6_MASK, .vsel_mask = BD718XX_LDO6_MASK,
.enable_reg = BD718XX_REG_LDO6_VOLT, .enable_reg = BD718XX_REG_LDO6_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO6_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
...@@ -1296,6 +1352,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { ...@@ -1296,6 +1352,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = {
.vsel_mask = BD71837_LDO7_MASK, .vsel_mask = BD71837_LDO7_MASK,
.enable_reg = BD71837_REG_LDO7_VOLT, .enable_reg = BD71837_REG_LDO7_VOLT,
.enable_mask = BD718XX_LDO_EN, .enable_mask = BD718XX_LDO_EN,
.enable_time = BD71837_LDO7_STARTUP_TIME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.init = { .init = {
......
drivers/regulator/pf8x00-regulator.c
View file @ a1a7b4f3
...@@ -469,13 +469,17 @@ static int pf8x00_i2c_probe(struct i2c_client *client) ...@@ -469,13 +469,17 @@ static int pf8x00_i2c_probe(struct i2c_client *client)
} }
static const struct of_device_id pf8x00_dt_ids[] = { static const struct of_device_id pf8x00_dt_ids[] = {
{ .compatible = "nxp,pf8x00",}, { .compatible = "nxp,pf8100",},
{ .compatible = "nxp,pf8121a",},
{ .compatible = "nxp,pf8200",},
{ } { }
}; };
MODULE_DEVICE_TABLE(of, pf8x00_dt_ids); MODULE_DEVICE_TABLE(of, pf8x00_dt_ids);
static const struct i2c_device_id pf8x00_i2c_id[] = { static const struct i2c_device_id pf8x00_i2c_id[] = {
{ "pf8x00", 0 }, { "pf8100", 0 },
{ "pf8121a", 0 },
{ "pf8200", 0 },
{}, {},
}; };
MODULE_DEVICE_TABLE(i2c, pf8x00_i2c_id); MODULE_DEVICE_TABLE(i2c, pf8x00_i2c_id);
......
drivers/regulator/qcom-rpmh-regulator.c
View file @ a1a7b4f3
...@@ -726,7 +726,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { ...@@ -726,7 +726,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = {
static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = {
.regulator_type = VRM, .regulator_type = VRM,
.ops = &rpmh_regulator_vrm_ops, .ops = &rpmh_regulator_vrm_ops,
.voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 1600), .voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 16000),
.n_voltages = 5, .n_voltages = 5,
.pmic_mode_map = pmic_mode_map_pmic5_smps, .pmic_mode_map = pmic_mode_map_pmic5_smps,
.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7