From fdb00b81277d4ad2c5a88132d62a5c288741863a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 6 Aug 2012 11:34:55 +0000 Subject: MX28: Shuffle around the power management code Move some function calls to a more appropriate place, so they're called only when needed. Signed-off-by: Marek Vasut Cc: Stefano Babic Cc: Fabio Estevam Acked-by: Stefano Babic --- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 35106bae96..4b917bd186 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -661,17 +661,14 @@ void mxs_power_configure_power_source(void) mxs_src_power_init(); - batt_ready = mxs_is_batt_ready(); - if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) { - batt_good = mxs_is_batt_good(); + batt_ready = mxs_is_batt_ready(); if (batt_ready) { /* 5V source detected, good battery detected. */ mxs_batt_boot(); } else { - if (batt_good) { - /* 5V source detected, low battery detceted. */ - } else { + batt_good = mxs_is_batt_good(); + if (!batt_good) { /* 5V source detected, bad battery detected. */ writel(LRADC_CONVERSION_AUTOMATIC, &lradc_regs->hw_lradc_conversion_clr); -- cgit v1.2.1