projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5408dd8 1f37cbe 0d19208 afafcdd 7118f19 f3f400e)
Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/anatop...
authorMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:19:37 +0000 (11:19 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:19:37 +0000 (11:19 +0000)
1  2  3  4  5  6 
drivers/regulator/anatop-regulator.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/regulator/axp20x-regulator.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --cc drivers/regulator/anatop-regulator.c
Simple merge
diff --cc drivers/regulator/axp20x-regulator.c
index a9567af7cec02c5a13102be118010e7bb7b1c888,01bf3476a79183714f62f67efcf5d8b17b70d497,01bf3476a79183714f62f67efcf5d8b17b70d497,01bf3476a79183714f62f67efcf5d8b17b70d497,56a0805e6494b96dc32bbbdead7dd91ef9240ca9,01bf3476a79183714f62f67efcf5d8b17b70d497..35de22fdb7a06d96e0bb7bdf3e199165b5b83cc1
--- 1/drivers/regulator/axp20x-regulator.c
--- 2/drivers/regulator/axp20x-regulator.c
--- 3/drivers/regulator/axp20x-regulator.c
--- 4/drivers/regulator/axp20x-regulator.c
--- 5/drivers/regulator/axp20x-regulator.c
--- 6/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@@@@@@ -192,14 -192,14 -192,14 -192,14 -192,14 -192,14 +192,14 @@@@@@@ static const struct regulator_desc axp2
        AXP_DESC(AXP22X, DCDC3, "dcdc3", "vin3", 600, 1860, 20,
                 AXP22X_DCDC3_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),
        AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20,
 -----           AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),
 +++++           AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(4)),
        AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,
 -----           AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(4)),
 +++++           AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(5)),
        /* secondary switchable output of DCDC1 */
---- -  AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100,
++++ +  AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", NULL, 1600, 3400, 100,
                    AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)),
        /* LDO regulator internally chained to DCDC5 */
---- -  AXP_DESC(AXP22X, DC5LDO, "dc5ldo", "dcdc5", 700, 1400, 100,
++++ +  AXP_DESC(AXP22X, DC5LDO, "dc5ldo", NULL, 700, 1400, 100,
                 AXP22X_DC5LDO_V_OUT, 0x7, AXP22X_PWR_OUT_CTRL1, BIT(0)),
        AXP_DESC(AXP22X, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
                 AXP22X_ALDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(6)),