瀏覽代碼

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 <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Marek Vasut 12 年之前
父節點
當前提交
fdb00b8127
共有 1 個文件被更改,包括 3 次插入6 次删除
  1. 3 6
      arch/arm/cpu/arm926ejs/mxs/spl_power_init.c

+ 3 - 6
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);