tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown 78cefcbe c6935931

+20 -18
+2 -2
drivers/regulator/max14577-regulator.c
··· 2 2 * max14577.c - Regulator driver for the Maxim 14577/77836 3 3 * 4 4 * Copyright (C) 2013,2014 Samsung Electronics 5 - * Krzysztof Kozlowski <k.kozlowski@samsung.com> 5 + * Krzysztof Kozlowski <krzk@kernel.org> 6 6 * 7 7 * This program is free software; you can redistribute it and/or modify 8 8 * it under the terms of the GNU General Public License as published by ··· 331 331 } 332 332 module_exit(max14577_regulator_exit); 333 333 334 - MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>"); 334 + MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>"); 335 335 MODULE_DESCRIPTION("Maxim 14577/77836 regulator driver"); 336 336 MODULE_LICENSE("GPL"); 337 337 MODULE_ALIAS("platform:max14577-regulator");
+2 -2
drivers/regulator/max77693-regulator.c
··· 3 3 * 4 4 * Copyright (C) 2013-2015 Samsung Electronics 5 5 * Jonghwa Lee <jonghwa3.lee@samsung.com> 6 - * Krzysztof Kozlowski <k.kozlowski.k@gmail.com> 6 + * Krzysztof Kozlowski <krzk@kernel.org> 7 7 * 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License as published by ··· 314 314 315 315 MODULE_DESCRIPTION("MAXIM 77693/77843 regulator driver"); 316 316 MODULE_AUTHOR("Jonghwa Lee <jonghwa3.lee@samsung.com>"); 317 - MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski.k@gmail.com>"); 317 + MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>"); 318 318 MODULE_LICENSE("GPL");
+16 -14
drivers/regulator/qcom_smd-regulator.c
··· 178 178 static const struct regulator_desc pma8084_ftsmps = { 179 179 .linear_ranges = (struct regulator_linear_range[]) { 180 180 REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000), 181 - REGULATOR_LINEAR_RANGE(700000, 185, 339, 10000), 181 + REGULATOR_LINEAR_RANGE(1280000, 185, 261, 10000), 182 182 }, 183 183 .n_linear_ranges = 2, 184 - .n_voltages = 340, 184 + .n_voltages = 262, 185 185 .ops = &rpm_smps_ldo_ops, 186 186 }; 187 187 188 188 static const struct regulator_desc pma8084_pldo = { 189 189 .linear_ranges = (struct regulator_linear_range[]) { 190 - REGULATOR_LINEAR_RANGE(750000, 0, 30, 25000), 191 - REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000), 190 + REGULATOR_LINEAR_RANGE( 750000, 0, 63, 12500), 191 + REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000), 192 + REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000), 192 193 }, 193 - .n_linear_ranges = 2, 194 - .n_voltages = 100, 194 + .n_linear_ranges = 3, 195 + .n_voltages = 164, 195 196 .ops = &rpm_smps_ldo_ops, 196 197 }; 197 198 ··· 222 221 static const struct regulator_desc pm8841_ftsmps = { 223 222 .linear_ranges = (struct regulator_linear_range[]) { 224 223 REGULATOR_LINEAR_RANGE(350000, 0, 184, 5000), 225 - REGULATOR_LINEAR_RANGE(700000, 185, 339, 10000), 224 + REGULATOR_LINEAR_RANGE(1280000, 185, 261, 10000), 226 225 }, 227 226 .n_linear_ranges = 2, 228 - .n_voltages = 340, 227 + .n_voltages = 262, 229 228 .ops = &rpm_smps_ldo_ops, 230 229 }; 231 230 232 231 static const struct regulator_desc pm8941_boost = { 233 232 .linear_ranges = (struct regulator_linear_range[]) { 234 - REGULATOR_LINEAR_RANGE(4000000, 0, 15, 100000), 233 + REGULATOR_LINEAR_RANGE(4000000, 0, 30, 50000), 235 234 }, 236 235 .n_linear_ranges = 1, 237 - .n_voltages = 16, 236 + .n_voltages = 31, 238 237 .ops = &rpm_smps_ldo_ops, 239 238 }; 240 239 241 240 static const struct regulator_desc pm8941_pldo = { 242 241 .linear_ranges = (struct regulator_linear_range[]) { 243 - REGULATOR_LINEAR_RANGE( 750000, 0, 30, 25000), 244 - REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000), 242 + REGULATOR_LINEAR_RANGE( 750000, 0, 63, 12500), 243 + REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000), 244 + REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000), 245 245 }, 246 - .n_linear_ranges = 2, 247 - .n_voltages = 100, 246 + .n_linear_ranges = 3, 247 + .n_voltages = 164, 248 248 .ops = &rpm_smps_ldo_ops, 249 249 }; 250 250