cec: add change for sm1 [1/1]

PD#SWPL-5419

Problem:
cec change for sm1

Solution:
add cec change for sm1

Verify:
ac200

Change-Id: Ic808e4bd128358b7f10c7f0b21a629d72f1c71cc
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index 9cb9d78..2c7c7a9 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -1102,7 +1102,7 @@
        };
 
        aocec: aocec {
-               compatible = "amlogic, aocec-g12a";
+               compatible = "amlogic, aocec-sm1";
                device_name = "aocec";
                status = "okay";
                vendor_name = "Amlogic"; /* Max Chars: 8     */
@@ -1110,7 +1110,7 @@
                 * http://standards.ieee.org/develop/regauth/oui/oui.txt
                 */
                vendor_id = <0x000000>;
-               product_desc = "G12A"; /* Max Chars: 16    */
+               product_desc = "SM1"; /* Max Chars: 16    */
                cec_osd_string = "AML_MBOX"; /* Max Chars: 14    */
                cec_version = <5>;/*5:1.4;6:2.0*/
                port_num = <1>;
@@ -1125,7 +1125,7 @@
                pinctrl-2=<&eecec_b>;
                reg = <0xFF80023c 0x4
                       0xFF800000 0x400
-                      0xFF634400 0x26>;
+                      0xFF634400 0x70>;
                reg-names = "ao_exit","ao","periphs";
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index 906622a..ffb0c0f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -1102,7 +1102,7 @@
        };
 
        aocec: aocec {
-               compatible = "amlogic, aocec-g12a";
+               compatible = "amlogic, aocec-sm1";
                device_name = "aocec";
                status = "okay";
                vendor_name = "Amlogic"; /* Max Chars: 8     */
@@ -1110,7 +1110,7 @@
                 * http://standards.ieee.org/develop/regauth/oui/oui.txt
                 */
                vendor_id = <0x000000>;
-               product_desc = "G12A"; /* Max Chars: 16    */
+               product_desc = "SM1"; /* Max Chars: 16    */
                cec_osd_string = "AML_MBOX"; /* Max Chars: 14    */
                cec_version = <5>;/*5:1.4;6:2.0*/
                port_num = <1>;
@@ -1125,7 +1125,7 @@
                pinctrl-2=<&eecec_b>;
                reg = <0x0 0xFF80023c 0x0 0x4
                       0x0 0xFF800000 0x0 0x400
-                      0x0 0xFF634400 0x0 0x26>;
+                      0x0 0xFF634400 0x0 0x70>;
                reg-names = "ao_exit","ao","periphs";
        };
 

diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c
index 3695f4e..67b3f34 100644 (file)
--- a/drivers/amlogic/cec/hdmi_ao_cec.c
+++ b/drivers/amlogic/cec/hdmi_ao_cec.c
@@ -3132,6 +3132,13 @@ static const struct cec_platform_data_s cec_tl1_data = {
        .cecb_ver = CECB_VER_2,
 };
 
+static const struct cec_platform_data_s cec_sm1_data = {
+       .line_reg = 1,
+       .line_bit = 3,
+       .ee_to_ao = 1,
+       .ceca_sts_reg = 1,
+       .cecb_ver = CECB_VER_2,
+};
 
 static const struct of_device_id aml_cec_dt_match[] = {
        {
@@ -3154,6 +3161,10 @@ static const struct of_device_id aml_cec_dt_match[] = {
                .compatible = "amlogic, aocec-tl1",
                .data = &cec_tl1_data,
        },
+       {
+               .compatible = "amlogic, aocec-sm1",
+               .data = &cec_sm1_data,
+       },
        {}
 };
 #endif

diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h
index a6f4aa6..a85f09e 100644 (file)
--- a/drivers/amlogic/cec/hdmi_ao_cec.h
+++ b/drivers/amlogic/cec/hdmi_ao_cec.h
@@ -20,7 +20,7 @@
 
 
 
-#define CEC_DRIVER_VERSION     "Ver 2019/1/28\n"
+#define CEC_DRIVER_VERSION     "Ver 2019/3/23\n"
 
 #define CEC_FRAME_DELAY                msecs_to_jiffies(400)
 #define CEC_DEV_NAME           "cec"