提交 2229875d 编写于 作者: C Charles Keepax 提交者: Lee Jones

mfd: arizona: Factor out hard reset into helper functions

This patch adds functions for enabling and disabling the physical reset
line. This will be helpful in future refactoring.
Signed-off-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
上级 5f056bf0
...@@ -250,6 +250,20 @@ static int arizona_wait_for_boot(struct arizona *arizona) ...@@ -250,6 +250,20 @@ static int arizona_wait_for_boot(struct arizona *arizona)
return ret; return ret;
} }
static inline void arizona_enable_reset(struct arizona *arizona)
{
if (arizona->pdata.reset)
gpio_set_value_cansleep(arizona->pdata.reset, 0);
}
static void arizona_disable_reset(struct arizona *arizona)
{
if (arizona->pdata.reset) {
gpio_set_value_cansleep(arizona->pdata.reset, 1);
msleep(1);
}
}
static int arizona_apply_hardware_patch(struct arizona* arizona) static int arizona_apply_hardware_patch(struct arizona* arizona)
{ {
unsigned int fll, sysclk; unsigned int fll, sysclk;
...@@ -751,10 +765,7 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -751,10 +765,7 @@ int arizona_dev_init(struct arizona *arizona)
goto err_enable; goto err_enable;
} }
if (arizona->pdata.reset) { arizona_disable_reset(arizona);
gpio_set_value_cansleep(arizona->pdata.reset, 1);
msleep(1);
}
regcache_cache_only(arizona->regmap, false); regcache_cache_only(arizona->regmap, false);
...@@ -1046,8 +1057,7 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -1046,8 +1057,7 @@ int arizona_dev_init(struct arizona *arizona)
err_irq: err_irq:
arizona_irq_exit(arizona); arizona_irq_exit(arizona);
err_reset: err_reset:
if (arizona->pdata.reset) arizona_enable_reset(arizona);
gpio_set_value_cansleep(arizona->pdata.reset, 0);
regulator_disable(arizona->dcvdd); regulator_disable(arizona->dcvdd);
err_enable: err_enable:
regulator_bulk_disable(arizona->num_core_supplies, regulator_bulk_disable(arizona->num_core_supplies,
...@@ -1072,8 +1082,7 @@ int arizona_dev_exit(struct arizona *arizona) ...@@ -1072,8 +1082,7 @@ int arizona_dev_exit(struct arizona *arizona)
arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona); arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona);
arizona_free_irq(arizona, ARIZONA_IRQ_CLKGEN_ERR, arizona); arizona_free_irq(arizona, ARIZONA_IRQ_CLKGEN_ERR, arizona);
arizona_irq_exit(arizona); arizona_irq_exit(arizona);
if (arizona->pdata.reset) arizona_enable_reset(arizona);
gpio_set_value_cansleep(arizona->pdata.reset, 0);
regulator_bulk_disable(arizona->num_core_supplies, regulator_bulk_disable(arizona->num_core_supplies,
arizona->core_supplies); arizona->core_supplies);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册