From db8a2a605b07c0e07db7031b033142aa53f1ea69 Mon Sep 17 00:00:00 2001
From: Yong Qin <yong.qin@amlogic.com>
Date: Wed, 10 Apr 2019 16:37:54 +0800
Subject: [PATCH] cec: cec bringup for tm2 [1/1]

PD#SWPL-6945

Problem:
bringup for tm2

Solution:
add chip support and modify dts

Verify:
tm2

Change-Id: I718c3b81912a3555e19866f96d392bfb09d27384
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
---
 drivers/amlogic/cec/hdmi_ao_cec.c | 25 +++++++++++++++++++++++++
 drivers/amlogic/cec/hdmi_ao_cec.h |  8 ++++++++
 2 files changed, 33 insertions(+)

diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c
index ce95ff16a672..e6281769029a 100644
--- a/drivers/amlogic/cec/hdmi_ao_cec.c
+++ b/drivers/amlogic/cec/hdmi_ao_cec.c
@@ -82,6 +82,7 @@ struct cec_platform_data_s {
 	bool ee_to_ao;/*ee cec hw module mv to ao;ao cec delete*/
 	bool ceca_sts_reg;/*add new internal status register*/
 	enum cecbver cecb_ver;/* detail discription ref enum cecbver */
+	enum cecaver ceca_ver;
 };
 
 
@@ -1135,6 +1136,13 @@ void cec_enable_arc_pin(bool enable)
 {
 	unsigned int data;
 
+	if (is_meson_sm1_cpu() ||
+			cpu_after_eq(MESON_CPU_MAJOR_ID_TM2)) {
+		/*sm1 and tm2 later, audio module handle this*/
+
+		return;
+	}
+
 	if (cec_dev->plat_data->cecb_ver >= CECB_VER_2) {
 		data = rd_reg_hhi(HHI_HDMIRX_ARC_CNTL);
 		/* enable bit 1:1 bit 0: 0*/
@@ -3061,6 +3069,7 @@ static const struct cec_platform_data_s cec_g12a_data = {
 	.line_bit = 3,
 	.ee_to_ao = 1,
 	.ceca_sts_reg = 0,
+	.ceca_ver = CECA_VER_0,
 	.cecb_ver = CECB_VER_1,
 };
 
@@ -3069,6 +3078,7 @@ static const struct cec_platform_data_s cec_txl_data = {
 	.line_bit = 7,
 	.ee_to_ao = 0,
 	.ceca_sts_reg = 0,
+	.ceca_ver = CECA_VER_0,
 	.cecb_ver = CECB_VER_0,
 };
 
@@ -3077,6 +3087,7 @@ static const struct cec_platform_data_s cec_tl1_data = {
 	.line_bit = 10,
 	.ee_to_ao = 1,
 	.ceca_sts_reg = 1,
+	.ceca_ver = CECA_VER_0,
 	.cecb_ver = CECB_VER_2,
 };
 
@@ -3085,6 +3096,16 @@ static const struct cec_platform_data_s cec_sm1_data = {
 	.line_bit = 3,
 	.ee_to_ao = 1,
 	.ceca_sts_reg = 1,
+	.ceca_ver = CECA_VER_1,
+	.cecb_ver = CECB_VER_2,
+};
+
+static const struct cec_platform_data_s cec_tm2_data = {
+	.line_reg = 0,
+	.line_bit = 3,
+	.ee_to_ao = 1,
+	.ceca_sts_reg = 1,
+	.ceca_ver = CECA_VER_1,
 	.cecb_ver = CECB_VER_2,
 };
 
@@ -3113,6 +3134,10 @@ static const struct of_device_id aml_cec_dt_match[] = {
 		.compatible = "amlogic, aocec-sm1",
 		.data = &cec_sm1_data,
 	},
+	{
+		.compatible = "amlogic, aocec-tm2",
+		.data = &cec_tm2_data,
+	},
 	{}
 };
 #endif
diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h
index a5e4f6774a48..16a10b26100b 100644
--- a/drivers/amlogic/cec/hdmi_ao_cec.h
+++ b/drivers/amlogic/cec/hdmi_ao_cec.h
@@ -29,6 +29,14 @@
 #define CEC_PHY_PORT_NUM		4
 #define HR_DELAY(n)		(ktime_set(0, n * 1000 * 1000))
 
+enum cecaver {
+	/*first version*/
+	CECA_VER_0 = 0,
+
+	/*support multi logical address*/
+	CECA_VER_1 = 1,
+};
+
 enum cecbver {
 	/*first version*/
 	CECB_VER_0 = 0,