From bcd7c18afacfa9f6f353b4dbee0fc1f5ea38b227 Mon Sep 17 00:00:00 2001 From: Hongmin Hua Date: Fri, 30 Nov 2018 15:55:59 +0800 Subject: [PATCH] cec: set the phy port the same as ui id [2/2] PD#SWPL-2685 Problem: the atom switch wrong channel when wakeup by device Solution: set the phy port the same as ui id Verify: atom Change-Id: I4e43f83af5bb30a2388df7e7030f135c3f0830ad Signed-off-by: Hongmin Hua --- drivers/amlogic/cec/hdmi_ao_cec.c | 4 ++-- drivers/amlogic/cec/hdmi_ao_cec.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c index 68a27b5..be05511 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.c +++ b/drivers/amlogic/cec/hdmi_ao_cec.c @@ -2540,7 +2540,7 @@ static ssize_t hdmitx_cec_write(struct file *f, const char __user *buf, static void init_cec_port_info(struct hdmi_port_info *port, struct ao_cec_dev *cec_dev) { - unsigned int a, b, c, d, e = 0; + unsigned int a, b, c = 0, d, e = 0; unsigned int phy_head = 0xf000, phy_app = 0x1000, phy_addr; struct hdmitx_dev *tx_dev; @@ -2592,7 +2592,7 @@ static void init_cec_port_info(struct hdmi_port_info *port, port[e].type = HDMI_OUTPUT; } else { port[e].type = HDMI_INPUT; - port[e].port_id = a + 1; + port[e].port_id = c;/*a + 1; phy port - ui id*/ } port[e].cec_supported = 1; /* set ARC feature according mask */ diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h index e256b61..8d283a7 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.h +++ b/drivers/amlogic/cec/hdmi_ao_cec.h @@ -19,7 +19,7 @@ #define __AO_CEC_H__ -#define CEC_DRIVER_VERSION "Ver 2018/11/21\n" +#define CEC_DRIVER_VERSION "Ver 2018/12/06\n" #define CEC_FRAME_DELAY msecs_to_jiffies(400) #define CEC_DEV_NAME "cec" -- 2.7.4