Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa5729d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v4.8-rc5' of... 

Merge tag 'regulator-fix-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Two things here, one an e-mail update for Krzysztof Kozlowski and the
  other a couple of fixes for issues with incorrectly described voltages
  in a couple of the Qualcomm regulator drivers that were breaking MMC
  on some platforms"

* tag 'regulator-fix-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Change Krzysztof Kozlowski's email to kernel.org
  regulator: qcom_smd: Fix voltage ranges for pma8084 ftsmps and pldo
  regulator: qcom_smd: Fix voltage ranges for pm8x41
parents 4c601e0d 78cefcbe

drivers/regulator/max14577-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * max14577.c - Regulator driver for the Maxim 14577/77836

 *

 * 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

 * 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_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>");

MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");

MODULE_DESCRIPTION("Maxim 14577/77836 regulator driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:max14577-regulator");

drivers/regulator/max77693-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2013-2015 Samsung Electronics

 * 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

 * 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_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");

drivers/regulator/qcom_smd-regulator.c

+16 −14
Original line number Diff line number Diff line
@@ -178,20 +178,21 @@ static const struct regulator_desc pma8084_hfsmps = { 
static const struct regulator_desc pma8084_ftsmps = {

	.linear_ranges = (struct regulator_linear_range[]) {

		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_voltages = 340,

	.n_voltages = 262,

	.ops = &rpm_smps_ldo_ops,

};



static const struct regulator_desc pma8084_pldo = {

	.linear_ranges = (struct regulator_linear_range[]) {

		REGULATOR_LINEAR_RANGE(750000,  0,  30, 25000),

		REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000),

		REGULATOR_LINEAR_RANGE( 750000,  0,  63, 12500),

		REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000),

		REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000),

	},

	.n_linear_ranges = 2,

	.n_voltages = 100,

	.n_linear_ranges = 3,

	.n_voltages = 164,

	.ops = &rpm_smps_ldo_ops,

};
@@ -221,29 +222,30 @@ static const struct regulator_desc pm8x41_hfsmps = { 
static const struct regulator_desc pm8841_ftsmps = {

	.linear_ranges = (struct regulator_linear_range[]) {

		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_voltages = 340,

	.n_voltages = 262,

	.ops = &rpm_smps_ldo_ops,

};



static const struct regulator_desc pm8941_boost = {

	.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_voltages = 16,

	.n_voltages = 31,

	.ops = &rpm_smps_ldo_ops,

};



static const struct regulator_desc pm8941_pldo = {

	.linear_ranges = (struct regulator_linear_range[]) {

		REGULATOR_LINEAR_RANGE( 750000,  0,  30, 25000),

		REGULATOR_LINEAR_RANGE(1500000, 31, 99, 50000),

		REGULATOR_LINEAR_RANGE( 750000,  0,  63, 12500),

		REGULATOR_LINEAR_RANGE(1550000, 64, 126, 25000),

		REGULATOR_LINEAR_RANGE(3100000, 127, 163, 50000),

	},

	.n_linear_ranges = 2,

	.n_voltages = 100,

	.n_linear_ranges = 3,

	.n_voltages = 164,

	.ops = &rpm_smps_ldo_ops,

};