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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: twl: fix twl4030 support for smps regulators
  regulator: fix use after free bug
  regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
parents cd5b49bc ba305e31

drivers/regulator/aat2870-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id) 
			break;

	}



	if (!ri)

	if (i == ARRAY_SIZE(aat2870_regulators))

		return NULL;



	ri->enable_addr = AAT2870_LDO_EN;

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2799,8 +2799,8 @@ void regulator_unregister(struct regulator_dev *rdev) 
	list_del(&rdev->list);

	if (rdev->supply)

		regulator_put(rdev->supply);

	device_unregister(&rdev->dev);

	kfree(rdev->constraints);

	device_unregister(&rdev->dev);

	mutex_unlock(&regulator_list_mutex);

}

EXPORT_SYMBOL_GPL(regulator_unregister);

drivers/regulator/twl-regulator.c

+44 −2
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct twlreg_info { 
#define VREG_TYPE		1

#define VREG_REMAP		2

#define VREG_DEDICATED		3	/* LDO control */

#define VREG_VOLTAGE_SMPS_4030	9

/* TWL6030 register offsets */

#define VREG_TRANS		1

#define VREG_STATE		2
@@ -514,6 +515,32 @@ static struct regulator_ops twl4030ldo_ops = { 
	.get_status	= twl4030reg_get_status,

};



static int

twl4030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,

			unsigned *selector)

{

	struct twlreg_info *info = rdev_get_drvdata(rdev);

	int vsel = DIV_ROUND_UP(min_uV - 600000, 12500);



	twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE_SMPS_4030,

		vsel);

	return 0;

}



static int twl4030smps_get_voltage(struct regulator_dev *rdev)

{

	struct twlreg_info *info = rdev_get_drvdata(rdev);

	int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER,

		VREG_VOLTAGE_SMPS_4030);



	return vsel * 12500 + 600000;

}



static struct regulator_ops twl4030smps_ops = {

	.set_voltage	= twl4030smps_set_voltage,

	.get_voltage	= twl4030smps_get_voltage,

};



static int twl6030ldo_list_voltage(struct regulator_dev *rdev, unsigned index)

{

	struct twlreg_info	*info = rdev_get_drvdata(rdev);
@@ -856,6 +883,21 @@ static struct regulator_ops twlsmps_ops = { 
		}, \

	}



#define TWL4030_ADJUSTABLE_SMPS(label, offset, num, turnon_delay, remap_conf) \

	{ \

	.base = offset, \

	.id = num, \

	.delay = turnon_delay, \

	.remap = remap_conf, \

	.desc = { \

		.name = #label, \

		.id = TWL4030_REG_##label, \

		.ops = &twl4030smps_ops, \

		.type = REGULATOR_VOLTAGE, \

		.owner = THIS_MODULE, \

		}, \

	}



#define TWL6030_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) { \

	.base = offset, \

	.min_mV = min_mVolts, \
@@ -947,8 +989,8 @@ static struct twlreg_info twl_regs[] = { 
	TWL4030_ADJUSTABLE_LDO(VINTANA2, 0x43, 12, 100, 0x08),

	TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08),

	TWL4030_ADJUSTABLE_LDO(VIO, 0x4b, 14, 1000, 0x08),

	TWL4030_ADJUSTABLE_LDO(VDD1, 0x55, 15, 1000, 0x08),

	TWL4030_ADJUSTABLE_LDO(VDD2, 0x63, 16, 1000, 0x08),

	TWL4030_ADJUSTABLE_SMPS(VDD1, 0x55, 15, 1000, 0x08),

	TWL4030_ADJUSTABLE_SMPS(VDD2, 0x63, 16, 1000, 0x08),

	TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17, 100, 0x08),

	TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18, 100, 0x08),

	TWL4030_FIXED_LDO(VUSB3V1, 0x77, 3100, 19, 150, 0x08),