forked from jonsmirl/mpc5200
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
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 ...
- Loading branch information
Showing
28 changed files
with
1,622 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* 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; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
* dummy.h | ||
* | ||
* 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. | ||
*/ | ||
|
||
#ifndef _DUMMY_H | ||
#define _DUMMY_H | ||
|
||
struct regulator_dev; | ||
|
||
extern struct regulator_dev *dummy_regulator_rdev; | ||
|
||
#ifdef CONFIG_REGULATOR_DUMMY | ||
void __init regulator_dummy_init(void); | ||
#else | ||
static inline void regulator_dummy_init(void) { } | ||
#endif | ||
|
||
#endif |
Oops, something went wrong.