hdmi: cec: change cec IP

PD#173638: cec: change cec IP

Change-Id: Ia5ef195a90b272ec74858a7afca0b7959b0c6817
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
index e40d783..777fe56 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -983,7 +983,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>; /*all port number*/
-               ee_cec;
+               /*ee_cec;*/
                output = <1>;   /*output port number*/
                /*arc support port:bit 0-3, according to portmap*/
                arc_port_mask = <0x8>;

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index bf34895..54344a6 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1002,7 +1002,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>;
-               ee_cec;
+               /*ee_cec;*/
                arc_port_mask = <0x2>;
                interrupts = <0 205 1
                                        0 199 1>;

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index f9f5c0e..1bb311e 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1008,7 +1008,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>;
-               ee_cec;
+               /*ee_cec;*/
                arc_port_mask = <0x2>;
                interrupts = <0 205 1
                                        0 199 1>;

diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts
index 2fb1c80..d347fe8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/atom.dts
+++ b/arch/arm64/boot/dts/amlogic/atom.dts
@@ -973,7 +973,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>; /*all port number*/
-               ee_cec;
+               /*ee_cec;*/
                output = <1>;
                arc_port_mask = <0x8>;
                interrupts = <0 205 1

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 87ec785..4b5bfa9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -982,7 +982,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>; /*all port number*/
-               ee_cec;
+               /*ee_cec;*/
                output = <1>;   /*output port number*/
                /*arc support port:bit 0-3, according to portmap*/
                arc_port_mask = <0x8>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 8564ca3..b11a5fb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
@@ -1020,7 +1020,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>; /*all port number*/
-               ee_cec;
+               /*ee_cec;*/
                output = <1>;   /*output port number*/
                /*arc support port:bit 0-3, according to portmap*/
                arc_port_mask = <0x8>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 0c6eaf0..53f2e9a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -999,7 +999,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>;
-               ee_cec;
+               /*ee_cec;*/
                arc_port_mask = <0x2>;
                interrupts = <0 205 1
                                        0 199 1>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index dbb77ec..54bea7f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1005,7 +1005,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>;
-               ee_cec;
+               /*ee_cec;*/
                arc_port_mask = <0x2>;
                interrupts = <0 205 1
                                        0 199 1>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 248d2ee..5833481 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -998,7 +998,7 @@
                product_desc = "TXLX"; /* Max Chars: 16    */
                cec_osd_string = "AML_TV"; /* Max Chars: 14    */
                port_num = <4>;
-               ee_cec;
+               /*ee_cec;*/
                arc_port_mask = <0x2>;
                interrupts = <0 205 1
                                        0 199 1>;

diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h
index e9e5bf8..dbfab7d 100644 (file)
--- 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     "Ver 2018/08/30\n"
+#define CEC_DRIVER_VERSION     "Ver 2018/09/2\n"
 
 #define CEC_FRAME_DELAY                msecs_to_jiffies(400)
 #define CEC_DEV_NAME           "cec"