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

Commit d00b7461 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/tps65086' and... 

Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next
parents 56e3d92d f8192880 3498c5e1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8748,6 +8748,7 @@ F: drivers/regulator/tps65217-regulator.c 
F:	drivers/regulator/tps65218-regulator.c

F:	drivers/regulator/tps65910-regulator.c

F:	drivers/regulator/twl-regulator.c

F:	drivers/regulator/twl6030-regulator.c

F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

drivers/regulator/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o 
obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o

obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o

obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o

obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o

obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o

obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o

obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o

obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o

drivers/regulator/tps65086-regulator.c

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static const struct regulator_linear_range tps65086_10mv_ranges[] = { 
};



static const struct regulator_linear_range tps65086_buck126_25mv_ranges[] = {

	REGULATOR_LINEAR_RANGE(1000000, 0x0, 0x18, 0),

	REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),

	REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x18, 0),

	REGULATOR_LINEAR_RANGE(1025000, 0x19, 0x7F, 25000),

};

drivers/regulator/twl-regulator.c

+18 −655

File changed.

Preview size limit exceeded, changes collapsed.

drivers/regulator/twl6030-regulator.c

0 → 100644
+793 −0

File added.

Preview size limit exceeded, changes collapsed.