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

Commit abe3b269 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator fixes from Mark Brown:
 "One correctness fix here for the s2mps11 driver which would have
  resulted in some of the regulators being completely broken together
  with a fix for locking in regualtor_put() (which is fortunately rarely
  called at all in practical systems)"

* tag 'regulator-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mps11: Fix wrong calculation of register offset
  regulator: core: fix race condition in regulator_put()
parents 8d6b9327 113620bb

drivers/regulator/core.c

+3 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ struct regulator *regulator_get_optional(struct device *dev, const char *id) 
}

EXPORT_SYMBOL_GPL(regulator_get_optional);



/* Locks held by regulator_put() */

/* regulator_list_mutex lock held by regulator_put() */

static void _regulator_put(struct regulator *regulator)

{

	struct regulator_dev *rdev;
@@ -1503,12 +1503,14 @@ static void _regulator_put(struct regulator *regulator) 
	/* remove any sysfs entries */

	if (regulator->dev)

		sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);

	mutex_lock(&rdev->mutex);

	kfree(regulator->supply_name);

	list_del(&regulator->list);

	kfree(regulator);



	rdev->open_count--;

	rdev->exclusive = 0;

	mutex_unlock(&rdev->mutex);



	module_put(rdev->owner);

}

drivers/regulator/s2mps11.c

+38 −4
Original line number Diff line number Diff line
@@ -405,6 +405,40 @@ static struct regulator_ops s2mps14_reg_ops; 
	.enable_mask	= S2MPS14_ENABLE_MASK			\

}



#define regulator_desc_s2mps13_buck7(num, min, step, min_sel) {	\

	.name		= "BUCK"#num,				\

	.id		= S2MPS13_BUCK##num,			\

	.ops		= &s2mps14_reg_ops,			\

	.type		= REGULATOR_VOLTAGE,			\

	.owner		= THIS_MODULE,				\

	.min_uV		= min,					\

	.uV_step	= step,					\

	.linear_min_sel	= min_sel,				\

	.n_voltages	= S2MPS14_BUCK_N_VOLTAGES,		\

	.ramp_delay	= S2MPS13_BUCK_RAMP_DELAY,		\

	.vsel_reg	= S2MPS13_REG_B1OUT + (num) * 2 - 1,	\

	.vsel_mask	= S2MPS14_BUCK_VSEL_MASK,		\

	.enable_reg	= S2MPS13_REG_B1CTRL + (num - 1) * 2,	\

	.enable_mask	= S2MPS14_ENABLE_MASK			\

}



#define regulator_desc_s2mps13_buck8_10(num, min, step, min_sel) {	\

	.name		= "BUCK"#num,				\

	.id		= S2MPS13_BUCK##num,			\

	.ops		= &s2mps14_reg_ops,			\

	.type		= REGULATOR_VOLTAGE,			\

	.owner		= THIS_MODULE,				\

	.min_uV		= min,					\

	.uV_step	= step,					\

	.linear_min_sel	= min_sel,				\

	.n_voltages	= S2MPS14_BUCK_N_VOLTAGES,		\

	.ramp_delay	= S2MPS13_BUCK_RAMP_DELAY,		\

	.vsel_reg	= S2MPS13_REG_B1OUT + (num) * 2 - 1,	\

	.vsel_mask	= S2MPS14_BUCK_VSEL_MASK,		\

	.enable_reg	= S2MPS13_REG_B1CTRL + (num) * 2 - 1,	\

	.enable_mask	= S2MPS14_ENABLE_MASK			\

}



static const struct regulator_desc s2mps13_regulators[] = {

	regulator_desc_s2mps13_ldo(1,  MIN_800_MV,  STEP_12_5_MV, 0x00),

	regulator_desc_s2mps13_ldo(2,  MIN_1400_MV, STEP_50_MV,   0x0C),
@@ -452,10 +486,10 @@ static const struct regulator_desc s2mps13_regulators[] = { 
	regulator_desc_s2mps13_buck(4,  MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck(5,  MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck(6,  MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck(7,  MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck(8,  MIN_1000_MV, STEP_12_5_MV, 0x20),

	regulator_desc_s2mps13_buck(9,  MIN_1000_MV, STEP_12_5_MV, 0x20),

	regulator_desc_s2mps13_buck(10, MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck7(7,  MIN_500_MV,  STEP_6_25_MV, 0x10),

	regulator_desc_s2mps13_buck8_10(8,  MIN_1000_MV, STEP_12_5_MV, 0x20),

	regulator_desc_s2mps13_buck8_10(9,  MIN_1000_MV, STEP_12_5_MV, 0x20),

	regulator_desc_s2mps13_buck8_10(10, MIN_500_MV,  STEP_6_25_MV, 0x10),

};



static int s2mps14_regulator_enable(struct regulator_dev *rdev)

include/linux/mfd/samsung/s2mps13.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum s2mps13_reg { 
	S2MPS13_REG_B6CTRL,

	S2MPS13_REG_B6OUT,

	S2MPS13_REG_B7CTRL,

	S2MPS13_REG_B7SW,

	S2MPS13_REG_B7OUT,

	S2MPS13_REG_B8CTRL,

	S2MPS13_REG_B8OUT,
@@ -102,6 +103,7 @@ enum s2mps13_reg { 
	S2MPS13_REG_L26CTRL,

	S2MPS13_REG_L27CTRL,

	S2MPS13_REG_L28CTRL,

	S2MPS13_REG_L29CTRL,

	S2MPS13_REG_L30CTRL,

	S2MPS13_REG_L31CTRL,

	S2MPS13_REG_L32CTRL,