diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-12-02 16:41:23 +0100 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-12-04 11:03:04 +0100 |
| commit | 78f1cffdcaef370b25cfa30d281e6a152ce27d73 (patch) | |
| tree | 676c9d6dae2eb1d7f18a6ac5116a963a9954d6ec /include/linux | |
| parent | 1e20e5bdfa950736a3e58da64bdcdc0c53702687 (diff) | |
Revert "Regulator: Core: Add clock-enable to fixed-regulator"
Reverting in favour of cherry-picked upstream solution. This was
done because errors where seen with old solution if, fec was not
compiled into the kernel.
This reverts commit 23d009e9486c4c31bcb204ec2316e0cf7ff3e277.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/driver.h | 3 | ||||
| -rw-r--r-- | include/linux/regulator/fixed.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 7a406415ca46..94417b4226bd 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -394,7 +394,6 @@ 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; @@ -443,8 +442,6 @@ 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 a5859c1d2c01..ba4ac009d832 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h @@ -56,7 +56,6 @@ 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; |