diff options
| author | Mark Brown <broonie@kernel.org> | 2017-11-10 21:33:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-10 21:33:22 +0000 |
| commit | 9b272e61185bc193cd3b6ffe02e24d619f345a67 (patch) | |
| tree | ebf2d3a8e6aacb4db074d84bde28acd63a304811 /drivers/regulator | |
| parent | 28c426c7ad9067b54fed02735f6a32eff4349c25 (diff) | |
| parent | ca5cd8c9400c7eeeda84e34fa773c6c245e65c82 (diff) | |
| download | linux-stable-9b272e61185bc193cd3b6ffe02e24d619f345a67.tar.gz linux-stable-9b272e61185bc193cd3b6ffe02e24d619f345a67.tar.bz2 linux-stable-9b272e61185bc193cd3b6ffe02e24d619f345a67.zip | |
Merge remote-tracking branch 'regulator/topic/qcom-spmi' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/qcom_spmi-regulator.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index c372b244f3da..0241ada47d04 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -1646,11 +1646,20 @@ static const struct spmi_regulator_data pm8994_regulators[] = { { } }; +static const struct spmi_regulator_data pmi8994_regulators[] = { + { "s1", 0x1400, "vdd_s1", }, + { "s2", 0x1700, "vdd_s2", }, + { "s3", 0x1a00, "vdd_s3", }, + { "l1", 0x4000, "vdd_l1", }, + { } +}; + static const struct of_device_id qcom_spmi_regulator_match[] = { { .compatible = "qcom,pm8841-regulators", .data = &pm8841_regulators }, { .compatible = "qcom,pm8916-regulators", .data = &pm8916_regulators }, { .compatible = "qcom,pm8941-regulators", .data = &pm8941_regulators }, { .compatible = "qcom,pm8994-regulators", .data = &pm8994_regulators }, + { .compatible = "qcom,pmi8994-regulators", .data = &pmi8994_regulators }, { } }; MODULE_DEVICE_TABLE(of, qcom_spmi_regulator_match); |