summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2014-08-18 18:11:14 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-08-20 21:07:21 +0000
commit6a99f7d0a432a1ab040b0548cfa32259b90e804b (patch)
tree1dd47bceeaf55513c17f5749e61992a9bc946e6c
parent4e8751372a41c631c4b255604d6f0f74dffee52a (diff)
downloadchrome-ec-6a99f7d0a432a1ab040b0548cfa32259b90e804b.tar.gz
samus_pd: add WP_L gpio
Rename SPI_FLASH_WP_L to WP_L, the standard GPIO name for the WP screw. BUG=none BRANCH=none TEST=load on samus, make sure gpioget WP_L reflects state of WP pin accurately Change-Id: Ie5e6d705a7be6c18b0026b357745946da7390cfb Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/213007 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: David Hendricks <dhendrix@chromium.org>
-rw-r--r--board/samus_pd/board.c1
-rw-r--r--board/samus_pd/gpio.inc3
2 files changed, 2 insertions, 2 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index 519060424d..78635e444c 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -14,6 +14,7 @@
#include "i2c.h"
#include "power.h"
#include "registers.h"
+#include "switch.h"
#include "task.h"
#include "usb_pd.h"
#include "usb_pd_config.h"
diff --git a/board/samus_pd/gpio.inc b/board/samus_pd/gpio.inc
index 94381fbcdb..f917847981 100644
--- a/board/samus_pd/gpio.inc
+++ b/board/samus_pd/gpio.inc
@@ -13,6 +13,7 @@ GPIO(USB_C1_BC12_INT_L, C, 11, GPIO_INT_FALLING, bc12_evt)
GPIO(PCH_SLP_S0_L, C, 14, GPIO_INT_BOTH, pch_evt)
GPIO(PCH_SLP_S3_L, C, 15, GPIO_INT_BOTH, pch_evt)
GPIO(PCH_SLP_S5_L, D, 7, GPIO_INT_BOTH, pch_evt)
+GPIO(WP_L, D, 2, GPIO_INT_BOTH, switch_interrupt)
/* PD RX/TX */
GPIO(USB_C0_CC1_PD, A, 0, GPIO_ANALOG, NULL)
@@ -93,7 +94,6 @@ GPIO(MASTER_I2C_SCL, B, 10, GPIO_INPUT, NULL)
GPIO(MASTER_I2C_SDA, B, 11, GPIO_INPUT, NULL)
/* Case closed debugging. */
-GPIO(SPI_FLASH_WP_L, D, 2, GPIO_INPUT, NULL)
GPIO(EC_INT_L, B, 2, GPIO_ODR_HIGH, NULL)
GPIO(EC_IN_RW, C, 12, GPIO_INPUT, NULL)
GPIO(EC_RST_L, C, 13, GPIO_OUT_HIGH, NULL)
@@ -120,7 +120,6 @@ GPIO(AP_UART_RX, D, 6, GPIO_INPUT, NULL)
/* Unimplemented signals which we need to emulate for now */
UNIMPLEMENTED(ENTERING_RW)
-UNIMPLEMENTED(WP_L)
ALTERNATE(B, 0x0008, 0, MODULE_USB_PD, 0) /* SPI1: SCK(PB3) */
ALTERNATE(B, 0x2000, 0, MODULE_USB_PD, 0) /* SPI2: SCK(PB13) */