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

cec: add err initiator int for cec error [2/3]

Browse Source 
PD#163965: cec: add err initiator int for cec error

Change-Id: I7a10f4d6a90d2e3a15ec3ed969735aadb230db43
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
This commit is contained in:
hongmin hua
2018-05-09 17:17:55 +08:00
committed by Yixun Lan
parent 00a2de0827
commit 86d7bfd6fa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
View File

@@ -1067,6 +1067,7 @@
vendor_id = <0x000000>;
product_desc = "G12A"; /* Max Chars: 16 */
cec_osd_string = "AML_MBOX"; /* Max Chars: 14 */
cec_version = <5>;/*5:1.4;6:2.0*/
port_num = <1>;
ee_cec;
arc_port_mask = <0x2>;

6
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/03/27\n"
#define CEC_DRIVER_VERSION "2018/05/15\n"
#define CEC_FRAME_DELAY msecs_to_jiffies(400)
#define CEC_DEV_NAME "cec"
@@ -345,7 +345,7 @@
#define EECEC_IRQ_TX_ERR_INITIATOR (1 << 20)
#define EECEC_IRQ_RX_ERR_FOLLOWER (1 << 21)
#define EECEC_IRQ_RX_WAKEUP (1 << 22)
#define EE_CEC_IRQ_EN_MASK (0xf << 16)
#define EE_CEC_IRQ_EN_MASK (0x1f << 16)
/* cec irq bit flags for AO_CEC_B */
#define CECB_IRQ_TX_DONE (1 << 0)
@@ -355,7 +355,7 @@
#define CECB_IRQ_TX_ERR_INITIATOR (1 << 4)
#define CECB_IRQ_RX_ERR_FOLLOWER (1 << 5)
#define CECB_IRQ_RX_WAKEUP (1 << 6)
#define CECB_IRQ_EN_MASK (0xf << 0)
#define CECB_IRQ_EN_MASK (0x1f << 0)
/* common mask */
#define CEC_IRQ_TX_DONE (1 << (16 - shift))