summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongjin Kim <tobetter@gmail.com>2020-08-05 11:54:39 +0300
committerDongjin Kim <tobetter@gmail.com>2020-08-06 06:28:08 +0300
commit9286190cb5afa281939fd61b21205f1e00a737ce (patch)
tree07817785617f933b8cdcaf928b36c49184033fba
parente0725c1dce0c3dbbae47478c13d968c41014fac8 (diff)
downloadu-boot-9286190cb5afa281939fd61b21205f1e00a737ce.tar.xz
ODROID-N2: scp_task: fix to mitigate GL3523 defect issuetravis/odroidn2-141travis/odroidc4-141g12_9.0.0_64_20200813g12_9.0.0_64_20200807
Signed-off-by: Dongjin Kim <tobetter@gmail.com> Change-Id: I598a72301c27431eea9c904771294e9009932eae
-rw-r--r--board/hardkernel/odroidn2/firmware/scp_task/pwr_ctrl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/hardkernel/odroidn2/firmware/scp_task/pwr_ctrl.c b/board/hardkernel/odroidn2/firmware/scp_task/pwr_ctrl.c
index f35f92507b..a551e19546 100644
--- a/board/hardkernel/odroidn2/firmware/scp_task/pwr_ctrl.c
+++ b/board/hardkernel/odroidn2/firmware/scp_task/pwr_ctrl.c
@@ -80,7 +80,7 @@ static void power_off_at_24M(unsigned int suspend_from)
writel(readl(AO_GPIO_O_EN_N) & (~(1 << 4)), AO_GPIO_O_EN_N);
writel(readl(AO_RTI_PIN_MUX_REG) & (~(0xf << 16)), AO_RTI_PIN_MUX_REG);
- if (!enable_wol) {
+ if (!enable_5V_system_power && !enable_wol) {
/*set test_n low to power off vcck_b & vcc 3.3v*/
writel(readl(AO_GPIO_O) & (~(1 << 31)), AO_GPIO_O);
writel(readl(AO_GPIO_O_EN_N) & (~(1 << 31)), AO_GPIO_O_EN_N);
@@ -96,7 +96,7 @@ static void power_on_at_24M(unsigned int suspend_from)
/*step up ee voltage*/
set_vddee_voltage(CONFIG_VDDEE_INIT_VOLTAGE);
- if (!enable_wol) {
+ if (!enable_5V_system_power && !enable_wol) {
/*set test_n high to power on vcck_b & vcc 3.3v*/
writel(readl(AO_GPIO_O) | (1 << 31), AO_GPIO_O);
writel(readl(AO_GPIO_O_EN_N) & (~(1 << 31)), AO_GPIO_O_EN_N);
@@ -112,7 +112,7 @@ static void power_on_at_24M(unsigned int suspend_from)
if (!enable_5V_system_power)
{
- /*set gpioH_8 low to power on vcc 5v*/
+ /*set gpioH_8 high to power on vcc 5v*/
writel(readl(PREG_PAD_GPIO3_EN_N) | (1 << 8), PREG_PAD_GPIO3_EN_N);
writel(readl(PERIPHS_PIN_MUX_C) & (~(0xf)), PERIPHS_PIN_MUX_C);
}