diff options
14 files changed, 14 insertions, 11 deletions
diff --git a/board/amlogic/txhd_r341_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txhd_r341_v1/firmware/scp_task/pwr_ctrl.c index 52468dd1d5..7bbae3f8a2 100644 --- a/board/amlogic/txhd_r341_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txhd_r341_v1/firmware/scp_task/pwr_ctrl.c @@ -321,7 +321,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -353,6 +352,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txhd_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txhd_skt_v1/firmware/scp_task/pwr_ctrl.c index 4d6599bdd0..3e418b1582 100644 --- a/board/amlogic/txhd_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txhd_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -351,6 +351,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p320_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p320_v1/firmware/scp_task/pwr_ctrl.c index 80ed3cc0cb..b64ecaace9 100644 --- a/board/amlogic/txl_p320_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p320_v1/firmware/scp_task/pwr_ctrl.c @@ -302,7 +302,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -332,6 +331,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p321_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p321_v1/firmware/scp_task/pwr_ctrl.c index 6b421e8e38..9e557cfcc8 100644 --- a/board/amlogic/txl_p321_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p321_v1/firmware/scp_task/pwr_ctrl.c @@ -371,7 +371,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -402,6 +401,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p323_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p323_v1/firmware/scp_task/pwr_ctrl.c index 6b421e8e38..9e557cfcc8 100644 --- a/board/amlogic/txl_p323_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p323_v1/firmware/scp_task/pwr_ctrl.c @@ -371,7 +371,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -402,6 +401,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p341_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p341_v1/firmware/scp_task/pwr_ctrl.c index 9b56dbf34e..2e1067db87 100644 --- a/board/amlogic/txl_p341_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p341_v1/firmware/scp_task/pwr_ctrl.c @@ -318,7 +318,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -348,6 +347,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p341_v2/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p341_v2/firmware/scp_task/pwr_ctrl.c index bf4a4880c2..c6071e33e4 100644 --- a/board/amlogic/txl_p341_v2/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p341_v2/firmware/scp_task/pwr_ctrl.c @@ -318,7 +318,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -348,6 +347,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_p346_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_p346_v1/firmware/scp_task/pwr_ctrl.c index 130ef4c9b6..8b890ffbc0 100644 --- a/board/amlogic/txl_p346_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_p346_v1/firmware/scp_task/pwr_ctrl.c @@ -296,7 +296,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -326,6 +325,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txl_t950_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txl_t950_skt_v1/firmware/scp_task/pwr_ctrl.c index 97a8849904..97f7df6b40 100644 --- a/board/amlogic/txl_t950_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txl_t950_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -320,7 +320,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -346,6 +345,7 @@ static unsigned int detect_key(unsigned int suspend_from) } else asm volatile("wfi"); } while (1); + wakeup_timer_clear(); restore_ao_timer(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txlx_t962e_r321_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txlx_t962e_r321_v1/firmware/scp_task/pwr_ctrl.c index 3736ffe577..029f0f6bbe 100644 --- a/board/amlogic/txlx_t962e_r321_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txlx_t962e_r321_v1/firmware/scp_task/pwr_ctrl.c @@ -349,7 +349,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -393,6 +392,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txlx_t962e_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txlx_t962e_skt_v1/firmware/scp_task/pwr_ctrl.c index 4d6599bdd0..3e418b1582 100644 --- a/board/amlogic/txlx_t962e_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txlx_t962e_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -351,6 +351,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txlx_t962x_r311_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txlx_t962x_r311_v1/firmware/scp_task/pwr_ctrl.c index d416cc265f..55d4e0151b 100644 --- a/board/amlogic/txlx_t962x_r311_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txlx_t962x_r311_v1/firmware/scp_task/pwr_ctrl.c @@ -370,7 +370,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -414,6 +413,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txlx_t962x_r314_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txlx_t962x_r314_v1/firmware/scp_task/pwr_ctrl.c index 1d4be86895..e2baf7a6fb 100644 --- a/board/amlogic/txlx_t962x_r314_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txlx_t962x_r314_v1/firmware/scp_task/pwr_ctrl.c @@ -370,7 +370,6 @@ static unsigned int detect_key(unsigned int suspend_from) if (time_out_ms != 0) time_out_ms--; if (time_out_ms == 0) { - wakeup_timer_clear(); exit_reason = AUTO_WAKEUP; } } @@ -414,6 +413,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; diff --git a/board/amlogic/txlx_t962x_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/txlx_t962x_skt_v1/firmware/scp_task/pwr_ctrl.c index 4d6599bdd0..3e418b1582 100644 --- a/board/amlogic/txlx_t962x_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/txlx_t962x_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -351,6 +351,7 @@ static unsigned int detect_key(unsigned int suspend_from) asm volatile("wfi"); } while (1); + wakeup_timer_clear(); saradc_disable(); return exit_reason; |