Commit 97844ede authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 83b0dd9e b92f567d

drivers/regulator/core.c

+31 −0
Original line number Diff line number Diff line
@@ -2137,6 +2137,37 @@ int regulator_map_voltage_iterate(struct regulator_dev *rdev, 
}

EXPORT_SYMBOL_GPL(regulator_map_voltage_iterate);



/**

 * regulator_map_voltage_ascend - map_voltage() for ascendant voltage list

 *

 * @rdev: Regulator to operate on

 * @min_uV: Lower bound for voltage

 * @max_uV: Upper bound for voltage

 *

 * Drivers that have ascendant voltage list can use this as their

 * map_voltage() operation.

 */

int regulator_map_voltage_ascend(struct regulator_dev *rdev,

				 int min_uV, int max_uV)

{

	int i, ret;



	for (i = 0; i < rdev->desc->n_voltages; i++) {

		ret = rdev->desc->ops->list_voltage(rdev, i);

		if (ret < 0)

			continue;



		if (ret > max_uV)

			break;



		if (ret >= min_uV && ret <= max_uV)

			return i;

	}



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(regulator_map_voltage_ascend);



/**

 * regulator_map_voltage_linear - map_voltage() for simple linear mappings

 *

drivers/regulator/lp3971.c

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static int lp3971_ldo_set_voltage_sel(struct regulator_dev *dev, 


static struct regulator_ops lp3971_ldo_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.is_enabled = lp3971_ldo_is_enabled,

	.enable = lp3971_ldo_enable,

	.disable = lp3971_ldo_disable,
@@ -236,6 +237,7 @@ static int lp3971_dcdc_set_voltage_sel(struct regulator_dev *dev, 


static struct regulator_ops lp3971_dcdc_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.is_enabled = lp3971_dcdc_is_enabled,

	.enable = lp3971_dcdc_enable,

	.disable = lp3971_dcdc_disable,

drivers/regulator/lp3972.c

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static int lp3972_ldo_set_voltage_sel(struct regulator_dev *dev, 


static struct regulator_ops lp3972_ldo_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.is_enabled = lp3972_ldo_is_enabled,

	.enable = lp3972_ldo_enable,

	.disable = lp3972_ldo_disable,
@@ -389,6 +390,7 @@ static int lp3972_dcdc_set_voltage_sel(struct regulator_dev *dev, 


static struct regulator_ops lp3972_dcdc_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.is_enabled = lp3972_dcdc_is_enabled,

	.enable = lp3972_dcdc_enable,

	.disable = lp3972_dcdc_disable,

drivers/regulator/lp872x.c

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ static unsigned int lp872x_buck_get_mode(struct regulator_dev *rdev) 


static struct regulator_ops lp872x_ldo_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.enable = regulator_enable_regmap,
@@ -488,6 +489,7 @@ static struct regulator_ops lp872x_ldo_ops = { 


static struct regulator_ops lp8720_buck_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = lp872x_buck_set_voltage_sel,

	.get_voltage_sel = lp872x_buck_get_voltage_sel,

	.enable = regulator_enable_regmap,
@@ -500,6 +502,7 @@ static struct regulator_ops lp8720_buck_ops = { 


static struct regulator_ops lp8725_buck_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = lp872x_buck_set_voltage_sel,

	.get_voltage_sel = lp872x_buck_get_voltage_sel,

	.enable = regulator_enable_regmap,

drivers/regulator/lp8788-buck.c

+2 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ static unsigned int lp8788_buck_get_mode(struct regulator_dev *rdev) 


static struct regulator_ops lp8788_buck12_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = lp8788_buck12_set_voltage_sel,

	.get_voltage_sel = lp8788_buck12_get_voltage_sel,

	.enable = regulator_enable_regmap,
@@ -358,6 +359,7 @@ static struct regulator_ops lp8788_buck12_ops = { 


static struct regulator_ops lp8788_buck34_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.enable = regulator_enable_regmap,