diff options
author | Portisch <hugo.portisch@yahoo.de> | 2018-10-24 10:28:08 +0200 |
---|---|---|
committer | Dongjin Kim <tobetter@gmail.com> | 2020-02-10 22:49:50 +0900 |
commit | 32e5335c98f9c43367f9d4d59f30dc7874aeff61 (patch) | |
tree | ad54042a0872b9a2517eec0dceb91f13634783b4 /board | |
parent | 0adc27a200c1c75781834e36c245946e3b307348 (diff) | |
download | u-boot-odroid-c1-32e5335c98f9c43367f9d4d59f30dc7874aeff61.tar.gz |
gxb/gxl/gxm: do not turn off hdmi power on suspend
Change-Id: Id62166a7666c95b8675544b162b0bbc25ff22e92
Diffstat (limited to 'board')
14 files changed, 51 insertions, 24 deletions
diff --git a/board/amlogic/gxb_p200_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxb_p200_v1/firmware/scp_task/pwr_ctrl.c index f266c649ab..de9f283f70 100755 --- a/board/amlogic/gxb_p200_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxb_p200_v1/firmware/scp_task/pwr_ctrl.c @@ -85,7 +85,7 @@ static void power_on_vcck(void) aml_update_bits(AO_GPIO_O_EN_N, 1<<20, 1<<20); } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { power_off_3v3(); power_off_vcck(); diff --git a/board/amlogic/gxb_p201_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxb_p201_v1/firmware/scp_task/pwr_ctrl.c index 0297cb240b..4437699b8d 100755 --- a/board/amlogic/gxb_p201_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxb_p201_v1/firmware/scp_task/pwr_ctrl.c @@ -84,7 +84,7 @@ static void power_on_vcck(void) aml_update_bits(AO_GPIO_O_EN_N, 1<<20, 1<<20); } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { power_off_3v3(); power_off_vcck(); diff --git a/board/amlogic/gxb_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxb_skt_v1/firmware/scp_task/pwr_ctrl.c index f3fc3f7931..6efdf5a5c5 100755 --- a/board/amlogic/gxb_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxb_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -85,7 +85,7 @@ static void power_on_vcck(void) aml_update_bits(AO_GPIO_O_EN_N, 1<<20, 1<<20); } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { power_off_3v3(); power_off_vcck(); diff --git a/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c index 1079a20c15..d3f180aa65 100755 --- a/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c @@ -95,9 +95,11 @@ static void power_off_at_mcu(unsigned int shutdown) } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); /* reduce power */ diff --git a/board/amlogic/gxl_p241_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p241_v1/firmware/scp_task/pwr_ctrl.c index 55a460b97a..632666a19b 100755 --- a/board/amlogic/gxl_p241_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p241_v1/firmware/scp_task/pwr_ctrl.c @@ -98,9 +98,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); /* reduce power */ diff --git a/board/amlogic/gxl_p271_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p271_v1/firmware/scp_task/pwr_ctrl.c index cb4a438880..eb4c931d74 100755 --- a/board/amlogic/gxl_p271_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p271_v1/firmware/scp_task/pwr_ctrl.c @@ -90,9 +90,18 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_mcu(unsigned int shutdown) { - hdmi_5v_ctrl(OFF); + if(shutdown == SYS_POWEROFF) { + aml_update_bits(PREG_PAD_GPIO3_EN_N, 1 << 14, 0); + aml_update_bits(PREG_PAD_GPIO3_O, 1 << 14, 1 << 14); + } +} +static void power_off_at_clk81(unsigned int suspend_from) +{ + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); /* reduce power */ diff --git a/board/amlogic/gxl_p281_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p281_v1/firmware/scp_task/pwr_ctrl.c index 0e0dc0df55..8d058c968f 100755 --- a/board/amlogic/gxl_p281_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p281_v1/firmware/scp_task/pwr_ctrl.c @@ -97,9 +97,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); /* reduce power */ diff --git a/board/amlogic/gxl_p400_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p400_v1/firmware/scp_task/pwr_ctrl.c index 53898c4123..1a38e09070 100755 --- a/board/amlogic/gxl_p400_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p400_v1/firmware/scp_task/pwr_ctrl.c @@ -116,9 +116,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/amlogic/gxl_p401_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p401_v1/firmware/scp_task/pwr_ctrl.c index 53898c4123..1a38e09070 100755 --- a/board/amlogic/gxl_p401_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p401_v1/firmware/scp_task/pwr_ctrl.c @@ -116,9 +116,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/amlogic/gxl_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_skt_v1/firmware/scp_task/pwr_ctrl.c index 36c0a25aee..5d3e43fcfd 100755 --- a/board/amlogic/gxl_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -93,9 +93,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_d, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/amlogic/gxm_q200_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxm_q200_v1/firmware/scp_task/pwr_ctrl.c index 963bceef8b..cc49ff4b31 100755 --- a/board/amlogic/gxm_q200_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxm_q200_v1/firmware/scp_task/pwr_ctrl.c @@ -116,9 +116,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/amlogic/gxm_q201_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxm_q201_v1/firmware/scp_task/pwr_ctrl.c index aa82781987..9ed77f89e9 100755 --- a/board/amlogic/gxm_q201_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxm_q201_v1/firmware/scp_task/pwr_ctrl.c @@ -116,9 +116,11 @@ static void vcck_ctrl(unsigned int ctrl) } } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/amlogic/gxm_skt_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxm_skt_v1/firmware/scp_task/pwr_ctrl.c index 69bdb39f9a..6641bf2f4d 100755 --- a/board/amlogic/gxm_skt_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxm_skt_v1/firmware/scp_task/pwr_ctrl.c @@ -115,9 +115,11 @@ static void power_off_at_mcu(unsigned int shutdown) } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { - hdmi_5v_ctrl(OFF); + if(suspend_from == SYS_POWEROFF) { + hdmi_5v_ctrl(OFF); + } vcck_ctrl(OFF); pwm_set_voltage(pwm_b, CONFIG_VDDEE_SLEEP_VOLTAGE); // reduce power } diff --git a/board/hardkernel/odroidc2/firmware/scp_task/pwr_ctrl.c b/board/hardkernel/odroidc2/firmware/scp_task/pwr_ctrl.c index 56b45e1978..224e05b1ff 100755 --- a/board/hardkernel/odroidc2/firmware/scp_task/pwr_ctrl.c +++ b/board/hardkernel/odroidc2/firmware/scp_task/pwr_ctrl.c @@ -85,7 +85,7 @@ static void power_on_vcck(void) aml_update_bits(AO_GPIO_O_EN_N, 1<<20, 1<<20); } -static void power_off_at_clk81(void) +static void power_off_at_clk81(unsigned int suspend_from) { power_off_3v3(); power_off_vcck(); |