From 7fb0276464c4412e41cb940cf46ddf376ec2aa94 Mon Sep 17 00:00:00 2001 From: Yong Qin Date: Mon, 11 Jun 2018 15:06:45 +0800 Subject: [PATCH] cec: for gxl cec tx timeout [1/1] PD#168316: cec: tx timeout 1.support transwich ip for g12a 2.gxl tx msg timeout Change-Id: I38936e429e45bb3bedf2526867e5f9a42494003c Signed-off-by: Yong Qin --- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 4 ++-- drivers/amlogic/cec/hdmi_ao_cec.c | 15 +++++++++------ drivers/amlogic/cec/hdmi_ao_cec.h | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index aaf427e..d4b487e 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -1096,10 +1096,10 @@ ee_cec; arc_port_mask = <0x2>; interrupts = <0 203 1 - 0 203 1>; + 0 199 1>; /*0:snps 1:ts*/ interrupt-names = "hdmi_aocecb","hdmi_aocec"; pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep"; - pinctrl-0=<&eecec_b>; + pinctrl-0=<&eecec_a>; pinctrl-1=<&eecec_b>; pinctrl-2=<&eecec_b>; reg = <0x0 0xFF80023c 0x0 0x4 diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c index 284bdac..cc2b12b 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.c +++ b/drivers/amlogic/cec/hdmi_ao_cec.c @@ -2603,8 +2603,7 @@ static int aml_cec_probe(struct platform_device *pdev) ee_cec = 1; else ee_cec = 0; - CEC_ERR("using EE cec:%d\n", ee_cec); - + CEC_ERR("using cec:%d\n", ee_cec); /* pinmux set */ if (of_get_property(node, "pinctrl-names", NULL)) { pin = devm_pinctrl_get(&pdev->dev); @@ -2714,12 +2713,16 @@ static int aml_cec_probe(struct platform_device *pdev) /* irq set */ cec_irq_enable(false); - if (ee_cec) + if (of_irq_count(node) > 1) { + if (ee_cec) + irq_idx = of_irq_get(node, 0); + else + irq_idx = of_irq_get(node, 1); + } else { irq_idx = of_irq_get(node, 0); - else - irq_idx = of_irq_get(node, 1); + } cec_dev->irq_cec = irq_idx; - /*CEC_INFO("irq no:%d\n", irq_idx);*/ + CEC_ERR("irq cnt:%d,cur no:%d\n", of_irq_count(node), irq_idx); if (of_get_property(node, "interrupt-names", NULL)) { r = of_property_read_string(node, "interrupt-names", &irq_name); if (!r && !ee_cec) { diff --git a/drivers/amlogic/cec/hdmi_ao_cec.h b/drivers/amlogic/cec/hdmi_ao_cec.h index abca514..0e8b827 100644 --- 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 "2018/06/13\n" +#define CEC_DRIVER_VERSION "2018/06/14\n" #define CEC_FRAME_DELAY msecs_to_jiffies(400) #define CEC_DEV_NAME "cec" -- 2.7.4