From 86d7bfd6fa40ce979a40ff3066337bce4c4272db Mon Sep 17 00:00:00 2001 From: hongmin hua Date: Wed, 9 May 2018 17:17:55 +0800 Subject: [PATCH] cec: add err initiator int for cec error [2/3] PD#163965: cec: add err initiator int for cec error Change-Id: I7a10f4d6a90d2e3a15ec3ed969735aadb230db43 Signed-off-by: hongmin hua --- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 1 + drivers/amlogic/cec/hdmi_ao_cec.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 4411a1f..4fee85d 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -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>; diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h index 586dfb4..70a1a74 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/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)) -- 2.7.4