Commit 9c9588a7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/max8907',... 

Merge remote-tracking branches 'regulator/fix/max8907', 'regulator/fix/max8997', 'regulator/fix/tps65910' and 'regulator/topic/mc13892' into regulator-of
parents f40cbcb9 b4895e2c 08337fda 2c8a5dca

drivers/regulator/max8997.c

+19 −20
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static struct regulator_desc regulators[] = { 
};



#ifdef CONFIG_OF

static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev,

static int max8997_pmic_dt_parse_dvs_gpio(struct platform_device *pdev,

			struct max8997_platform_data *pdata,

			struct device_node *pmic_np)

{
@@ -944,7 +944,7 @@ static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev, 
		gpio = of_get_named_gpio(pmic_np,

					"max8997,pmic-buck125-dvs-gpios", i);

		if (!gpio_is_valid(gpio)) {

			dev_err(iodev->dev, "invalid gpio[%d]: %d\n", i, gpio);

			dev_err(&pdev->dev, "invalid gpio[%d]: %d\n", i, gpio);

			return -EINVAL;

		}

		pdata->buck125_gpios[i] = gpio;
@@ -952,22 +952,23 @@ static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev, 
	return 0;

}



static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,

static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max8997_platform_data *pdata)

{

	struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	struct device_node *pmic_np, *regulators_np, *reg_np;

	struct max8997_regulator_data *rdata;

	unsigned int i, dvs_voltage_nr = 1, ret;



	pmic_np = iodev->dev->of_node;

	if (!pmic_np) {

		dev_err(iodev->dev, "could not find pmic sub-node\n");

		dev_err(&pdev->dev, "could not find pmic sub-node\n");

		return -ENODEV;

	}



	regulators_np = of_find_node_by_name(pmic_np, "regulators");

	if (!regulators_np) {

		dev_err(iodev->dev, "could not find regulators sub-node\n");

		dev_err(&pdev->dev, "could not find regulators sub-node\n");

		return -EINVAL;

	}
@@ -976,11 +977,10 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev, 
	for_each_child_of_node(regulators_np, reg_np)

		pdata->num_regulators++;



	rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) *

	rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *

				pdata->num_regulators, GFP_KERNEL);

	if (!rdata) {

		dev_err(iodev->dev, "could not allocate memory for "

						"regulator data\n");

		dev_err(&pdev->dev, "could not allocate memory for regulator data\n");

		return -ENOMEM;

	}
@@ -991,14 +991,14 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev, 
				break;



		if (i == ARRAY_SIZE(regulators)) {

			dev_warn(iodev->dev, "don't know how to configure "

				"regulator %s\n", reg_np->name);

			dev_warn(&pdev->dev, "don't know how to configure regulator %s\n",

				 reg_np->name);

			continue;

		}



		rdata->id = i;

		rdata->initdata = of_get_regulator_init_data(

						iodev->dev, reg_np);

		rdata->initdata = of_get_regulator_init_data(&pdev->dev,

							     reg_np);

		rdata->reg_node = reg_np;

		rdata++;

	}
@@ -1014,7 +1014,7 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev, 


	if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs ||

						pdata->buck5_gpiodvs) {

		ret = max8997_pmic_dt_parse_dvs_gpio(iodev, pdata, pmic_np);

		ret = max8997_pmic_dt_parse_dvs_gpio(pdev, pdata, pmic_np);

		if (ret)

			return -EINVAL;
@@ -1025,8 +1025,7 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev, 
		} else {

			if (pdata->buck125_default_idx >= 8) {

				pdata->buck125_default_idx = 0;

				dev_info(iodev->dev, "invalid value for "

				"default dvs index, using 0 instead\n");

				dev_info(&pdev->dev, "invalid value for default dvs index, using 0 instead\n");

			}

		}
@@ -1040,28 +1039,28 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev, 
	if (of_property_read_u32_array(pmic_np,

				"max8997,pmic-buck1-dvs-voltage",

				pdata->buck1_voltage, dvs_voltage_nr)) {

		dev_err(iodev->dev, "buck1 voltages not specified\n");

		dev_err(&pdev->dev, "buck1 voltages not specified\n");

		return -EINVAL;

	}



	if (of_property_read_u32_array(pmic_np,

				"max8997,pmic-buck2-dvs-voltage",

				pdata->buck2_voltage, dvs_voltage_nr)) {

		dev_err(iodev->dev, "buck2 voltages not specified\n");

		dev_err(&pdev->dev, "buck2 voltages not specified\n");

		return -EINVAL;

	}



	if (of_property_read_u32_array(pmic_np,

				"max8997,pmic-buck5-dvs-voltage",

				pdata->buck5_voltage, dvs_voltage_nr)) {

		dev_err(iodev->dev, "buck5 voltages not specified\n");

		dev_err(&pdev->dev, "buck5 voltages not specified\n");

		return -EINVAL;

	}



	return 0;

}

#else

static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,

static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max8997_platform_data *pdata)

{

	return 0;
@@ -1085,7 +1084,7 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
	}



	if (iodev->dev->of_node) {

		ret = max8997_pmic_dt_parse_pdata(iodev, pdata);

		ret = max8997_pmic_dt_parse_pdata(pdev, pdata);

		if (ret)

			return ret;

	}

drivers/regulator/mc13892-regulator.c

+93 −18
Original line number Diff line number Diff line
@@ -164,6 +164,14 @@ static const unsigned int mc13892_sw1[] = { 
	1350000, 1375000

};



/*

 * Note: this table is used to derive SWxVSEL by index into

 * the array. Offset the values by the index of 1100000uV

 * to get the actual register value for that voltage selector

 * if the HI bit is to be set as well.

 */

#define MC13892_SWxHI_SEL_OFFSET		20



static const unsigned int mc13892_sw[] = {

	600000,   625000,  650000,  675000,  700000,  725000,

	750000,   775000,  800000,  825000,  850000,  875000,
@@ -239,7 +247,6 @@ static const unsigned int mc13892_pwgtdrv[] = { 
};



static struct regulator_ops mc13892_gpo_regulator_ops;

/* sw regulators need special care due to the "hi bit" */

static struct regulator_ops mc13892_sw_regulator_ops;
@@ -396,7 +403,7 @@ static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev) 
{

	struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);

	int ret, id = rdev_get_id(rdev);

	unsigned int val;

	unsigned int val, selector;



	dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
@@ -407,12 +414,28 @@ static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev) 
	if (ret)

		return ret;



	val = (val & mc13892_regulators[id].vsel_mask)

		>> mc13892_regulators[id].vsel_shift;

	/*

	 * Figure out if the HI bit is set inside the switcher mode register

	 * since this means the selector value we return is at a different

	 * offset into the selector table.

	 *

	 * According to the MC13892 documentation note 59 (Table 47) the SW1

	 * buck switcher does not support output range programming therefore

	 * the HI bit must always remain 0. So do not do anything strange if

	 * our register is MC13892_SWITCHERS0.

	 */



	dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val);

	selector = val & mc13892_regulators[id].vsel_mask;



	return val;

	if ((mc13892_regulators[id].vsel_reg != MC13892_SWITCHERS0) &&

	    (val & MC13892_SWITCHERS0_SWxHI)) {

		selector += MC13892_SWxHI_SEL_OFFSET;

	}



	dev_dbg(rdev_get_dev(rdev), "%s id: %d val: 0x%08x selector: %d\n",

			__func__, id, val, selector);



	return selector;

}



static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev,
@@ -425,18 +448,35 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev, 


	volt = rdev->desc->volt_table[selector];

	mask = mc13892_regulators[id].vsel_mask;

	reg_value = selector << mc13892_regulators[id].vsel_shift;

	reg_value = selector;



	/*

	 * Don't mess with the HI bit or support HI voltage offsets for SW1.

	 *

	 * Since the get_voltage_sel callback has given a fudged value for

	 * the selector offset, we need to back out that offset if HI is

	 * to be set so we write the correct value to the register.

	 *

	 * The HI bit addition and selector offset handling COULD be more

	 * complicated by shifting and masking off the voltage selector part

	 * of the register then logical OR it back in, but since the selector

	 * is at bits 4:0 there is very little point. This makes the whole

	 * thing more readable and we do far less work.

	 */



	if (mc13892_regulators[id].vsel_reg != MC13892_SWITCHERS0) {

		if (volt > 1375000) {

		mask |= MC13892_SWITCHERS0_SWxHI;

			reg_value -= MC13892_SWxHI_SEL_OFFSET;

			reg_value |= MC13892_SWITCHERS0_SWxHI;

	} else if (volt < 1100000) {

			mask |= MC13892_SWITCHERS0_SWxHI;

		} else if (volt < 1100000) {

			reg_value &= ~MC13892_SWITCHERS0_SWxHI;

			mask |= MC13892_SWITCHERS0_SWxHI;

		}

	}



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13892_regulators[id].reg, mask,

	ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13892_regulators[id].vsel_reg, mask,

			      reg_value);

	mc13xxx_unlock(priv->mc13xxx);
@@ -495,15 +535,18 @@ static int mc13892_regulator_probe(struct platform_device *pdev) 
	struct mc13xxx_regulator_init_data *mc13xxx_data;

	struct regulator_config config = { };

	int i, ret;

	int num_regulators = 0;

	int num_regulators = 0, num_parsed;

	u32 val;



	num_regulators = mc13xxx_get_num_regulators_dt(pdev);



	if (num_regulators <= 0 && pdata)

		num_regulators = pdata->num_regulators;

	if (num_regulators <= 0)

		return -EINVAL;



	num_parsed = num_regulators;



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv) +

		num_regulators * sizeof(priv->regulators[0]),

		GFP_KERNEL);
@@ -520,7 +563,7 @@ static int mc13892_regulator_probe(struct platform_device *pdev) 
	if (ret)

		goto err_unlock;



	/* enable switch auto mode */

	/* enable switch auto mode (on 2.0A silicon only) */

	if ((val & 0x0000FFFF) == 0x45d0) {

		ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS4,

			MC13892_SWITCHERS4_SW1MODE_M |
@@ -546,7 +589,39 @@ static int mc13892_regulator_probe(struct platform_device *pdev) 
		= mc13892_vcam_get_mode;



	mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,

					ARRAY_SIZE(mc13892_regulators));

					ARRAY_SIZE(mc13892_regulators),

					&num_parsed);



	/*

	 * Perform a little sanity check on the regulator tree - if we found

	 * a number of regulators from mc13xxx_get_num_regulators_dt and

	 * then parsed a smaller number in mc13xxx_parse_regulators_dt then

	 * there is a regulator defined in the regulators node which has

	 * not matched any usable regulator in the driver. In this case,

	 * there is one missing and what will happen is the first regulator

	 * will get registered again.

	 *

	 * Fix this by basically making our number of registerable regulators

	 * equal to the number of regulators we parsed. We are allocating

	 * too much memory for priv, but this is unavoidable at this point.

	 *

	 * As an example of how this can happen, try making a typo in your

	 * regulators node (vviohi {} instead of viohi {}) so that the name

	 * does not match..

	 *

	 * The check will basically pass for platform data (non-DT) because

	 * mc13xxx_parse_regulators_dt for !CONFIG_OF will not touch num_parsed.

	 *

	 */

	if (num_parsed != num_regulators) {

		dev_warn(&pdev->dev,

		"parsed %d != regulators %d - check your device tree!\n",

			num_parsed, num_regulators);



		num_regulators = num_parsed;

		priv->num_regulators = num_regulators;

	}



	for (i = 0; i < num_regulators; i++) {

		struct regulator_init_data *init_data;

		struct regulator_desc *desc;

drivers/regulator/mc13xxx-regulator-core.c

+8 −2
Original line number Diff line number Diff line
@@ -181,12 +181,14 @@ EXPORT_SYMBOL_GPL(mc13xxx_get_num_regulators_dt); 


struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(

	struct platform_device *pdev, struct mc13xxx_regulator *regulators,

	int num_regulators)

	int num_regulators, int *num_parsed)

{

	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);

	struct mc13xxx_regulator_init_data *data, *p;

	struct device_node *parent, *child;

	int i;

	int i, parsed = 0;



	*num_parsed = 0;



	of_node_get(pdev->dev.parent->of_node);

	parent = of_find_node_by_name(pdev->dev.parent->of_node, "regulators");
@@ -203,16 +205,20 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt( 
		for (i = 0; i < num_regulators; i++) {

			if (!of_node_cmp(child->name,

					 regulators[i].desc.name)) {



				p->id = i;

				p->init_data = of_get_regulator_init_data(

							&pdev->dev, child);

				p->node = child;

				p++;



				parsed++;

				break;

			}

		}

	}



	*num_parsed = parsed;

	return data;

}

EXPORT_SYMBOL_GPL(mc13xxx_parse_regulators_dt);

drivers/regulator/mc13xxx.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, 
extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev);

extern struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(

	struct platform_device *pdev, struct mc13xxx_regulator *regulators,

	int num_regulators);

	int num_regulators, int *num_parsed);

#else

static inline int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)

{
@@ -48,7 +48,7 @@ static inline int mc13xxx_get_num_regulators_dt(struct platform_device *pdev) 


static inline struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(

	struct platform_device *pdev, struct mc13xxx_regulator *regulators,

	int num_regulators)

	int num_regulators, int *num_parsed)

{

	return NULL;

}

drivers/regulator/tps65910-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data( 
		return NULL;

	}



	ret = of_regulator_match(pdev->dev.parent, regulators, matches, count);

	ret = of_regulator_match(&pdev->dev, regulators, matches, count);

	if (ret < 0) {

		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",

			ret);