iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd' into regulator-linus

Browse Source
This commit is contained in:
Mark Brown 2016-09-06 12:31:34 +01:00
commit 78cefcbe60
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/max14577-regulator.c
View File

@ -2,7 +2,7 @@
* max14577.c - Regulator driver for the Maxim 14577/77836 * max14577.c - Regulator driver for the Maxim 14577/77836
* *
* Copyright (C) 2013,2014 Samsung Electronics * Copyright (C) 2013,2014 Samsung Electronics
* Krzysztof Kozlowski <k.kozlowski@samsung.com> * Krzysztof Kozlowski <krzk@kernel.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -331,7 +331,7 @@ static void __exit max14577_regulator_exit(void)
} }
module_exit(max14577_regulator_exit); module_exit(max14577_regulator_exit);
MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>"); MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
MODULE_DESCRIPTION("Maxim 14577/77836 regulator driver"); MODULE_DESCRIPTION("Maxim 14577/77836 regulator driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:max14577-regulator"); MODULE_ALIAS("platform:max14577-regulator");

4
drivers/regulator/max77693-regulator.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2013-2015 Samsung Electronics * Copyright (C) 2013-2015 Samsung Electronics
* Jonghwa Lee <jonghwa3.lee@samsung.com> * Jonghwa Lee <jonghwa3.lee@samsung.com>
* Krzysztof Kozlowski <k.kozlowski.k@gmail.com> * Krzysztof Kozlowski <krzk@kernel.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -314,5 +314,5 @@ module_exit(max77693_pmic_cleanup);
MODULE_DESCRIPTION("MAXIM 77693/77843 regulator driver"); MODULE_DESCRIPTION("MAXIM 77693/77843 regulator driver");
MODULE_AUTHOR("Jonghwa Lee <jonghwa3.lee@samsung.com>"); MODULE_AUTHOR("Jonghwa Lee <jonghwa3.lee@samsung.com>");
MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski.k@gmail.com>"); MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

30
drivers/regulator/qcom_smd-regulator.c
View File

@ -178,20 +178,21 @@ static const struct regulator_desc pma8084_hfsmps = {
static const struct regulator_desc pma8084_ftsmps = { static const struct regulator_desc pma8084_ftsmps = {
.linear_ranges = (struct regulator_linear_range[]) { .linear_ranges = (struct regulator_linear_range[]) {
REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000), REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000),
REGULATOR_LINEAR_RANGE(700000, 185, 339, 10000), REGULATOR_LINEAR_RANGE(1280000, 185, 261, 10000),
}, },
.n_linear_ranges = 2, .n_linear_ranges = 2,
.n_voltages = 340, .n_voltages = 262,
.ops = &rpm_smps_ldo_ops, .ops = &rpm_smps_ldo_ops,
}; };
static const struct regulator_desc pma8084_pldo = { static const struct regulator_desc pma8084_pldo = {
.linear_ranges = (struct regulator_linear_range[]) { .linear_ranges = (struct regulator_linear_range[]) {
REGULATOR_LINEAR_RANGE(750000, 0, 30, 25000), REGULATOR_LINEAR_RANGE( 750000, 0, 63, 12500),
REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000), REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000),
REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000),
}, },
.n_linear_ranges = 2, .n_linear_ranges = 3,
.n_voltages = 100, .n_voltages = 164,
.ops = &rpm_smps_ldo_ops, .ops = &rpm_smps_ldo_ops,
}; };
@ -221,29 +222,30 @@ static const struct regulator_desc pm8x41_hfsmps = {
static const struct regulator_desc pm8841_ftsmps = { static const struct regulator_desc pm8841_ftsmps = {
.linear_ranges = (struct regulator_linear_range[]) { .linear_ranges = (struct regulator_linear_range[]) {
REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000), REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000),
REGULATOR_LINEAR_RANGE(700000, 185, 339, 10000), REGULATOR_LINEAR_RANGE(1280000, 185, 261, 10000),
}, },
.n_linear_ranges = 2, .n_linear_ranges = 2,
.n_voltages = 340, .n_voltages = 262,
.ops = &rpm_smps_ldo_ops, .ops = &rpm_smps_ldo_ops,
}; };
static const struct regulator_desc pm8941_boost = { static const struct regulator_desc pm8941_boost = {
.linear_ranges = (struct regulator_linear_range[]) { .linear_ranges = (struct regulator_linear_range[]) {
REGULATOR_LINEAR_RANGE(4000000, 0, 15, 100000), REGULATOR_LINEAR_RANGE(4000000, 0, 30, 50000),
}, },
.n_linear_ranges = 1, .n_linear_ranges = 1,
.n_voltages = 16, .n_voltages = 31,
.ops = &rpm_smps_ldo_ops, .ops = &rpm_smps_ldo_ops,
}; };
static const struct regulator_desc pm8941_pldo = { static const struct regulator_desc pm8941_pldo = {
.linear_ranges = (struct regulator_linear_range[]) { .linear_ranges = (struct regulator_linear_range[]) {
REGULATOR_LINEAR_RANGE( 750000, 0, 30, 25000), REGULATOR_LINEAR_RANGE( 750000, 0, 63, 12500),
REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000), REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000),
REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000),
}, },
.n_linear_ranges = 2, .n_linear_ranges = 3,
.n_voltages = 100, .n_voltages = 164,
.ops = &rpm_smps_ldo_ops, .ops = &rpm_smps_ldo_ops,
}; };