charge_state: Add PWR_STATE_FORCED_IDLE state

Add PWR_STATE_FORCED_IDLE state which indicates PWR_STATE_IDLE state is
forced when charge control is not normal.

Also update led.c files for boards to replace chflag use with new
PWR_STATE_FORCED_IDLE.

BUG=b:241167493
TEST=make buildall, zmake build --all, make runhosttests -j
BRANCH=None

Signed-off-by: Parth Malkan <parthmalkan@google.com>
Cq-Depend: chromium:3807136
Change-Id: Ib00ed3df977482a4430b0c3d16a2a0e305bbd47f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3807134
Reviewed-by: Wai-Hong Tam <waihong@google.com>

47 files changed, 316 insertions, 373 deletions

diff --git a/board/agah/led.c b/board/agah/led.c
index d81bc1b0ab..d8f9894ba2 100644
--- a/board/agah/led.c
+++ b/board/agah/led.c
@@ -109,8 +109,6 @@ static void led_set_battery(void)
 	static unsigned int battery_ticks;
 	static unsigned int suspend_ticks;
 
-	uint32_t chflags = charge_get_flags();
-
 	battery_ticks++;
 
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
@@ -158,14 +156,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/anahera/led.c b/board/anahera/led.c
index b72fc45e2c..c00e56a12a 100644
--- a/board/anahera/led.c
+++ b/board/anahera/led.c
@@ -134,8 +134,6 @@ static void led_set_battery(void)
 {
 	static unsigned int battery_ticks;
 
-	uint32_t chflags = charge_get_flags();
-
 	battery_ticks++;
 
 	switch (charge_get_state()) {
@@ -189,14 +187,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/banshee/led.c b/board/banshee/led.c
index fc51acf32e..a94cef7889 100644
--- a/board/banshee/led.c
+++ b/board/banshee/led.c
@@ -296,7 +296,6 @@ static void set_active_port_color(int color)
 static void led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -323,12 +322,11 @@ static void led_set_battery(void)
 		set_active_port_color(EC_LED_COLOR_GREEN);
 		break;
 	case PWR_STATE_IDLE:
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color((battery_ticks & 0x4) ?
-						      EC_LED_COLOR_AMBER :
-						      -1);
-		else
-			set_active_port_color(EC_LED_COLOR_AMBER);
+		set_active_port_color(EC_LED_COLOR_AMBER);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks & 0x4) ? EC_LED_COLOR_AMBER : -1);
 		break;
 	default:
 		break;
diff --git a/board/beadrix/led.c b/board/beadrix/led.c
index 8b81f6fea8..da8cb5f052 100644
--- a/board/beadrix/led.c
+++ b/board/beadrix/led.c
@@ -63,7 +63,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	enum led_color color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -103,16 +102,16 @@ static void board_led_set_battery(void)
 		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Red 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_RED;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Red 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_RED;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/berknip/led.c b/board/berknip/led.c
index 72e6e2c017..154b82b0cc 100644
--- a/board/berknip/led.c
+++ b/board/berknip/led.c
@@ -129,7 +129,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -186,14 +185,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/bloog/led.c b/board/bloog/led.c
index 7b623ef4f8..965cca73ea 100644
--- a/board/bloog/led.c
+++ b/board/bloog/led.c
@@ -128,7 +128,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -182,14 +181,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/burnet/led.c b/board/burnet/led.c
index c705ebd42e..a28a6860d6 100644
--- a/board/burnet/led.c
+++ b/board/burnet/led.c
@@ -118,7 +118,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -168,11 +167,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/careena/led.c b/board/careena/led.c
index 698825bafc..db82fe392d 100644
--- a/board/careena/led.c
+++ b/board/careena/led.c
@@ -88,7 +88,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -131,11 +130,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x4) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x4) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/chronicler/led.c b/board/chronicler/led.c
index af4d401e70..5129f3fc68 100644
--- a/board/chronicler/led.c
+++ b/board/chronicler/led.c
@@ -131,7 +131,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int suspend_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -182,14 +181,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/coachz/led.c b/board/coachz/led.c
index 1562e69a15..35d55bea84 100644
--- a/board/coachz/led.c
+++ b/board/coachz/led.c
@@ -69,7 +69,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -137,16 +136,16 @@ static void board_led_set_battery(void)
 		}
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Amber 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/coral/led.c b/board/coral/led.c
index 0743c5e691..f8832f5632 100644
--- a/board/coral/led.c
+++ b/board/coral/led.c
@@ -204,10 +204,10 @@ static enum led_states led_get_state(void)
 		new_state = STATE_CHARGING_LVL_3;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			new_state = STATE_FACTORY_TEST;
-		else
-			new_state = STATE_DISCHARGE_S0;
+		new_state = STATE_DISCHARGE_S0;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		new_state = STATE_FACTORY_TEST;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/corori/led.c b/board/corori/led.c
index 8a8503a526..37bbf7032a 100644
--- a/board/corori/led.c
+++ b/board/corori/led.c
@@ -150,10 +150,10 @@ static enum led_states led_get_state(void)
 		new_state = STATE_CHARGING_FULL_CHARGE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			new_state = STATE_FACTORY_TEST;
-		else
-			new_state = STATE_DISCHARGE_S0;
+		new_state = STATE_DISCHARGE_S0;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		new_state = STATE_FACTORY_TEST;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/dirinboz/led.c b/board/dirinboz/led.c
index 60526bee12..6190b2546b 100644
--- a/board/dirinboz/led.c
+++ b/board/dirinboz/led.c
@@ -133,7 +133,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -184,14 +183,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/dojo/led.c b/board/dojo/led.c
index 4f59ca89b7..56b53a542d 100644
--- a/board/dojo/led.c
+++ b/board/dojo/led.c
@@ -131,7 +131,6 @@ static void board_led_set_battery(void)
 {
 	static int battery_ticks;
 	int battery_led_blink_cycle;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -182,15 +181,15 @@ static void board_led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			battery_led_blink_cycle =
-				battery_ticks % (2 * TIMES_TICK_ONE_SEC);
-			set_active_port_color(
-				(battery_led_blink_cycle < TIMES_TICK_ONE_SEC) ?
-					LED_AMBER :
-					LED_OFF);
-		} else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		battery_led_blink_cycle =
+			battery_ticks % (2 * TIMES_TICK_ONE_SEC);
+		set_active_port_color(
+			(battery_led_blink_cycle < TIMES_TICK_ONE_SEC) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/dratini/led.c b/board/dratini/led.c
index ab29ac0344..f85ea1f343 100644
--- a/board/dratini/led.c
+++ b/board/dratini/led.c
@@ -145,7 +145,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -199,14 +198,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/drawcia/led.c b/board/drawcia/led.c
index 3d743265f4..48dc7fd1d9 100644
--- a/board/drawcia/led.c
+++ b/board/drawcia/led.c
@@ -114,7 +114,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -163,11 +162,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/drawcia_riscv/led.c b/board/drawcia_riscv/led.c
index d45099e6c9..5ed8ee4832 100644
--- a/board/drawcia_riscv/led.c
+++ b/board/drawcia_riscv/led.c
@@ -114,7 +114,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -163,11 +162,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/elemi/led.c b/board/elemi/led.c
index fc29c3c67b..2c2bca50c3 100644
--- a/board/elemi/led.c
+++ b/board/elemi/led.c
@@ -131,7 +131,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int suspend_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -182,14 +181,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/gelarshie/led.c b/board/gelarshie/led.c
index aae9fa44cb..7455602e93 100644
--- a/board/gelarshie/led.c
+++ b/board/gelarshie/led.c
@@ -69,7 +69,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -137,16 +136,16 @@ static void board_led_set_battery(void)
 		}
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Amber 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/gumboz/led.c b/board/gumboz/led.c
index 8510426b9f..de6548951a 100644
--- a/board/gumboz/led.c
+++ b/board/gumboz/led.c
@@ -160,7 +160,6 @@ static void set_active_port_color(enum led_color color)
 static void led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -193,14 +192,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/haboki/led.c b/board/haboki/led.c
index 358df00c72..3918a55c1a 100644
--- a/board/haboki/led.c
+++ b/board/haboki/led.c
@@ -114,7 +114,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -163,11 +162,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/herobrine/led.c b/board/herobrine/led.c
index 31724dbfc9..ace04fcc4a 100644
--- a/board/herobrine/led.c
+++ b/board/herobrine/led.c
@@ -90,7 +90,6 @@ static void set_active_port_color(enum led_color color)
 static void board_led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -120,11 +119,11 @@ static void board_led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks & 0x4) ? LED_AMBER : LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color((battery_ticks & 0x4) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/homestar/led.c b/board/homestar/led.c
index f9eab763b3..786934dca3 100644
--- a/board/homestar/led.c
+++ b/board/homestar/led.c
@@ -78,7 +78,6 @@ static void board_led_set_battery(void)
 	int color = LED_OFF;
 	int period = 0;
 	int percent = DIV_ROUND_NEAREST(charge_get_display_charge(), 10);
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -115,16 +114,16 @@ static void board_led_set_battery(void)
 			color = LED_OFF;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode, Red 2 sec, green 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_RED;
-			else
-				color = LED_GREEN;
-		} else
+		color = LED_RED;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode, Red 2 sec, green 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_RED;
+		else
+			color = LED_GREEN;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/jinlon/led.c b/board/jinlon/led.c
index 88652dd797..d25d953dc2 100644
--- a/board/jinlon/led.c
+++ b/board/jinlon/led.c
@@ -145,7 +145,6 @@ static void set_active_port_color(enum led_color color)
 static void led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -178,14 +177,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/kappa/led.c b/board/kappa/led.c
index 7caac3dfef..60c0e4f294 100644
--- a/board/kappa/led.c
+++ b/board/kappa/led.c
@@ -82,7 +82,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -125,12 +124,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
 		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 	default:
 		/* Other states don't alter LED behavior */
 		break;
diff --git a/board/kingoftown/led.c b/board/kingoftown/led.c
index 412c14ef2f..ded9586f52 100644
--- a/board/kingoftown/led.c
+++ b/board/kingoftown/led.c
@@ -97,7 +97,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	static int power_ticks;
 	int led_blink_cycle;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -165,15 +164,13 @@ static void board_led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			led_blink_cycle =
-				battery_ticks % (2 * TIMES_TICK_ONE_SEC);
-			set_active_port_color(
-				(led_blink_cycle < TIMES_TICK_ONE_SEC) ?
-					LED_AMBER :
-					LED_OFF);
-		} else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_blink_cycle = battery_ticks % (2 * TIMES_TICK_ONE_SEC);
+		set_active_port_color((led_blink_cycle < TIMES_TICK_ONE_SEC) ?
+					      LED_AMBER :
+					      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/lantis/led.c b/board/lantis/led.c
index f593197d72..2624933b7f 100644
--- a/board/lantis/led.c
+++ b/board/lantis/led.c
@@ -165,7 +165,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -244,11 +243,11 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks & 0x2) ? LED_AMBER : LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color((battery_ticks & 0x2) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/lazor/led.c b/board/lazor/led.c
index 404b6b0956..be3658bff6 100644
--- a/board/lazor/led.c
+++ b/board/lazor/led.c
@@ -66,7 +66,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -106,16 +105,16 @@ static void board_led_set_battery(void)
 		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Amber 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/marzipan/led.c b/board/marzipan/led.c
index 996d06cdd5..4475718a87 100644
--- a/board/marzipan/led.c
+++ b/board/marzipan/led.c
@@ -66,7 +66,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -106,16 +105,16 @@ static void board_led_set_battery(void)
 		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Amber 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/mchpevb1/led.c b/board/mchpevb1/led.c
index 51b8fd1f0f..c34e6a91e2 100644
--- a/board/mchpevb1/led.c
+++ b/board/mchpevb1/led.c
@@ -112,7 +112,6 @@ static void board_led_set_battery(void)
 {
 #ifdef CONFIG_CHARGER
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -155,14 +154,14 @@ static void board_led_set_battery(void)
 		board_led_set_color_battery(LED_GREEN);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			board_led_set_color_battery(
-				(battery_ticks % LED_TOTAL_4SECS_TICKS <
-				 LED_ON_2SECS_TICKS) ?
-					LED_GREEN :
-					LED_AMBER);
-		else
-			board_led_set_color_battery(LED_GREEN);
+		board_led_set_color_battery(LED_GREEN);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		board_led_set_color_battery(
+			(battery_ticks % LED_TOTAL_4SECS_TICKS <
+			 LED_ON_2SECS_TICKS) ?
+				LED_GREEN :
+				LED_AMBER);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/morphius/led.c b/board/morphius/led.c
index 1d5be7fe6e..1d74629106 100644
--- a/board/morphius/led.c
+++ b/board/morphius/led.c
@@ -159,7 +159,6 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, suspend_led_deinit, HOOK_PRIO_DEFAULT);
 static void led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -175,11 +174,11 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks & 0x4) ? LED_AMBER : LED_OFF);
-		else
-			led_set_color_battery(LED_WHITE);
+		led_set_color_battery(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks & 0x4) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/mrbland/led.c b/board/mrbland/led.c
index 0ab6a7fe24..3960c3e2bc 100644
--- a/board/mrbland/led.c
+++ b/board/mrbland/led.c
@@ -97,7 +97,6 @@ static void board_led_set_battery(void)
 	int color = LED_OFF;
 	int period = 0;
 	int percent = DIV_ROUND_NEAREST(charge_get_display_charge(), 10);
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -133,16 +132,16 @@ static void board_led_set_battery(void)
 			color = LED_OFF;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode, Red 2 sec, green 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_RED;
-			else
-				color = LED_GREEN;
-		} else
+		color = LED_RED;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode, Red 2 sec, green 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_RED;
+		else
+			color = LED_GREEN;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/nami/led.c b/board/nami/led.c
index 674421c43e..ba0a2ef31c 100644
--- a/board/nami/led.c
+++ b/board/nami/led.c
@@ -537,11 +537,13 @@ static void call_handler(void)
 		led_alert(1);
 		break;
 	case PWR_STATE_IDLE:
-		/* External power connected in IDLE. This is also used to show
-		 * factory mode when 'ectool chargecontrol idle' is run during
-		 * factory process. */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			led_factory(1);
+		/* External power connected in IDLE. */
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* This is used to show factory mode when
+		 * 'ectool chargecontrol idle' is run during factory process.
+		 */
+		led_factory(1);
 		break;
 	default:;
 	}
diff --git a/board/nautilus/led.c b/board/nautilus/led.c
index 93cabbd4c9..1439768326 100644
--- a/board/nautilus/led.c
+++ b/board/nautilus/led.c
@@ -107,10 +107,10 @@ static void nautilus_led_set_power_battery(void)
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
 	case PWR_STATE_IDLE:
-		if (charge_get_flags() & CHARGE_FLAG_EXTERNAL_POWER)
-			cur_led_color = LED_GREEN;
-		else
-			cur_led_color = LED_OFF;
+		cur_led_color = LED_OFF;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		cur_led_color = LED_GREEN;
 		break;
 	default:
 		cur_led_color = LED_RED;
diff --git a/board/nipperkin/led.c b/board/nipperkin/led.c
index a61a710579..720724828c 100644
--- a/board/nipperkin/led.c
+++ b/board/nipperkin/led.c
@@ -131,7 +131,6 @@ static void led_set_battery(void)
 {
 	static int battery_ticks;
 	static int power_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -207,14 +206,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/pazquel/led.c b/board/pazquel/led.c
index addea27afa..184794f613 100644
--- a/board/pazquel/led.c
+++ b/board/pazquel/led.c
@@ -65,7 +65,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	enum led_color color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -105,16 +104,16 @@ static void board_led_set_battery(void)
 		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Red 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_RED;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Red 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_RED;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/pompom/led.c b/board/pompom/led.c
index bfe7be7ded..c99da21aff 100644
--- a/board/pompom/led.c
+++ b/board/pompom/led.c
@@ -82,7 +82,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -109,16 +108,16 @@ static void board_led_set_battery(void)
 		color = LED_WHITE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: White 2 sec, Amber 2 sec */
-			period = (2 + 2);
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2)
-				color = LED_WHITE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_WHITE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: White 2 sec, Amber 2 sec */
+		period = (2 + 2);
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2)
 			color = LED_WHITE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/poppy/led.c b/board/poppy/led.c
index a2f31a7a74..7fb45d3823 100644
--- a/board/poppy/led.c
+++ b/board/poppy/led.c
@@ -93,7 +93,6 @@ static void set_active_port_color(enum led_color color)
 static void board_led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -123,11 +122,11 @@ static void board_led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks & 0x4) ? LED_AMBER : LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color((battery_ticks & 0x4) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/quackingstick/led.c b/board/quackingstick/led.c
index 235b25a6a2..3a62865bec 100644
--- a/board/quackingstick/led.c
+++ b/board/quackingstick/led.c
@@ -69,7 +69,6 @@ static void board_led_set_battery(void)
 	static int battery_ticks;
 	int color = LED_OFF;
 	int period = 0;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -111,16 +110,16 @@ static void board_led_set_battery(void)
 		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
+		color = LED_BLUE;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode: Blue 2 sec, Amber 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_BLUE;
+		else
+			color = LED_AMBER;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/rammus/led.c b/board/rammus/led.c
index add243d9d8..453a43b08f 100644
--- a/board/rammus/led.c
+++ b/board/rammus/led.c
@@ -149,10 +149,11 @@ static void rammus_led_set_battery(void)
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
 	case PWR_STATE_IDLE:
-		if (charge_get_flags() & CHARGE_FLAG_EXTERNAL_POWER)
-			config_battery_led(LED_STATE_FULL);
-		else
-			config_battery_led(LED_STATE_DISCHARGE);
+		config_battery_led(LED_STATE_DISCHARGE);
+		charge_ticks = 0;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		config_battery_led(LED_STATE_FULL);
 		charge_ticks = 0;
 		break;
 	default:
diff --git a/board/redrix/led.c b/board/redrix/led.c
index 187fcd1e78..d775397baf 100644
--- a/board/redrix/led.c
+++ b/board/redrix/led.c
@@ -155,7 +155,6 @@ static void set_active_port_color(enum led_color color)
 static void led_set_battery(void)
 {
 	static unsigned int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -206,14 +205,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/reef/led.c b/board/reef/led.c
index c4b8e53e36..6315e67ff3 100644
--- a/board/reef/led.c
+++ b/board/reef/led.c
@@ -129,14 +129,13 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_BLUE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks % LED_TOTAL_4SECS_TICKS <
-				 LED_ON_2SECS_TICKS) ?
-					LED_AMBER :
-					LED_BLUE);
-		else
-			led_set_color_battery(LED_BLUE);
+		led_set_color_battery(LED_BLUE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks % LED_TOTAL_4SECS_TICKS <
+				       LED_ON_2SECS_TICKS) ?
+					      LED_AMBER :
+					      LED_BLUE);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/reef_it8320/led.c b/board/reef_it8320/led.c
index 54c6980a6e..2c168bb8d7 100644
--- a/board/reef_it8320/led.c
+++ b/board/reef_it8320/led.c
@@ -130,14 +130,13 @@ static void led_set_battery(void)
 		led_set_color_battery(LED_BLUE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			led_set_color_battery(
-				(battery_ticks % LED_TOTAL_4SECS_TICKS <
-				 LED_ON_2SECS_TICKS) ?
-					LED_AMBER :
-					LED_BLUE);
-		else
-			led_set_color_battery(LED_BLUE);
+		led_set_color_battery(LED_BLUE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		led_set_color_battery((battery_ticks % LED_TOTAL_4SECS_TICKS <
+				       LED_ON_2SECS_TICKS) ?
+					      LED_AMBER :
+					      LED_BLUE);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/scarlet/led.c b/board/scarlet/led.c
index 9c1d00ac7b..2ec838702c 100644
--- a/board/scarlet/led.c
+++ b/board/scarlet/led.c
@@ -87,11 +87,11 @@ static void scarlet_led_set_battery(void)
 		bat_led_set_color(LED_GREEN);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE. */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			bat_led_set_color((battery_second & 0x2) ? LED_GREEN :
-								   LED_AMBER);
-		else
-			bat_led_set_color(LED_GREEN);
+		bat_led_set_color(LED_GREEN);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		bat_led_set_color((battery_second & 0x2) ? LED_GREEN :
+							   LED_AMBER);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/trogdor/led.c b/board/trogdor/led.c
index 07b28e8461..20c574d4e2 100644
--- a/board/trogdor/led.c
+++ b/board/trogdor/led.c
@@ -90,7 +90,6 @@ static void set_active_port_color(enum led_color color)
 static void board_led_set_battery(void)
 {
 	static int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -120,11 +119,11 @@ static void board_led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks & 0x4) ? LED_AMBER : LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color((battery_ticks & 0x4) ? LED_AMBER :
+							      LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/vell/led.c b/board/vell/led.c
index 611a2ef820..93173fab66 100644
--- a/board/vell/led.c
+++ b/board/vell/led.c
@@ -152,7 +152,6 @@ static void set_active_port_color(enum led_color color)
 static void led_set_battery(void)
 {
 	static unsigned int battery_ticks;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -207,14 +206,13 @@ static void led_set_battery(void)
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color(
-				(battery_ticks % LED_TICKS_PER_CYCLE <
-				 LED_ON_TICKS) ?
-					LED_AMBER :
-					LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		set_active_port_color(
+			(battery_ticks % LED_TICKS_PER_CYCLE < LED_ON_TICKS) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
diff --git a/board/wormdingler/led.c b/board/wormdingler/led.c
index f9eab763b3..786934dca3 100644
--- a/board/wormdingler/led.c
+++ b/board/wormdingler/led.c
@@ -78,7 +78,6 @@ static void board_led_set_battery(void)
 	int color = LED_OFF;
 	int period = 0;
 	int percent = DIV_ROUND_NEAREST(charge_get_display_charge(), 10);
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -115,16 +114,16 @@ static void board_led_set_battery(void)
 			color = LED_OFF;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode, Red 2 sec, green 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_RED;
-			else
-				color = LED_GREEN;
-		} else
+		color = LED_RED;
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		/* Factory mode, Red 2 sec, green 2 sec */
+		period = (2 + 2) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 2 * LED_ONE_SEC)
 			color = LED_RED;
+		else
+			color = LED_GREEN;
 		break;
 	default:
 		/* Other states don't alter LED behavior */