From d66d8ae928aeb26b05606a6dd0b878f45a375890 Mon Sep 17 00:00:00 2001 From: Hsu Wei-Cheng Date: Fri, 6 Aug 2021 08:27:57 +0000 Subject: Revert "dartmonkey: Moved unused SLP_ALT_DEV_L to RW" This reverts commit 69d96e325f9f9060e64fece1e04cf2963ccef3ab. Reason for revert: It may broke CQ BUG=b:195718112 Original change's description: > dartmonkey: Moved unused SLP_ALT_DEV_L to RW > > BRANCH=none > BUG=b:178746753 > TEST=# Connect servo_micro and J-Link to an icetower board. > make proj-dartmonkey -j > sudo servod --board=icetower > ./util/flash_jlink.py --board=dartmonkey --image=./build/dartmonkey/ec.bin > # Unplug J-Link > > dut-control fpmcu_slp:off fpmcu_slp_alt:off > dut-control pp3300_dx_mcu_mw # Should be more than 40mw > dut-control fpmcu_slp:on fpmcu_slp_alt:off > dut-control pp3300_dx_mcu_mw # Should be less than 10mw > dut-control fpmcu_slp:off fpmcu_slp_alt:on > dut-control pp3300_dx_mcu_mw # Should be less than 10mw > dut-control fpmcu_slp:on fpmcu_slp_alt:on > dut-control pp3300_dx_mcu_mw # Should be less than 10mw > dut-control fpmcu_slp:off fpmcu_slp_alt:off > > minicom -D$(dut-control -o raw_fpmcu_console_uart_pty) > > reboot ro > # Ctrl-A Q > > # RO no longer enters low-power-idle. > dut-control fpmcu_slp:off fpmcu_slp_alt:off > dut-control pp3300_dx_mcu_mw # Should be more than 40mw > dut-control fpmcu_slp:on fpmcu_slp_alt:off > dut-control pp3300_dx_mcu_mw # Should be more than 40mw > dut-control fpmcu_slp:off fpmcu_slp_alt:on > dut-control pp3300_dx_mcu_mw # Should be more than 40mw > dut-control fpmcu_slp:on fpmcu_slp_alt:on > dut-control pp3300_dx_mcu_mw # Should be more than 40mw > dut-control fpmcu_slp:off fpmcu_slp_alt:off > > minicom -D$(dut-control -o raw_fpmcu_console_uart_pty) > > gpioget # Check that SLP_ALT_DEV_L is missing. > # Ctrl-A Q > > Signed-off-by: Craig Hesling > Change-Id: I51057d710ef0a884133e3dab03ee0bac2e74c3b8 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3064768 > Commit-Queue: Josie Nordrum > Reviewed-by: Josie Nordrum Bug: b:178746753 Change-Id: I0c3ed1420696c2b07c25ebc254ab80c4e12b4e79 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3077586 Commit-Queue: Rubber Stamper Commit-Queue: Hsu Wei-Cheng Bot-Commit: Rubber Stamper Owners-Override: Hsu Wei-Cheng Auto-Submit: Hsu Wei-Cheng --- board/nocturne_fp/gpio.inc | 1 + board/nocturne_fp/gpio_rw.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/nocturne_fp/gpio.inc b/board/nocturne_fp/gpio.inc index dc15ab0ef0..ff94e4f8f7 100644 --- a/board/nocturne_fp/gpio.inc +++ b/board/nocturne_fp/gpio.inc @@ -7,6 +7,7 @@ /* Interrupts */ GPIO_INT(SLP_L, PIN(D,13), GPIO_INT_BOTH, slp_event) GPIO_INT(SLP_ALT_L, PIN(A,11), GPIO_INT_BOTH, slp_event) +GPIO_INT(SLP_ALT_DEV_L, PIN(D,14), GPIO_INT_BOTH, slp_event) GPIO_INT(SPI1_NSS, PIN(A, 4), GPIO_INPUT, spi_event) /* Inputs */ diff --git a/board/nocturne_fp/gpio_rw.inc b/board/nocturne_fp/gpio_rw.inc index 2de4c3e92a..088ce22f32 100644 --- a/board/nocturne_fp/gpio_rw.inc +++ b/board/nocturne_fp/gpio_rw.inc @@ -16,7 +16,6 @@ GPIO_INT(WP, PIN(B, 7), GPIO_INT_BOTH, wp_event) #endif /* Inputs */ -GPIO_INT(SLP_ALT_DEV_L, PIN(D,14), GPIO_INT_BOTH, slp_event) /* * The S4 and SUS sleep lines are unused in code, but are maintained in this * gpio list to ensure that they are not repurposed. This is because these -- cgit v1.2.1