Skip to content

Save cec_config for CEC wake-up #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: odroidc2-3.14.y
Choose a base branch
from
Open

Save cec_config for CEC wake-up #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions drivers/amlogic/cec/hdmi_ao_cec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,8 @@ static void cec_pre_init(void)
{
ao_cec_init();

cec_config(cec_dev->tx_dev->cec_func_config, 1);

cec_arbit_bit_time_set(3, 0x118, 0);
cec_arbit_bit_time_set(5, 0x000, 0);
cec_arbit_bit_time_set(7, 0x2aa, 0);
Expand Down Expand Up @@ -1452,8 +1454,6 @@ static int hdmitx_cec_open(struct inode *inode, struct file *file)
cec_dev->cec_info.open_count++;
if (cec_dev->cec_info.open_count) {
cec_dev->cec_info.hal_ctl = 1;
/* enable all cec features */
cec_config(0x2f, 1);
}
return 0;
}
Expand All @@ -1463,8 +1463,6 @@ static int hdmitx_cec_release(struct inode *inode, struct file *file)
cec_dev->cec_info.open_count--;
if (!cec_dev->cec_info.open_count) {
cec_dev->cec_info.hal_ctl = 0;
/* disable all cec features */
cec_config(0x0, 1);
}
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/amlogic/hdmi/hdmi_tx_20/hdmi_tx_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2487,9 +2487,9 @@ static int __init hdmitx_boot_para_setup(char *s)
init_flag |= INIT_FLAG_NOT_LOAD;
} else if (strncmp(token, "cec", 3) == 0) {
ret = kstrtoul(token+3, 16, &list);
if ((list >= 0) && (list <= 0x2f))
if ((list >= 0) && (list <= 0xff))
hdmitx_device.cec_func_config = list;
hdmi_print(INF, CEC "HDMI hdmi_cec_func_config:0x%x\n",
hdmi_print(IMP, CEC "HDMI hdmi_cec_func_config:0x%x\n",
hdmitx_device.cec_func_config);
} else if (strcmp(token, "forcergb") == 0) {
hdmitx_output_rgb();
Expand Down