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

Commit 8785eb1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high
  regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register
  wm8350-regulator: fix wm8350_register_regulator error handling
  ab3100: fix off-by-one value range checking for voltage selector
parents a6f80fb7 8b24599e

arch/arm/mach-davinci/board-da850-evm.c

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/tps6507x.h>

#include <linux/mfd/tps6507x.h>

#include <linux/input/tps6507x-ts.h>
@@ -469,6 +470,11 @@ struct regulator_consumer_supply tps65070_ldo2_consumers[] = { 
	},

};



/* We take advantage of the fact that both defdcdc{2,3} are tied high */

static struct tps6507x_reg_platform_data tps6507x_platform_data = {

	.defdcdc_default = true,

};



struct regulator_init_data tps65070_regulator_data[] = {

	/* dcdc1 */

	{
@@ -494,6 +500,7 @@ struct regulator_init_data tps65070_regulator_data[] = { 
		},

		.num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc2_consumers),

		.consumer_supplies = tps65070_dcdc2_consumers,

		.driver_data = &tps6507x_platform_data,

	},



	/* dcdc3 */
@@ -507,6 +514,7 @@ struct regulator_init_data tps65070_regulator_data[] = { 
		},

		.num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc3_consumers),

		.consumer_supplies = tps65070_dcdc3_consumers,

		.driver_data = &tps6507x_platform_data,

	},



	/* ldo1 */

drivers/regulator/ab3100.c

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int ab3100_list_voltage_regulator(struct regulator_dev *reg, 
{

	struct ab3100_regulator *abreg = reg->reg_data;



	if (selector > abreg->voltages_len)

	if (selector >= abreg->voltages_len)

		return -EINVAL;

	return abreg->typ_voltages[selector];

}
@@ -318,7 +318,7 @@ static int ab3100_get_voltage_regulator(struct regulator_dev *reg) 
	regval &= 0xE0;

	regval >>= 5;



	if (regval > abreg->voltages_len) {

	if (regval >= abreg->voltages_len) {

		dev_err(&reg->dev,

			"regulator register %02x contains an illegal voltage setting\n",

			abreg->regreg);

drivers/regulator/tps6507x-regulator.c

+29 −7
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/tps6507x.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/mfd/tps6507x.h>
@@ -101,9 +102,12 @@ struct tps_info { 
	unsigned max_uV;

	u8 table_len;

	const u16 *table;



	/* Does DCDC high or the low register defines output voltage? */

	bool defdcdc_default;

};



static const struct tps_info tps6507x_pmic_regs[] = {

static struct tps_info tps6507x_pmic_regs[] = {

	{

		.name = "VDCDC1",

		.min_uV = 725000,
@@ -145,7 +149,7 @@ struct tps6507x_pmic { 
	struct regulator_desc desc[TPS6507X_NUM_REGULATOR];

	struct tps6507x_dev *mfd;

	struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];

	const struct tps_info *info[TPS6507X_NUM_REGULATOR];

	struct tps_info *info[TPS6507X_NUM_REGULATOR];

	struct mutex io_lock;

};

static inline int tps6507x_pmic_read(struct tps6507x_pmic *tps, u8 reg)
@@ -341,9 +345,15 @@ static int tps6507x_pmic_dcdc_get_voltage(struct regulator_dev *dev) 
		reg = TPS6507X_REG_DEFDCDC1;

		break;

	case TPS6507X_DCDC_2:

		if (tps->info[dcdc]->defdcdc_default)

			reg = TPS6507X_REG_DEFDCDC2_HIGH;

		else

			reg = TPS6507X_REG_DEFDCDC2_LOW;

		break;

	case TPS6507X_DCDC_3:

		if (tps->info[dcdc]->defdcdc_default)

			reg = TPS6507X_REG_DEFDCDC3_HIGH;

		else

			reg = TPS6507X_REG_DEFDCDC3_LOW;

		break;

	default:
@@ -370,9 +380,15 @@ static int tps6507x_pmic_dcdc_set_voltage(struct regulator_dev *dev, 
		reg = TPS6507X_REG_DEFDCDC1;

		break;

	case TPS6507X_DCDC_2:

		if (tps->info[dcdc]->defdcdc_default)

			reg = TPS6507X_REG_DEFDCDC2_HIGH;

		else

			reg = TPS6507X_REG_DEFDCDC2_LOW;

		break;

	case TPS6507X_DCDC_3:

		if (tps->info[dcdc]->defdcdc_default)

			reg = TPS6507X_REG_DEFDCDC3_HIGH;

		else

			reg = TPS6507X_REG_DEFDCDC3_LOW;

		break;

	default:
@@ -532,7 +548,7 @@ int tps6507x_pmic_probe(struct platform_device *pdev) 
{

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

	static int desc_id;

	const struct tps_info *info = &tps6507x_pmic_regs[0];

	struct tps_info *info = &tps6507x_pmic_regs[0];

	struct regulator_init_data *init_data;

	struct regulator_dev *rdev;

	struct tps6507x_pmic *tps;
@@ -569,6 +585,12 @@ int tps6507x_pmic_probe(struct platform_device *pdev) 
	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {

		/* Register the regulators */

		tps->info[i] = info;

		if (init_data->driver_data) {

			struct tps6507x_reg_platform_data *data =

							init_data->driver_data;

			tps->info[i]->defdcdc_default = data->defdcdc_default;

		}



		tps->desc[i].name = info->name;

		tps->desc[i].id = desc_id++;

		tps->desc[i].n_voltages = num_voltages[i];

drivers/regulator/wm8350-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ int wm8350_register_regulator(struct wm8350 *wm8350, int reg, 
	if (ret != 0) {

		dev_err(wm8350->dev, "Failed to register regulator %d: %d\n",

			reg, ret);

		platform_device_del(pdev);

		platform_device_put(pdev);

		wm8350->pmic.pdev[reg] = NULL;

	}

include/linux/regulator/tps6507x.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * tps6507x.h  --  Voltage regulation for the Texas Instruments TPS6507X

 *

 * Copyright (C) 2010 Texas Instruments, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#ifndef REGULATOR_TPS6507X

#define REGULATOR_TPS6507X



/**

 * tps6507x_reg_platform_data - platform data for tps6507x

 * @defdcdc_default: Defines whether DCDC high or the low register controls

 *	output voltage by default. Valid for DCDC2 and DCDC3 outputs only.

 */

struct tps6507x_reg_platform_data {

	bool defdcdc_default;

};



#endif