diff options
| -rw-r--r-- | drivers/regulator/core.c | 17 | ||||
| -rw-r--r-- | include/linux/regulator/machine.h | 5 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 8fd170788c3e..ac3a864d3635 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -53,7 +53,6 @@ static LIST_HEAD(regulator_list); | |||
| 53 | static LIST_HEAD(regulator_map_list); | 53 | static LIST_HEAD(regulator_map_list); |
| 54 | static LIST_HEAD(regulator_ena_gpio_list); | 54 | static LIST_HEAD(regulator_ena_gpio_list); |
| 55 | static bool has_full_constraints; | 55 | static bool has_full_constraints; |
| 56 | static bool board_wants_dummy_regulator; | ||
| 57 | 56 | ||
| 58 | static struct dentry *debugfs_root; | 57 | static struct dentry *debugfs_root; |
| 59 | 58 | ||
| @@ -3616,22 +3615,6 @@ void regulator_has_full_constraints(void) | |||
| 3616 | EXPORT_SYMBOL_GPL(regulator_has_full_constraints); | 3615 | EXPORT_SYMBOL_GPL(regulator_has_full_constraints); |
| 3617 | 3616 | ||
| 3618 | /** | 3617 | /** |
| 3619 | * regulator_use_dummy_regulator - Provide a dummy regulator when none is found | ||
| 3620 | * | ||
| 3621 | * Calling this function will cause the regulator API to provide a | ||
| 3622 | * dummy regulator to consumers if no physical regulator is found, | ||
| 3623 | * allowing most consumers to proceed as though a regulator were | ||
| 3624 | * configured. This allows systems such as those with software | ||
| 3625 | * controllable regulators for the CPU core only to be brought up more | ||
| 3626 | * readily. | ||
| 3627 | */ | ||
| 3628 | void regulator_use_dummy_regulator(void) | ||
| 3629 | { | ||
| 3630 | board_wants_dummy_regulator = true; | ||
| 3631 | } | ||
| 3632 | EXPORT_SYMBOL_GPL(regulator_use_dummy_regulator); | ||
| 3633 | |||
| 3634 | /** | ||
| 3635 | * rdev_get_drvdata - get rdev regulator driver data | 3618 | * rdev_get_drvdata - get rdev regulator driver data |
| 3636 | * @rdev: regulator | 3619 | * @rdev: regulator |
| 3637 | * | 3620 | * |
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 999b20ce06cf..a9f7c55a4d4d 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h | |||
| @@ -193,15 +193,10 @@ int regulator_suspend_finish(void); | |||
| 193 | 193 | ||
| 194 | #ifdef CONFIG_REGULATOR | 194 | #ifdef CONFIG_REGULATOR |
| 195 | void regulator_has_full_constraints(void); | 195 | void regulator_has_full_constraints(void); |
| 196 | void regulator_use_dummy_regulator(void); | ||
| 197 | #else | 196 | #else |
| 198 | static inline void regulator_has_full_constraints(void) | 197 | static inline void regulator_has_full_constraints(void) |
| 199 | { | 198 | { |
| 200 | } | 199 | } |
| 201 | |||
| 202 | static inline void regulator_use_dummy_regulator(void) | ||
| 203 | { | ||
| 204 | } | ||
| 205 | #endif | 200 | #endif |
| 206 | 201 | ||
| 207 | #endif | 202 | #endif |
