test: separate software and PMIC shutdown timing

ql-application/threadx/interface/custom_app/hal_key.c

@@ -29,6 +29,7 @@ extern int fota_start;
 #define KEY_LONG_PRESS_1S 1000/5
 #define KEY_LONG_PRESS_1_5S 1500/5
 #define KEY_LONG_PRESS_3S  3000/5
+#define PWRKEY_SOFT_SHUTDOWN_TEST  8000/5
 #define KEY_LONG_PRESS_5S  5000/5
 #define KEY_LONG_PRESS_10S  10000/5
 
@@ -114,7 +115,7 @@ static void key_thread_entry(void *parameter)
 				if(level!=0){		//up
 					key_press_mic_status = 0;
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S){
+					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST){
 						//app_play_tips_file(10);
 					//	power_down_status = 1;
 						ql_rtos_task_sleep_s(3);
@@ -148,7 +149,7 @@ static void key_thread_entry(void *parameter)
 							key_press_mic_status = 1;//表示已经按下了
 						}
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S && power_down_status==0){
+					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST && power_down_status==0){
 						power_down_status = 1;
 						app_play_tips_file(10);
 						power_down_status = 2;

ql-kernel/threadx/pmic/pmic.c

@@ -3741,6 +3741,10 @@ extern void chargeManagePhase2Init(void);
 void PMIC_Phase2Init(void)
 {
     INTC_ReturnCode intcStatus;
+	#if !defined(NOT_SUPPORT_PM807)
+	UINT8 longkey_e3;
+	UINT8 longkey_e4;
+	#endif
 
 	PMIC_UART_DEBUG("PMIC_Phase2Init");
 
@@ -3780,6 +3784,30 @@ void PMIC_Phase2Init(void)
         #if !defined(NOT_SUPPORT_PM807)
         case PMIC_807:
             GuilinLite3ClkInit();
+			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+			RTI_LOG("PM807 LONGKEY before: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
+				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
+
+			PM812_SET_LONKEY_PRESS_TIME(2);
+			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_1, TRUE);
+			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_2, TRUE);
+
+			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+			RTI_LOG("PM807 LONGKEY after: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
+				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
+			if ((((longkey_e3 >> 4) & 0x0f) != 1) ||
+				((longkey_e4 & (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)) !=
+				 (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)))
+			{
+				RTI_LOG("PM807 LONGKEY configure failed: E3=0x%x E4=0x%x",
+					longkey_e3, longkey_e4);
+			}
     //        GuilinLite3_VBUCK1_Set_FPWM();
             break;
         #endif
@@ -4231,6 +4259,13 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
     	return (((tmp >> 4) & 0x0f) + 1);
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+		return (((tmp >> 4) & 0x0f) + 1);
+	}
+	#endif
 	else
 	{
 		return tmp;
@@ -4241,6 +4276,10 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
 void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
 {
     UINT8 tmp;
+	#if !defined(NOT_SUPPORT_PM807)
+	UINT8 target;
+	UINT8 bit;
+	#endif
 
     #if !defined(NOT_SUPPORT_PM802)
 	if (PMIC_IS_PM802()||PMIC_IS_PM802S())
@@ -4268,6 +4307,30 @@ void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
     	PMIC_WRITE_REG_BASE(NINGBO_RTC_MISC_3_REG,(tmp|sec));
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		if ((sec < 1) || (sec > 16))
+		{
+			RTI_LOG("PM807 invalid LONGKEY time: %d", sec);
+			return;
+		}
+
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+		target = (tmp & 0x0f) | ((sec - 1) << 4);
+
+		/* RTC_MISC_3 may only accept one changed bit per write. */
+		for (bit = 4; bit < 8; bit++)
+		{
+			if ((tmp ^ target) & (1 << bit))
+			{
+				tmp = (tmp & ~(1 << bit)) | (target & (1 << bit));
+				PMIC_WRITE_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG, tmp);
+				tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			}
+		}
+	}
+	#endif
 }
 
 void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
@@ -4324,6 +4387,22 @@ void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
         }
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+		if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1)
+		{
+			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN1) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN1));
+			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
+		}
+		else if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_2)
+		{
+			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN2) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN2));
+			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
+		}
+	}
+	#endif
 }
 
 //LONGKEY_NUM: 1/2
@@ -4352,6 +4431,13 @@ BOOL PM812_LONKEY_ENABLE_GET(UINT8 LONGKEY_NUM)
             ((LONGKEY_NUM==NINGBO_LONGKEY_1)?NINGBO_LONGKEY_EN1:NINGBO_LONGKEY_EN2));
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		return (PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG) &
+			((LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1) ? GUILIN_LITE3_LONGKEY_EN1 : GUILIN_LITE3_LONGKEY_EN2));
+	}
+	#endif
 	else
 	{
 		PMIC_UART_DEBUG("PM812_LONKEY_ENABLE_GET: it shouldn't reach here, NUM=%d",LONGKEY_NUM);