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

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

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

Pull regulator fixes from Mark Brown:
 "A few small, driver specific bug fixes, nothing exciting here but all
  needed if you happen to be using the affected hardware."

* tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: palmas: fix regmap offsets for enable/disable
  regulator: tps6524x: Fix get_voltage_sel for fixed voltage
  regulator: tps65023: Fix mask for LDOs output voltage select control
parents 5c0a981f a68de074

drivers/regulator/palmas-regulator.c

+5 −2
Original line number Diff line number Diff line
@@ -673,7 +673,9 @@ static __devinit int palmas_probe(struct platform_device *pdev) 
			pmic->desc[id].ops = &palmas_ops_smps10;

			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;

			pmic->desc[id].vsel_mask = SMPS10_VSEL;

			pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;

			pmic->desc[id].enable_reg =

					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,

							PALMAS_SMPS10_STATUS);

			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;

		}
@@ -739,7 +741,8 @@ static __devinit int palmas_probe(struct platform_device *pdev) 


		pmic->desc[id].type = REGULATOR_VOLTAGE;

		pmic->desc[id].owner = THIS_MODULE;

		pmic->desc[id].enable_reg = palmas_regs_info[id].ctrl_addr;

		pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,

						palmas_regs_info[id].ctrl_addr);

		pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;



		if (pdata && pdata->reg_data)

drivers/regulator/tps65023-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 


/* LDO_CTRL bitfields */

#define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id)	((ldo_id)*4)

#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)	(0x0F << ((ldo_id)*4))

#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)	(0x07 << ((ldo_id)*4))



/* Number of step-down converters available */

#define TPS65023_NUM_DCDC		3

drivers/regulator/tps6524x-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev) 
	info	= &supply_info[rdev_get_id(rdev)];



	if (info->flags & FIXED_VOLTAGE)

		return info->fixed_voltage;

		return 0;



	ret = read_field(hw, &info->voltage);

	if (ret < 0)