summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2019-01-17 12:58:29 +0100
committerPhilippe Schenker <philippe.schenker@toradex.com>2019-01-17 15:32:49 +0100
commitf2929abc77fcbc44960fa1270c819b79137ecdfa (patch)
tree625906ec89aaa7d6e31b29b6f1faa93fbda9d93e /include
parent1a19508247f21b5eb2f1b15003a6145b17aa2b76 (diff)
Regulator: Core: Add clock-enable to fixed-regulator
This adds the possibility to enable a fixed-regulator with a clock. Signed-off-by: <philippe.schenker@toradex.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/driver.h3
-rw-r--r--include/linux/regulator/fixed.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 3c3786df044c..da6da0507cda 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -376,6 +376,7 @@ struct regulator_config {
void *driver_data;
struct device_node *of_node;
struct regmap *regmap;
+ struct clk *ena_clk;
bool ena_gpio_initialized;
int ena_gpio;
@@ -424,6 +425,8 @@ struct regulator_dev {
struct regulator_enable_gpio *ena_pin;
unsigned int ena_gpio_state:1;
+ struct clk *ena_clk;
+ unsigned int ena_clk_state;
unsigned int is_switch:1;
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index ba4ac009d832..a5859c1d2c01 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -56,6 +56,7 @@ struct fixed_voltage_config {
unsigned enable_high:1;
unsigned enabled_at_boot:1;
struct regulator_init_data *init_data;
+ struct clk *ena_clk;
};
struct regulator_consumer_supply;