cec: modify dts pintrl selection to default

PD#158936: cec: modify dts pintrl selection to default

Change-Id: Id6718d7920b08d856081e39806458f3baf998b4e
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
index a95ab19..0182b36 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
@@ -635,7 +635,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index 265395c..bf1d866 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -623,7 +623,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
index d4e335e..cc9e30d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
@@ -732,7 +732,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index 939a73a..7b85cc7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -700,7 +700,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index f1c3255..5659222 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -721,7 +721,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
index 312759b..ae99164 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
@@ -707,7 +707,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
index 3173c44..6730a2e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
@@ -648,7 +648,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
index b6c119f..42b48db 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
@@ -648,7 +648,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index 0ebda48..6420497 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -640,7 +640,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
index 47f5645..9aea03a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
@@ -707,7 +707,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index ed59e56..d2bc4dc 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -713,7 +713,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index e2da8ec..4528f9e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -684,7 +684,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 0cbcdcf..86fd2de 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -682,7 +682,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts
index 0e4bee5..2e6e806 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts
@@ -623,7 +623,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
index 8b8f48c..22214e7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
@@ -744,7 +744,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
index f8cc4f0..f4ed5a8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
@@ -728,7 +728,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
index b50792f..4fab7ba 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
@@ -738,7 +738,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_skt.dts b/arch/arm64/boot/dts/amlogic/gxm_skt.dts
index 7f85f4a..c1bfaa8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_skt.dts
@@ -633,7 +633,7 @@
                arc_port_mask = <0x0>;
                interrupts = <0 199 1>;
                interrupt-names = "hdmi_aocec";
-               pinctrl-names = "hdmitx_aocec";
+               pinctrl-names = "default";
                pinctrl-0=<&hdmitx_aocec>;
                reg = <0x0 0xc810023c 0x0 0x4
                       0x0 0xc8100000 0x0 0x200>;

diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h
index 86ef110..57ed3ca 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     "2017/01/23\n"
+#define CEC_DRIVER_VERSION     "2018/01/31\n"
 
 #define CEC_FRAME_DELAY                msecs_to_jiffies(400)
 #define CEC_DEV_NAME           "cec"