mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
regulator: core: use regulator_ena_pin member
The regulator_dev has regulator_enable_gpio structure. 'ena_gpio' and 'ena_gpio_invert' were moved to in regulator_enable_gpio. regulator_dev ---> regulator_enable_gpio .ena_gpio .gpio .ena_gpio_invert .ena_gpio_invert Pointer, 'ena_pin' is used for checking valid enable GPIO pin. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Reviewed-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
967cfb18c0
commit
7b74d14924
2 changed files with 3 additions and 5 deletions
|
@ -1945,7 +1945,7 @@ EXPORT_SYMBOL_GPL(regulator_disable_regmap);
|
||||||
static int _regulator_is_enabled(struct regulator_dev *rdev)
|
static int _regulator_is_enabled(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
/* A GPIO control always takes precedence */
|
/* A GPIO control always takes precedence */
|
||||||
if (rdev->ena_gpio)
|
if (rdev->ena_pin)
|
||||||
return rdev->ena_gpio_state;
|
return rdev->ena_gpio_state;
|
||||||
|
|
||||||
/* If we don't know then assume that the regulator is always on */
|
/* If we don't know then assume that the regulator is always on */
|
||||||
|
@ -3344,7 +3344,7 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
if (rdev->ena_gpio || ops->is_enabled) {
|
if (rdev->ena_pin || ops->is_enabled) {
|
||||||
status = device_create_file(dev, &dev_attr_state);
|
status = device_create_file(dev, &dev_attr_state);
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
return status;
|
return status;
|
||||||
|
@ -3556,7 +3556,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
||||||
if (config->ena_gpio_flags & GPIOF_OUT_INIT_HIGH)
|
if (config->ena_gpio_flags & GPIOF_OUT_INIT_HIGH)
|
||||||
rdev->ena_gpio_state = 1;
|
rdev->ena_gpio_state = 1;
|
||||||
|
|
||||||
if (rdev->ena_gpio_invert)
|
if (config->ena_gpio_invert)
|
||||||
rdev->ena_gpio_state = !rdev->ena_gpio_state;
|
rdev->ena_gpio_state = !rdev->ena_gpio_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -302,8 +302,6 @@ struct regulator_dev {
|
||||||
struct dentry *debugfs;
|
struct dentry *debugfs;
|
||||||
|
|
||||||
struct regulator_enable_gpio *ena_pin;
|
struct regulator_enable_gpio *ena_pin;
|
||||||
int ena_gpio;
|
|
||||||
unsigned int ena_gpio_invert:1;
|
|
||||||
unsigned int ena_gpio_state:1;
|
unsigned int ena_gpio_state:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue