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

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

Merge remote-tracking branch 'regulator/topic/max77686' into v3.9-rc8

parents 388128ff 3ecf198e

drivers/regulator/max77686.c

+21 −11
Original line number Diff line number Diff line
@@ -75,17 +75,20 @@ static int max77686_buck_set_suspend_disable(struct regulator_dev *rdev) 
{

	unsigned int val;

	struct max77686_data *max77686 = rdev_get_drvdata(rdev);

        int id = rdev_get_id(rdev);

	int ret, id = rdev_get_id(rdev);



	if (id == MAX77686_BUCK1)

		val = 0x1;

	else

		val = 0x1 << MAX77686_OPMODE_BUCK234_SHIFT;



	ret = regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				 rdev->desc->enable_mask, val);

	if (ret)

		return ret;



	max77686->opmode[id] = val;

	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask,

				  val);

	return 0;

}



/* Some LDOs supports [LPM/Normal]ON mode during suspend state */
@@ -94,7 +97,7 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev, 
{

	struct max77686_data *max77686 = rdev_get_drvdata(rdev);

	unsigned int val;

        int id = rdev_get_id(rdev);

	int ret, id = rdev_get_id(rdev);



	/* BUCK[5-9] doesn't support this feature */

	if (id >= MAX77686_BUCK5)
@@ -113,10 +116,13 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	ret = regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask, val);

	if (ret)

		return ret;



	max77686->opmode[id] = val;

	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask,

				  val);

	return 0;

}



/* Some LDOs supports LPM-ON/OFF/Normal-ON mode during suspend state */
@@ -125,6 +131,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, 
{

	unsigned int val;

	struct max77686_data *max77686 = rdev_get_drvdata(rdev);

	int ret;



	switch (mode) {

	case REGULATOR_MODE_STANDBY:			/* switch off */
@@ -142,10 +149,13 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	ret = regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				 rdev->desc->enable_mask, val);

	if (ret)

		return ret;



	max77686->opmode[rdev_get_id(rdev)] = val;

	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask,

				  val);

	return 0;

}



static int max77686_enable(struct regulator_dev *rdev)