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

cec: modify the line check for g12a

Browse Source 
PD#168682: cec: modify the line check for g12a

Change-Id: Id7f318caae3230df9bd6689f566524e05fd512bd
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
This commit is contained in:
hongmin hua
2018-07-16 14:15:50 +08:00
committed by Yixun Lan
parent d14b49bef6
commit 93ff2f4d51
27 changed files with 89 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
View File

@@ -639,6 +639,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
View File

@@ -628,6 +628,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts
View File

@@ -639,6 +639,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
View File

@@ -738,6 +738,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
View File

@@ -707,6 +707,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
View File

@@ -735,6 +735,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
View File

@@ -722,6 +722,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
View File

@@ -661,6 +661,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
View File

@@ -661,6 +661,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
View File

@@ -653,6 +653,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
View File

@@ -711,6 +711,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
View File

@@ -702,6 +702,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
View File

@@ -712,6 +712,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
View File

@@ -701,6 +701,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
View File

@@ -750,6 +750,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
View File

@@ -745,6 +745,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
View File

@@ -750,6 +750,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
sysled {

1
arch/arm64/boot/dts/amlogic/gxm_skt.dts
View File

@@ -646,6 +646,7 @@
pinctrl-0=<&hdmitx_aocec>;
reg = <0x0 0xc810023c 0x0 0x4
0x0 0xc8100000 0x0 0x200>;
reg-names = "ao_exit","ao";
};
meson-fb {

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

@@ -1103,7 +1103,9 @@
pinctrl-1=<&eecec_b>;
pinctrl-2=<&eecec_b>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
0x0 0xFF800000 0x0 0x400
0x0 0xFF634400 0x0 0x26>;
reg-names = "ao_exit","ao","periphs";
};
/*if you want to use vdin just modify status to "ok"*/

1
arch/arm64/boot/dts/amlogic/mesontxl.dtsi
View File

@@ -826,6 +826,7 @@
0x0 0xc8100000 0x0 0x200
0x0 0xda83e000 0x0 0x10
0x0 0xc883c000 0x0 0x400>;
reg-names = "ao_exit","ao","hdmirx","hhi";
};
canvas: canvas{

1
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
View File

@@ -961,6 +961,7 @@
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";
};

1
arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
View File

@@ -1009,6 +1009,7 @@
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";
};

1
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
View File

@@ -988,6 +988,7 @@
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";
};

1
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
View File

@@ -994,6 +994,7 @@
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";
};

1
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
View File

@@ -987,6 +987,7 @@
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";
};

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

@@ -87,6 +87,7 @@ static struct early_suspend aocec_suspend_handler;
#define MAX_INT 0x7ffffff
struct cec_platform_data_s {
unsigned char line_reg;/*cec gpio_i reg:0 ao;1 periph*/
unsigned int line_bit;/*cec gpio position in reg*/
bool ee_to_ao;/*ee cec hw module mv to ao;ao cec delete*/
};
@@ -112,6 +113,7 @@ struct ao_cec_dev {
void __iomem *cec_reg;
void __iomem *hdmi_rxreg;
void __iomem *hhi_reg;
void __iomem *periphs_reg;
struct hdmitx_dev *tx_dev;
struct workqueue_struct *cec_thread;
struct device *dbg_dev;
@@ -946,7 +948,6 @@ static int cec_ll_trigle_tx(const unsigned char *msg, int len)
return 0;
}
CEC_ERR("error msg sts:0x%x\n", reg);
return -1;
}
@@ -989,7 +990,10 @@ static int get_line(void)
{
int reg, ret = -EINVAL;
reg = readl(cec_dev->cec_reg + AO_GPIO_I);
if (cec_dev->plat_data->line_reg == 1)
reg = readl(cec_dev->periphs_reg + PREG_PAD_GPIO3_I);
else
reg = readl(cec_dev->cec_reg + AO_GPIO_I);
ret = (reg & (1 << cec_dev->plat_data->line_bit));
return ret;
@@ -1375,7 +1379,6 @@ static int cec_late_check_rx_buffer(void)
cec_rx_buf_clear();
return 0;
}
return 1;
}
@@ -1895,7 +1898,6 @@ static ssize_t port_status_show(struct class *cla,
tmp = tx_hpd;
return sprintf(buf, "%x\n", tmp);
}
tmp = hdmirx_rd_top(TOP_HPD_PWR5V);
CEC_INFO("TOP_HPD_PWR5V:%x\n", tmp);
tmp >>= 20;
@@ -2512,21 +2514,25 @@ static void aocec_late_resume(struct early_suspend *h)
#ifdef CONFIG_OF
static const struct cec_platform_data_s cec_gxl_data = {
.line_reg = 0,
.line_bit = 8,
.ee_to_ao = 0,
};
static const struct cec_platform_data_s cec_txlx_data = {
.line_reg = 0,
.line_bit = 7,
.ee_to_ao = 1,
};
static const struct cec_platform_data_s cec_g12a_data = {
.line_bit = 7,
.line_reg = 1,
.line_bit = 3,
.ee_to_ao = 1,
};
static const struct cec_platform_data_s cec_txl_data = {
.line_reg = 0,
.line_bit = 7,
.ee_to_ao = 0,
};
@@ -2691,39 +2697,63 @@ static int aml_cec_probe(struct platform_device *pdev)
if (ret > 0)
CEC_ERR("select state error:0x%x\n", ret);
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ao_exit");
if (res) {
base = ioremap(res->start, res->end - res->start);
base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start);
if (!base) {
CEC_ERR("Unable to map ao_exit base\n");
goto tag_cec_reg_map_err;
}
cec_dev->exit_reg = (void *)base;
} else {
CEC_INFO("no memory resource\n");
cec_dev->exit_reg = NULL;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
} else
CEC_ERR("no ao_exit regs\n")
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ao");
if (res) {
base = ioremap(res->start, res->end - res->start);
base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start);
if (!base) {
CEC_ERR("Unable to map ao base\n");
goto tag_cec_reg_map_err;
}
cec_dev->cec_reg = (void *)base;
} else {
CEC_ERR("no CEC reg resource\n");
cec_dev->cec_reg = NULL;
CEC_ERR("no ao regs\n");
goto tag_cec_reg_map_err;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmirx");
if (res) {
base = ioremap(res->start, res->end - res->start);
base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start);
if (!base) {
CEC_ERR("Unable to map hdmirx base\n");
goto tag_cec_reg_map_err;
}
cec_dev->hdmi_rxreg = (void *)base;
} else {
CEC_ERR("no hdmirx reg resource\n");
cec_dev->hdmi_rxreg = NULL;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
} else
CEC_ERR("no hdmirx regs\n")
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");
if (res) {
base = ioremap(res->start, res->end - res->start);
base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start);
if (!base) {
CEC_ERR("Unable to map hhi base\n");
goto tag_cec_reg_map_err;
}
cec_dev->hhi_reg = (void *)base;
} else {
CEC_ERR("no hhi reg resource\n");
cec_dev->hhi_reg = NULL;
}
} else
CEC_ERR("no hhi regs\n")
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "periphs");
if (res) {
base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start);
if (!base) {
CEC_ERR("Unable to map periphs base\n");
goto tag_cec_reg_map_err;
}
cec_dev->periphs_reg = (void *)base;
} else
CEC_ERR("no periphs regs\n")
r = of_property_read_u32(node, "port_num", &(cec_dev->port_num));
if (r) {
CEC_ERR("not find 'port_num'\n");
@@ -2822,6 +2852,8 @@ static int aml_cec_probe(struct platform_device *pdev)
return 0;
tag_cec_msg_alloc_err:
free_irq(cec_dev->irq_cec, (void *)cec_dev);
tag_cec_reg_map_err:
input_free_device(cec_dev->cec_info.remote_cec_dev);
tag_cec_alloc_input_err:
destroy_workqueue(cec_dev->cec_thread);

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

@@ -39,6 +39,8 @@
#define AO_BASE 0xc8100000
#define AO_GPIO_I ((0x0A << 2))
#define PREG_PAD_GPIO3_I (0x01b << 2)
#define AO_CEC_GEN_CNTL ((0x40 << 2))
#define AO_CEC_RW_REG ((0x41 << 2))