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

Commit c8bf9fec 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: (27 commits)
  Regulators: wm8400 - cleanup platform driver data handling
  Regulators: wm8994 - clean up driver data after removal
  Regulators: wm831x-xxx - clean up driver data after removal
  Regulators: pcap-regulator - clean up driver data after removal
  Regulators: max8660 - annotate probe and remove methods
  Regulators: max1586 - annotate probe and remove methods
  Regulators: lp3971 - fail if platform data was not supplied
  Regulators: tps6507x-regulator - mark probe method as __devinit
  Regulators: tps65023-regulator - mark probe method as __devinit
  Regulators: twl-regulator - mark probe function as __devinit
  Regulators: fixed - annotate probe and remove methods
  Regulators: ab3100 - fix probe and remove annotations
  Regulators: virtual - use sysfs attribute groups
  twl6030: regulator: Configure STATE register instead of REMAP
  regulator: Provide optional dummy regulator for consumers
  regulator: Assume regulators are enabled if they don't report anything
  regulator: Convert fixed voltage regulator to use enable_time()
  regulator: Add WM8994 regulator support
  regulator: enable max8649 regulator driver
  regulator: trivial: fix typos in user-visible Kconfig text
  ...
parents a2e28fc1 1ad02bbc

drivers/regulator/Kconfig

+27 −2
Original line number Diff line number Diff line
@@ -27,6 +27,17 @@ config REGULATOR_DEBUG 
	help

	  Say yes here to enable debugging support.



config REGULATOR_DUMMY

	bool "Provide a dummy regulator if regulator lookups fail"

	help

	  If this option is enabled then when a regulator lookup fails

	  and the board has not specified that it has provided full

	  constraints then the regulator core will provide an always

	  enabled dummy regulator will be provided, allowing consumer

	  drivers to continue.



	  A warning will be generated when this substitution is done.



config REGULATOR_FIXED_VOLTAGE

	tristate "Fixed voltage regulator support"

	help
@@ -69,6 +80,13 @@ config REGULATOR_MAX1586 
	  regulator via I2C bus. The provided regulator is suitable

	  for PXA27x chips to control VCC_CORE and VCC_USIM voltages.



config REGULATOR_MAX8649

	tristate "Maxim 8649 voltage regulator"

	depends on I2C

	help

	  This driver controls a Maxim 8649 voltage output regulator via

	  I2C bus.



config REGULATOR_MAX8660

	tristate "Maxim 8660/8661 voltage regulator"

	depends on I2C
@@ -91,19 +109,26 @@ config REGULATOR_WM831X 
	  of PMIC devices.



config REGULATOR_WM8350

	tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"

	tristate "Wolfson Microelectronics WM8350 AudioPlus PMIC"

	depends on MFD_WM8350

	help

	  This driver provides support for the voltage and current regulators

          of the WM8350 AudioPlus PMIC.



config REGULATOR_WM8400

	tristate "Wolfson Microelectroncis WM8400 AudioPlus PMIC"

	tristate "Wolfson Microelectronics WM8400 AudioPlus PMIC"

	depends on MFD_WM8400

	help

	  This driver provides support for the voltage regulators of the

	  WM8400 AudioPlus PMIC.



config REGULATOR_WM8994

	tristate "Wolfson Microelectronics WM8994 CODEC"

	depends on MFD_WM8994

	help

	  This driver provides support for the voltage regulators on the

	  WM8994 CODEC.



config REGULATOR_DA903X

	tristate "Support regulators on Dialog Semiconductor DA9030/DA9034 PMIC"

	depends on PMIC_DA903X

drivers/regulator/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -9,15 +9,18 @@ obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o 
obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o



obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o

obj-$(CONFIG_REGULATOR_DUMMY) += dummy.o

obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o

obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o

obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o

obj-$(CONFIG_REGULATOR_MAX8649)	+= max8649.o

obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o

obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o

obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o

obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o

obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o

obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o

obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o

obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o

obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o

obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o

drivers/regulator/ab3100.c

+3 −3
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
 * for all the different regulators.

 */



static int __init ab3100_regulators_probe(struct platform_device *pdev)

static int __devinit ab3100_regulators_probe(struct platform_device *pdev)

{

	struct ab3100_platform_data *plfdata = pdev->dev.platform_data;

	struct ab3100 *ab3100 = platform_get_drvdata(pdev);
@@ -641,7 +641,7 @@ static int __init ab3100_regulators_probe(struct platform_device *pdev) 
	return 0;

}



static int __exit ab3100_regulators_remove(struct platform_device *pdev)

static int __devexit ab3100_regulators_remove(struct platform_device *pdev)

{

	int i;
@@ -659,7 +659,7 @@ static struct platform_driver ab3100_regulators_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = ab3100_regulators_probe,

	.remove = __exit_p(ab3100_regulators_remove),

	.remove = __devexit_p(ab3100_regulators_remove),

};



static __init int ab3100_regulators_init(void)

drivers/regulator/core.c

+68 −11
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ 
#include <linux/err.h>

#include <linux/mutex.h>

#include <linux/suspend.h>

#include <linux/delay.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>



#include "dummy.h"



#define REGULATOR_VERSION "0.5"



static DEFINE_MUTEX(regulator_list_mutex);
@@ -1084,6 +1087,13 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, 
	return NULL;

}



static int _regulator_get_enable_time(struct regulator_dev *rdev)

{

	if (!rdev->desc->ops->enable_time)

		return 0;

	return rdev->desc->ops->enable_time(rdev);

}



/* Internal regulator request function */

static struct regulator *_regulator_get(struct device *dev, const char *id,

					int exclusive)
@@ -1115,6 +1125,22 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
			goto found;

		}

	}



#ifdef CONFIG_REGULATOR_DUMMY

	if (!devname)

		devname = "deviceless";



	/* If the board didn't flag that it was fully constrained then

	 * substitute in a dummy regulator so consumers can continue.

	 */

	if (!has_full_constraints) {

		pr_warning("%s supply %s not found, using dummy regulator\n",

			   devname, id);

		rdev = dummy_regulator_rdev;

		goto found;

	}

#endif



	mutex_unlock(&regulator_list_mutex);

	return regulator;
@@ -1251,7 +1277,7 @@ static int _regulator_can_change_status(struct regulator_dev *rdev) 
/* locks held by regulator_enable() */

static int _regulator_enable(struct regulator_dev *rdev)

{

	int ret;

	int ret, delay;



	/* do we need to enable the supply regulator first */

	if (rdev->supply) {
@@ -1275,13 +1301,34 @@ static int _regulator_enable(struct regulator_dev *rdev) 
			if (!_regulator_can_change_status(rdev))

				return -EPERM;



			if (rdev->desc->ops->enable) {

			if (!rdev->desc->ops->enable)

				return -EINVAL;



			/* Query before enabling in case configuration

			 * dependant.  */

			ret = _regulator_get_enable_time(rdev);

			if (ret >= 0) {

				delay = ret;

			} else {

				printk(KERN_WARNING

					"%s: enable_time() failed for %s: %d\n",

					__func__, rdev_get_name(rdev),

					ret);

				delay = 0;

			}



			/* Allow the regulator to ramp; it would be useful

			 * to extend this for bulk operations so that the

			 * regulators can ramp together.  */

			ret = rdev->desc->ops->enable(rdev);

			if (ret < 0)

				return ret;

			} else {

				return -EINVAL;

			}



			if (delay >= 1000)

				mdelay(delay / 1000);

			else if (delay)

				udelay(delay);



		} else if (ret < 0) {

			printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n",

			       __func__, rdev_get_name(rdev), ret);
@@ -1341,6 +1388,9 @@ static int _regulator_disable(struct regulator_dev *rdev) 
				       __func__, rdev_get_name(rdev));

				return ret;

			}



			_notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE,

					     NULL);

		}



		/* decrease our supplies ref count and disable if required */
@@ -1399,8 +1449,8 @@ static int _regulator_force_disable(struct regulator_dev *rdev) 
			return ret;

		}

		/* notify other consumers that power has been forced off */

		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE,

			NULL);

		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |

			REGULATOR_EVENT_DISABLE, NULL);

	}



	/* decrease our supplies ref count and disable if required */
@@ -1434,9 +1484,9 @@ EXPORT_SYMBOL_GPL(regulator_force_disable); 


static int _regulator_is_enabled(struct regulator_dev *rdev)

{

	/* sanity check */

	/* If we don't know then assume that the regulator is always on */

	if (!rdev->desc->ops->is_enabled)

		return -EINVAL;

		return 1;



	return rdev->desc->ops->is_enabled(rdev);

}
@@ -2451,8 +2501,15 @@ EXPORT_SYMBOL_GPL(regulator_get_init_drvdata); 


static int __init regulator_init(void)

{

	int ret;



	printk(KERN_INFO "regulator: core version %s\n", REGULATOR_VERSION);

	return class_register(&regulator_class);



	ret = class_register(&regulator_class);



	regulator_dummy_init();



	return ret;

}



/* init early to allow our consumers to complete system booting */

drivers/regulator/dummy.c

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

 * dummy.c

 *

 * Copyright 2010 Wolfson Microelectronics PLC.

 *

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

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

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation; either version 2 of the

 * License, or (at your option) any later version.

 *

 * This is useful for systems with mixed controllable and

 * non-controllable regulators, as well as for allowing testing on

 * systems with no controllable regulators.

 */



#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>



#include "dummy.h"



struct regulator_dev *dummy_regulator_rdev;



static struct regulator_init_data dummy_initdata;



static struct regulator_ops dummy_ops;



static struct regulator_desc dummy_desc = {

	.name = "dummy",

	.id = -1,

	.type = REGULATOR_VOLTAGE,

	.owner = THIS_MODULE,

	.ops = &dummy_ops,

};



static struct platform_device *dummy_pdev;



void __init regulator_dummy_init(void)

{

	int ret;



	dummy_pdev = platform_device_alloc("reg-dummy", -1);

	if (!dummy_pdev) {

		pr_err("Failed to allocate dummy regulator device\n");

		return;

	}



	ret = platform_device_add(dummy_pdev);

	if (ret != 0) {

		pr_err("Failed to register dummy regulator device: %d\n", ret);

		platform_device_put(dummy_pdev);

		return;

	}



	dummy_regulator_rdev = regulator_register(&dummy_desc, NULL,

						  &dummy_initdata, NULL);

	if (IS_ERR(dummy_regulator_rdev)) {

		ret = PTR_ERR(dummy_regulator_rdev);

		pr_err("Failed to register regulator: %d\n", ret);

		platform_device_unregister(dummy_pdev);

		return;

	}

}