Merge pull request #4761 from gdachs/work-on-timing

removed what I don't understand and lowered delay
This commit is contained in:
Stephan Raue 2016-02-24 00:29:23 +01:00
commit b116f3f823
2 changed files with 6 additions and 6 deletions

View File

@ -55,7 +55,7 @@ index 7a944cd..f74ec1f 100755
#EXTRA_CFLAGS += -O2 #EXTRA_CFLAGS += -O2
diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
new file mode 100644 new file mode 100644
index 0000000..fdcd447 index 0000000..b749b29
--- /dev/null --- /dev/null
+++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
@@ -0,0 +1,647 @@ @@ -0,0 +1,647 @@
@ -251,7 +251,7 @@ index 0000000..fdcd447
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8 +#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
+ aml_write_reg32(P_AO_CEC_INTR_CLR, aml_read_reg32(P_AO_CEC_INTR_CLR) | (1 << 2)); + aml_write_reg32(P_AO_CEC_INTR_CLR, aml_read_reg32(P_AO_CEC_INTR_CLR) | (1 << 2));
+#endif +#endif
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, valid_msg ? RX_ACK_NEXT : RX_ACK_CURRENT); + amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_ACK_NEXT);
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_NO_OP); + amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_NO_OP);
+ +
+ return ret; + return ret;
@ -586,7 +586,7 @@ index 0000000..fdcd447
+ +
+ amlogic_cec_log_dbg("amlogic_cec_delayed_init: enter\n"); + amlogic_cec_log_dbg("amlogic_cec_delayed_init: enter\n");
+ +
+ msleep_interruptible(15000); + msleep_interruptible(5000);
+ +
+ cec_init_flag = 1; + cec_init_flag = 1;
+ +

View File

@ -55,7 +55,7 @@ index 7a944cd..f74ec1f 100755
#EXTRA_CFLAGS += -O2 #EXTRA_CFLAGS += -O2
diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
new file mode 100644 new file mode 100644
index 0000000..fdcd447 index 0000000..b749b29
--- /dev/null --- /dev/null
+++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
@@ -0,0 +1,647 @@ @@ -0,0 +1,647 @@
@ -251,7 +251,7 @@ index 0000000..fdcd447
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8 +#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
+ aml_write_reg32(P_AO_CEC_INTR_CLR, aml_read_reg32(P_AO_CEC_INTR_CLR) | (1 << 2)); + aml_write_reg32(P_AO_CEC_INTR_CLR, aml_read_reg32(P_AO_CEC_INTR_CLR) | (1 << 2));
+#endif +#endif
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, valid_msg ? RX_ACK_NEXT : RX_ACK_CURRENT); + amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_ACK_NEXT);
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_NO_OP); + amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_NO_OP);
+ +
+ return ret; + return ret;
@ -586,7 +586,7 @@ index 0000000..fdcd447
+ +
+ amlogic_cec_log_dbg("amlogic_cec_delayed_init: enter\n"); + amlogic_cec_log_dbg("amlogic_cec_delayed_init: enter\n");
+ +
+ msleep_interruptible(15000); + msleep_interruptible(5000);
+ +
+ cec_init_flag = 1; + cec_init_flag = 1;
+ +