On Mon, 23 Mar 2015, Charles Keepax wrote:
> The low power sleep mode on wm5110 requires that the LDO1 regulator be
> set to 1.175V prior to entering sleep, then returned to 1.2V after
> exiting sleep mode. This patch apply these regulator settings.
>
> Signed-off-by: Charles Keepax <ckee...@opensource.wolfsonmicro.com>
> Acked-by: Mark Brown <broo...@kernel.org>
> ---
> drivers/mfd/arizona-core.c | 52
> ++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 52 insertions(+), 0 deletions(-)
Acked-by: Lee Jones <lee.jo...@linaro.org>
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index b82b909..01fb9eb 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -447,6 +447,37 @@ static int arizona_runtime_resume(struct device *dev)
> goto err;
> }
> break;
> + case WM5110:
> + case WM8280:
> + ret = arizona_wait_for_boot(arizona);
> + if (ret)
> + goto err;
> +
> + if (arizona->external_dcvdd) {
> + ret = regmap_update_bits(arizona->regmap,
> + ARIZONA_ISOLATION_CONTROL,
> + ARIZONA_ISOLATE_DCVDD1, 0);
> + if (ret) {
> + dev_err(arizona->dev,
> + "Failed to connect DCVDD: %d\n", ret);
> + goto err;
> + }
> + } else {
> + /*
> + * As this is only called for the internal regulator
> + * (where we know voltage ranges available) it is ok
> + * to request an exact range.
> + */
> + ret = regulator_set_voltage(arizona->dcvdd,
> + 1200000, 1200000);
> + if (ret < 0) {
> + dev_err(arizona->dev,
> + "Failed to set resume voltage: %d\n",
> + ret);
> + goto err;
> + }
> + }
> + break;
> default:
> ret = arizona_wait_for_boot(arizona);
> if (ret != 0) {
> @@ -497,6 +528,27 @@ static int arizona_runtime_suspend(struct device *dev)
> ret);
> return ret;
> }
> + } else {
> + switch (arizona->type) {
> + case WM5110:
> + case WM8280:
> + /*
> + * As this is only called for the internal regulator
> + * (where we know voltage ranges available) it is ok
> + * to request an exact range.
> + */
> + ret = regulator_set_voltage(arizona->dcvdd,
> + 1175000, 1175000);
> + if (ret < 0) {
> + dev_err(arizona->dev,
> + "Failed to set suspend voltage: %d\n",
> + ret);
> + return ret;
> + }
> + break;
> + default:
> + break;
> + }
> }
>
> regcache_cache_only(arizona->regmap, true);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
