diff options
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 9 | 
1 files changed, 3 insertions, 6 deletions
| diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 35106bae9..4b917bd18 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); |