summaryrefslogtreecommitdiff
authorYong Qin <yong.qin@amlogic.com>2019-11-19 08:36:53 (GMT)
committer Yong Qin <yong.qin@amlogic.com>2019-11-28 06:27:55 (GMT)
commit9a0f4cb088f8e537a5f6e135ca6ce29da3be15a4 (patch)
treec76a726eff0a9395b489ec73ed614a50b3083811
parentbb4e6a810d0cb3773101d66df535e8186d6b9b1d (diff)
downloaduboot-9a0f4cb088f8e537a5f6e135ca6ce29da3be15a4.zip
uboot-9a0f4cb088f8e537a5f6e135ca6ce29da3be15a4.tar.gz
uboot-9a0f4cb088f8e537a5f6e135ca6ce29da3be15a4.tar.bz2
cec: shut down,last mode enable cec ac wakeup [1/1]
PD#SWPL-16672 Problem: power mode is shut down, last, suspend, ac on cec can't wakeup tv Solution: enable cec ac wakeup config Verify: tl1 Change-Id: I41b1e435d9d3f7bf738fb003d2279a7e67dd5daa Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Diffstat
-rw-r--r--board/amlogic/configs/tl1_t309_v1.h50
-rw-r--r--board/amlogic/configs/tl1_x301_v1.h54
2 files changed, 50 insertions, 54 deletions
diff --git a/board/amlogic/configs/tl1_t309_v1.h b/board/amlogic/configs/tl1_t309_v1.h
index 33462a6..08fef86 100644
--- a/board/amlogic/configs/tl1_t309_v1.h
+++ b/board/amlogic/configs/tl1_t309_v1.h
@@ -121,13 +121,26 @@
"boot_part=boot\0"\
"suspend=off\0"\
"powermode=on\0"\
- "edid_14_dir=/vendor/etc/tvconfig/hdmi/port_14.bin\0" \
- "edid_20_dir=/vendor/etc/tvconfig/hdmi/port_20.bin\0" \
- "edid_select=0\0" \
- "port_map=0x4321\0" \
- "cec_fun=0x2F\0" \
- "logic_addr=0x0\0" \
- "cec_ac_wakeup=0\0" \
+ "edid_14_dir=/vendor/etc/tvconfig/hdmi/port_14.bin\0" \
+ "edid_20_dir=/vendor/etc/tvconfig/hdmi/port_20.bin\0" \
+ "edid_select=0\0" \
+ "port_map=0x4321\0" \
+ "cec_fun=0x2F\0" \
+ "logic_addr=0x0\0" \
+ "cec_ac_wakeup=1\0" \
+ "cec_init= "\
+ "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
+ "echo port_map=${port_map}; "\
+ "echo cec_fun=${cec_fun}; "\
+ "if test ${cec_ac_wakeup} = 1; then "\
+ "cec ${logic_addr} ${cec_fun}; "\
+ "if test ${edid_select} = 1111; then "\
+ "hdmirx init ${port_map} ${edid_20_dir}; "\
+ "else if test ${edid_select} != 1111; then "\
+ "hdmirx init ${port_map} ${edid_14_dir}; "\
+ "fi;fi; "\
+ "fi; "\
+ "\0"\
"Irq_check_en=0\0"\
"fs_type=""rootfstype=ramfs""\0"\
"mem_size=2g\0"\
@@ -157,33 +170,18 @@
"if test ${powermode} = on; then "\
/*"run try_auto_burn; "*/\
"else if test ${powermode} = standby; then "\
- "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
- "if test ${cec_ac_wakeup} = 1; then "\
- "cec ${logic_addr} ${cec_fun}; "\
- "if test ${edid_select} = 1111; then "\
- "hdmirx init ${port_map} ${edid_20_dir}; "\
- "else if test ${edid_select} != 1111; then "\
- "hdmirx init ${port_map} ${edid_14_dir}; "\
- "fi;fi;"\
- "fi;"\
+ "run cec_init; "\
"systemoff; "\
"else if test ${powermode} = last; then "\
"echo suspend=${suspend}; "\
"if test ${suspend} = off; then "\
/*"run try_auto_burn; "*/\
"else if test ${suspend} = on; then "\
- "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
- "if test ${cec_ac_wakeup} = 1; then "\
- "cec ${logic_addr} ${cec_fun}; "\
- "if test ${edid_select} = 1111; then "\
- "hdmirx init ${port_map} ${edid_20_dir}; "\
- "else if test ${edid_select} != 1111; then "\
- "hdmirx init ${port_map} ${edid_14_dir}; "\
- "fi;fi;"\
- "fi;"\
+ "run cec_init; "\
"systemoff; "\
"else if test ${suspend} = shutdown; then "\
- "systemoff; "\
+ "run cec_init; "\
+ "systemoff; "\
"fi; fi; fi; "\
"fi; fi; fi; "\
"else if test ${reboot_mode} = fastboot; then "\
diff --git a/board/amlogic/configs/tl1_x301_v1.h b/board/amlogic/configs/tl1_x301_v1.h
index 41a58fe..a88e4cd 100644
--- a/board/amlogic/configs/tl1_x301_v1.h
+++ b/board/amlogic/configs/tl1_x301_v1.h
@@ -124,13 +124,26 @@
"boot_part=boot\0"\
"suspend=off\0"\
"powermode=on\0"\
- "edid_14_dir=/vendor/etc/tvconfig/hdmi/port_14.bin\0" \
- "edid_20_dir=/vendor/etc/tvconfig/hdmi/port_20.bin\0" \
- "edid_select=0\0" \
- "port_map=0x4321\0" \
- "cec_fun=0x2F\0" \
- "logic_addr=0x0\0" \
- "cec_ac_wakeup=0\0" \
+ "edid_14_dir=/vendor/etc/tvconfig/hdmi/port_14.bin\0" \
+ "edid_20_dir=/vendor/etc/tvconfig/hdmi/port_20.bin\0" \
+ "edid_select=0\0" \
+ "port_map=0x4321\0" \
+ "cec_fun=0x2F\0" \
+ "logic_addr=0x0\0" \
+ "cec_ac_wakeup=1\0" \
+ "cec_init= "\
+ "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
+ "echo port_map=${port_map}; "\
+ "echo cec_fun=${cec_fun}; "\
+ "if test ${cec_ac_wakeup} = 1; then "\
+ "cec ${logic_addr} ${cec_fun}; "\
+ "if test ${edid_select} = 1111; then "\
+ "hdmirx init ${port_map} ${edid_20_dir}; "\
+ "else if test ${edid_select} != 1111; then "\
+ "hdmirx init ${port_map} ${edid_14_dir}; "\
+ "fi;fi; "\
+ "fi; "\
+ "\0"\
"Irq_check_en=0\0"\
"fs_type=""rootfstype=ramfs""\0"\
"mem_size=1g\0"\
@@ -156,37 +169,22 @@
"run update;"\
"else if test ${reboot_mode} = cold_boot; then "\
/*"run try_auto_burn;uboot wake up "*/\
- "echo powermode=${powermode}; "\
+ "echo powermode=${powermode}; "\
"if test ${powermode} = on; then "\
/*"run try_auto_burn; "*/\
"else if test ${powermode} = standby; then "\
- "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
- "if test ${cec_ac_wakeup} = 1; then "\
- "cec ${logic_addr} ${cec_fun}; "\
- "if test ${edid_select} = 1111; then "\
- "hdmirx init ${port_map} ${edid_20_dir}; "\
- "else if test ${edid_select} != 1111; then "\
- "hdmirx init ${port_map} ${edid_14_dir}; "\
- "fi;fi;"\
- "fi;"\
+ "run cec_init; "\
"systemoff; "\
"else if test ${powermode} = last; then "\
- "echo suspend=${suspend}; "\
+ "echo suspend=${suspend}; "\
"if test ${suspend} = off; then "\
/*"run try_auto_burn; "*/\
"else if test ${suspend} = on; then "\
- "echo cec_ac_wakeup=${cec_ac_wakeup}; "\
- "if test ${cec_ac_wakeup} = 1; then "\
- "cec ${logic_addr} ${cec_fun}; "\
- "if test ${edid_select} = 1111; then "\
- "hdmirx init ${port_map} ${edid_20_dir}; "\
- "else if test ${edid_select} != 1111; then "\
- "hdmirx init ${port_map} ${edid_14_dir}; "\
- "fi;fi;"\
- "fi;"\
+ "run cec_init; "\
"systemoff; "\
"else if test ${suspend} = shutdown; then "\
- "systemoff; "\
+ "run cec_init; "\
+ "systemoff; "\
"fi; fi; fi; "\
"fi; fi; fi; "\
"else if test ${reboot_mode} = fastboot; then "\