Merge "[Bugfix][T106BUG-590]Fix can't be wakeup by USB"
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/serial/zx29_uart.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/serial/zx29_uart.c
index bfa5cc4..e228e11 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/serial/zx29_uart.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/serial/zx29_uart.c
@@ -3788,12 +3788,10 @@
if (!zup)
return -EINVAL;
- if(zup->port.line != 0)
- return 0;
-
- if(zup->irq_state == 0 || zup->imr== 0)
+ //wz.wang@20240408 modify for ZXW-266 start
+ if(zup->port.line == UART1)
return 0;
-
+ //wz.wang@20240408 modify for ZXW-266 end
printk("zx29_uart_resume\n");
//pcu_int_clear(PCU_UART0_RXD_INT);
//if(zup->rxd_int_depth){
@@ -3806,6 +3804,9 @@
pinctrl_pm_select_default_state(dev);
#endif
//xf.li@20240327 modify for T106BUG-567 end
+//wz.wang@20240408 modify for ZXW-266 start
+ zup->enter_suspend = 0;
+//wz.wang@20240408 modify for ZXW-266 end
return 0;
}
#endif