From 4d962126da5abc28d92c2de763d67f1e472d77e8 Mon Sep 17 00:00:00 2001 From: hongmin hua Date: Mon, 11 Jun 2018 16:33:17 +0800 Subject: [PATCH] cec: modfiy port info define for playback & audiosystem PD#165588: cec: modfiy port info define for playback & audiosystem Change-Id: I2305763107d2b99a767f688238fc51d4084d3b26 Signed-off-by: hongmin hua --- drivers/amlogic/cec/hdmi_ao_cec.c | 8 ++++++-- drivers/amlogic/cec/hdmi_ao_cec.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c index 92d5e10..981bd29 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.c +++ b/drivers/amlogic/cec/hdmi_ao_cec.c @@ -2140,7 +2140,9 @@ static void init_cec_port_info(struct hdmi_port_info *port, } else break; } - if (cec_dev->dev_type == DEV_TYPE_TUNER) + if ((cec_dev->dev_type == DEV_TYPE_TUNER) || + (cec_dev->dev_type == DEV_TYPE_PLAYBACK) || + (cec_dev->dev_type == DEV_TYPE_AUDIO_SYSTEM)) b = cec_dev->port_num - 1; else b = cec_dev->port_num; @@ -2173,7 +2175,9 @@ static void init_cec_port_info(struct hdmi_port_info *port, break; } - if (cec_dev->dev_type == DEV_TYPE_TUNER) { + if ((cec_dev->dev_type == DEV_TYPE_TUNER) || + (cec_dev->dev_type == DEV_TYPE_PLAYBACK) || + (cec_dev->dev_type == DEV_TYPE_AUDIO_SYSTEM)) { /* last port is for tx in mixed tx/rx */ port[e].type = HDMI_OUTPUT; port[e].port_id = 0; /* 0 for tx port id */ diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h index 6ef4507..7d8eae0 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.h +++ b/drivers/amlogic/cec/hdmi_ao_cec.h @@ -18,7 +18,7 @@ #ifndef __AO_CEC_H__ #define __AO_CEC_H__ -#define CEC_DRIVER_VERSION "2018/06/25\n" +#define CEC_DRIVER_VERSION "Ver**2018/07/03**\n" #define CEC_FRAME_DELAY msecs_to_jiffies(400) #define CEC_DEV_NAME "cec" -- 2.7.4