mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00:00
Merge remote-tracking branches 'regulator/fix/da9053' and 'regulator/fix/s2mps11' into regulator-linus
This commit is contained in:
commit
02214f1061
@ -333,7 +333,7 @@ static const struct regulator_ops da9052_ldo_ops = {
|
||||
static struct da9052_regulator_info da9052_regulator_info[] = {
|
||||
DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
|
||||
DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
|
||||
DA9052_DCDC(BUCK3, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
|
||||
DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),
|
||||
DA9052_DCDC(BUCK4, 50, 1800, 3600, 5, 6, 0),
|
||||
DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),
|
||||
DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
|
||||
@ -350,8 +350,8 @@ static struct da9052_regulator_info da9052_regulator_info[] = {
|
||||
static struct da9052_regulator_info da9053_regulator_info[] = {
|
||||
DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
|
||||
DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
|
||||
DA9052_DCDC(BUCK3, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
|
||||
DA9052_DCDC(BUCK4, 25, 925, 2500, 6, 6, 0),
|
||||
DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),
|
||||
DA9052_DCDC(BUCK4, 25, 950, 2525, 6, 6, 0),
|
||||
DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),
|
||||
DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
|
||||
DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),
|
||||
|
@ -750,7 +750,7 @@ static const struct regulator_linear_range s2mps15_ldo_voltage_ranges3[] = {
|
||||
|
||||
/* voltage range for s2mps15 LDO 7, 8, 9 and 10 */
|
||||
static const struct regulator_linear_range s2mps15_ldo_voltage_ranges4[] = {
|
||||
REGULATOR_LINEAR_RANGE(700000, 0xc, 0x18, 25000),
|
||||
REGULATOR_LINEAR_RANGE(700000, 0x10, 0x20, 25000),
|
||||
};
|
||||
|
||||
/* voltage range for s2mps15 LDO 1 */
|
||||
@ -760,12 +760,12 @@ static const struct regulator_linear_range s2mps15_ldo_voltage_ranges5[] = {
|
||||
|
||||
/* voltage range for s2mps15 BUCK 1, 2, 3, 4, 5, 6 and 7 */
|
||||
static const struct regulator_linear_range s2mps15_buck_voltage_ranges1[] = {
|
||||
REGULATOR_LINEAR_RANGE(500000, 0x20, 0xb0, 6250),
|
||||
REGULATOR_LINEAR_RANGE(500000, 0x20, 0xc0, 6250),
|
||||
};
|
||||
|
||||
/* voltage range for s2mps15 BUCK 8, 9 and 10 */
|
||||
static const struct regulator_linear_range s2mps15_buck_voltage_ranges2[] = {
|
||||
REGULATOR_LINEAR_RANGE(1000000, 0x20, 0xc0, 12500),
|
||||
REGULATOR_LINEAR_RANGE(1000000, 0x20, 0x78, 12500),
|
||||
};
|
||||
|
||||
static const struct regulator_desc s2mps15_regulators[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user