diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c index c7cf69eb88ef..33ed5f5a8c25 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.c +++ b/drivers/amlogic/cec/hdmi_ao_cec.c @@ -63,7 +63,7 @@ #define CEC_FRAME_DELAY msecs_to_jiffies(400) -#define CEC_DEV_NAME "cec" +#define CEC_DEV_NAME "aocec" #define HR_DELAY(n) (ktime_set(0, n * 1000 * 1000)) #define MAX_INT 0x7ffffff @@ -2263,7 +2263,8 @@ static void cec_task(struct work_struct *work) cec_cfg = cec_config(0, 0); if (cec_cfg & CEC_FUNC_CFG_CEC_ON) { /*cec module on*/ - if ((cec_dev && cec_service_suspended()) || is_pm_freeze_mode()) + if (cec_dev && (/*!wake_ok || */cec_service_suspended()) + && !(cec_dev->hal_flag & (1 << HDMI_OPTION_SYSTEM_CEC_CONTROL))) cec_rx_process(); /*for check rx buffer for old chip version, cec rx irq process*/ @@ -3346,9 +3347,7 @@ static char *aml_cec_class_devnode(struct device *dev, umode_t *mode) { if (mode) { *mode = 0666; - CEC_INFO("mode is %x\n", *mode); - } else - CEC_INFO("mode is null\n"); + } return NULL; } diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h index daa3629760d2..a432adf7a893 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.h +++ b/drivers/amlogic/cec/hdmi_ao_cec.h @@ -21,7 +21,7 @@ #define CEC_DRIVER_VERSION "2019/10/22: finetune ARB rising time\n" #define CEC_FRAME_DELAY msecs_to_jiffies(400) -#define CEC_DEV_NAME "cec" +#define CEC_DEV_NAME "aocec" #define CEC_PHY_PORT_NUM 4 #define HR_DELAY(n) (ktime_set(0, n * 1000 * 1000))