shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

cec: for gxl cec tx timeout [1/1]

Browse Source 
PD#168316: cec: tx timeout

	1.support transwich ip for g12a
	2.gxl tx msg timeout

Change-Id: I38936e429e45bb3bedf2526867e5f9a42494003c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
This commit is contained in:
Yong Qin
2018-06-11 15:06:45 +08:00
committed by Yixun Lan
parent 0c1dad8fe3
commit 7fb0276464
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
View File

@@ -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

15
drivers/amlogic/cec/hdmi_ao_cec.c
View File

@@ -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) {

2
drivers/amlogic/cec/hdmi_ao_cec.h
View File

@@ -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"