Commit 768e6668 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next
parents 41eeb34a e07ff943 935514c9

drivers/regulator/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 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_VEXPRESS) += vexpress.o

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

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

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

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

drivers/regulator/s5m8767.c

+9 −4
Original line number Diff line number Diff line
@@ -202,9 +202,10 @@ static int s5m8767_get_register(struct s5m8767_info *s5m8767, int reg_id, 
		}

	}



	if (i < s5m8767->num_regulators)

		*enable_ctrl =

		s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;

	if (i >= s5m8767->num_regulators)

		return -EINVAL;



	*enable_ctrl = s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;



	return 0;

}
@@ -937,8 +938,12 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) 
			else

				regulators[id].vsel_mask = 0xff;



			s5m8767_get_register(s5m8767, id, &enable_reg,

			ret = s5m8767_get_register(s5m8767, id, &enable_reg,

					     &enable_val);

			if (ret) {

				dev_err(s5m8767->dev, "error reading registers\n");

				return ret;

			}

			regulators[id].enable_reg = enable_reg;

			regulators[id].enable_mask = S5M8767_ENCTRL_MASK;

			regulators[id].enable_val = enable_val;