shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

cec: add cec version define in dts & cts 9.3

Browse Source 
PD#160943: cec: add cec version define in dts & cts 9.3

Change-Id: Ifd06bf388412d058efd90be3afe6119fc666dacb
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
This commit is contained in:
hongmin hua
2018-02-22 15:51:41 +08:00
committed by Jianxin Pan
parent 4f74d13178
commit f0ec553988
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
View File

@@ -630,7 +630,7 @@
status = "okay";
vendor_id = <0x000000>;
cec_osd_string = "MBox"; /* Max Chars: 14 */
cec_version = <6>; /* 5: 1.4, 6: 2.0 */
cec_version = <5>; /* 5: 1.4, 6: 2.0 */
port_num = <1>;
arc_port_mask = <0x0>;
interrupts = <0 199 1>;

2
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
View File

@@ -727,7 +727,7 @@
status = "okay";
vendor_id = <0x000000>;
cec_osd_string = "MBox"; /* Max Chars: 14 */
cec_version = <6>; /* 5: 1.4, 6: 2.0 */
cec_version = <5>; /* 5: 1.4, 6: 2.0 */
port_num = <1>;
arc_port_mask = <0x0>;
interrupts = <0 199 1>;

2
arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
View File

@@ -643,7 +643,7 @@
status = "okay";
vendor_id = <0x000000>;
cec_osd_string = "MBox"; /* Max Chars: 14 */
cec_version = <6>; /* 5: 1.4, 6: 2.0 */
cec_version = <5>; /* 5: 1.4, 6: 2.0 */
port_num = <1>;
arc_port_mask = <0x0>;
interrupts = <0 199 1>;

2
arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
View File

@@ -643,7 +643,7 @@
status = "okay";
vendor_id = <0x000000>;
cec_osd_string = "MBox"; /* Max Chars: 14 */
cec_version = <6>; /* 5: 1.4, 6: 2.0 */
cec_version = <5>; /* 5: 1.4, 6: 2.0 */
port_num = <1>;
arc_port_mask = <0x0>;
interrupts = <0 199 1>;

14
drivers/amlogic/cec/hdmi_ao_cec.c
View File

@@ -775,10 +775,20 @@ static inline bool is_feature_abort_msg(const unsigned char *msg, int len)
return false;
}
static inline bool is_report_phy_addr_msg(const unsigned char *msg, int len)
{
if (!msg || len < 4)
return false;
if (msg[1] == CEC_OC_REPORT_PHYSICAL_ADDRESS)
return true;
return false;
}
static bool need_nack_repeat_msg(const unsigned char *msg, int len, int t)
{
if (len == last_cec_msg->len &&
(is_poll_message(msg[0]) || is_feature_abort_msg(msg, len)) &&
(is_poll_message(msg[0]) || is_feature_abort_msg(msg, len) ||
is_report_phy_addr_msg(msg, len)) &&
last_cec_msg->last_result == CEC_FAIL_NACK &&
jiffies - last_cec_msg->last_jiffies < t) {
return true;
@@ -1039,7 +1049,7 @@ int cec_ll_tx(const unsigned char *msg, unsigned char len)
mutex_lock(&cec_dev->cec_mutex);
/* make sure we got valid physical address */
if (len >= 2 && msg[1] == CEC_OC_REPORT_PHYSICAL_ADDRESS)
check_physical_addr_valid(20);
check_physical_addr_valid(3);
try_again:
reinit_completion(&cec_dev->tx_ok);

2
drivers/amlogic/cec/hdmi_ao_cec.h
View File

@@ -18,7 +18,7 @@
#ifndef __AO_CEC_H__
#define __AO_CEC_H__
#define CEC_DRIVER_VERSION "2018/02/05\n"
#define CEC_DRIVER_VERSION "2018/02/22\n"
#define CEC_FRAME_DELAY msecs_to_jiffies(400)
#define CEC_DEV_NAME "cec"