plankton: Update GPIO names and attributes for Plankton v3

Update GPIOs to reflect changes in Plankton v3. The default values are
set so that case closed debugging is disabled. Also, rename CABLE_FLIP
to MUX_FLIP to match the schematic. (Plus that MUX_FLIP is a more
suitable name for what it does.)

This change be functionally compatible with Plankton v2, except that the
change on PA7 causes a 0.33mA leakage current on Plankton v2, which
should not be a problem.

BRANCH=None
BUG=None
TEST=Compile only

Change-Id: I50c56a1c583015d3624ec9f5901ed477d07233f4
Signed-off-by: Vic (Chun-Ju) Yang <victoryang@google.com>
Reviewed-on: https://chromium-review.googlesource.com/227980
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>

2 files changed, 16 insertions, 12 deletions

diff --git a/board/plankton/board.c b/board/plankton/board.c
index a7666c3100..ddabdc9297 100644
--- a/board/plankton/board.c
+++ b/board/plankton/board.c
@@ -34,7 +34,7 @@ enum usbc_action {
 	USBC_ACT_USBDP_TOGGLE,
 	USBC_ACT_USB_EN,
 	USBC_ACT_DP_EN,
-	USBC_ACT_CABLE_FLIP,
+	USBC_ACT_MUX_FLIP,
 	USBC_ACT_CABLE_POLARITY0,
 	USBC_ACT_CABLE_POLARITY1,
 
@@ -76,7 +76,7 @@ static void set_usbc_action(enum usbc_action act)
 	case USBC_ACT_DP_EN:
 		gpio_set_level(GPIO_USBC_SS_USB_MODE, 0);
 		break;
-	case USBC_ACT_CABLE_FLIP:
+	case USBC_ACT_MUX_FLIP:
 		pd_send_vdm(0, USB_VID_GOOGLE, VDO_CMD_FLIP, NULL, 0);
 		gpio_set_level(GPIO_USBC_POLARITY,
 			       !gpio_get_level(GPIO_USBC_POLARITY));
@@ -115,8 +115,8 @@ static void button_deferred(void)
 	case GPIO_DBG_USB_TOGGLE_L:
 		set_usbc_action(USBC_ACT_USBDP_TOGGLE);
 		break;
-	case GPIO_DBG_CABLE_FLIP_L:
-		set_usbc_action(USBC_ACT_CABLE_FLIP);
+	case GPIO_DBG_MUX_FLIP_L:
+		set_usbc_action(USBC_ACT_MUX_FLIP);
 		break;
 	default:
 		break;
@@ -168,7 +168,7 @@ static void board_init(void)
 	gpio_enable_interrupt(GPIO_DBG_20V_TO_DUT_L);
 	gpio_enable_interrupt(GPIO_DBG_CHG_TO_DEV_L);
 	gpio_enable_interrupt(GPIO_DBG_USB_TOGGLE_L);
-	gpio_enable_interrupt(GPIO_DBG_CABLE_FLIP_L);
+	gpio_enable_interrupt(GPIO_DBG_MUX_FLIP_L);
 
 	ina2xx_init(0, 0x399f, INA2XX_CALIB_1MA(10 /* mOhm */));
 }
@@ -194,7 +194,7 @@ static int cmd_usbc_action(int argc, char *argv[])
 	else if (!strcasecmp(argv[1], "dp"))
 		act = USBC_ACT_DP_EN;
 	else if (!strcasecmp(argv[1], "flip"))
-		act = USBC_ACT_CABLE_FLIP;
+		act = USBC_ACT_MUX_FLIP;
 	else if (!strcasecmp(argv[1], "pol0"))
 		act = USBC_ACT_CABLE_POLARITY0;
 	else if (!strcasecmp(argv[1], "pol1"))
diff --git a/board/plankton/gpio.inc b/board/plankton/gpio.inc
index f1b09fb213..13a6507848 100644
--- a/board/plankton/gpio.inc
+++ b/board/plankton/gpio.inc
@@ -9,11 +9,11 @@
 GPIO(VBUS_WAKE,           B, 5,  GPIO_INT_BOTH,    vbus_event)
 GPIO(DBG_20V_TO_DUT_L,    C, 13, GPIO_INT_FALLING, button_event)
 GPIO(DBG_12V_TO_DUT_L,    B, 14, GPIO_INT_FALLING, button_event)
-GPIO(DBG_CHG_TO_DEV_L,    F, 1,  GPIO_INT_FALLING, button_event)
 GPIO(DBG_5V_TO_DUT_L,     B, 8,  GPIO_INT_FALLING, button_event)
+GPIO(DBG_CHG_TO_DEV_L,    F, 1,  GPIO_INT_FALLING, button_event)
 GPIO(DBG_USB_TOGGLE_L,    F, 0,  GPIO_INT_FALLING, button_event)
 GPIO(DBG_CASE_CLOSE_EN_L, B, 12, GPIO_INT_FALLING, button_event)
-GPIO(DBG_CABLE_FLIP_L,    B, 15, GPIO_INT_FALLING, button_event)
+GPIO(DBG_MUX_FLIP_L,      B, 15, GPIO_INT_FALLING, button_event)
 
 /* PD RX/TX */
 GPIO(USBC_PD_REF,         A, 1,  GPIO_ANALOG,   NULL)
@@ -37,7 +37,6 @@ GPIO(USBC_CC2_DEVICE_ODL, B, 7,  GPIO_OUT_LOW,  NULL)
 GPIO(USBC_CC2_HOST,       B, 6,  GPIO_INPUT,    NULL)
 GPIO(USBC_POLARITY,       B, 1,  GPIO_OUT_HIGH, NULL)
 GPIO(USBC_SS_USB_MODE,    B, 3,  GPIO_OUT_LOW,  NULL)
-GPIO(USBC_SS_EN_L,        B, 4,  GPIO_OUT_LOW,  NULL)
 GPIO(USB_CC1_VCONN_EN_L,  A, 11, GPIO_OUT_HIGH, NULL)
 GPIO(USB_CC2_VCONN_EN_L,  A, 12, GPIO_OUT_HIGH, NULL)
 
@@ -46,6 +45,14 @@ GPIO(VBUS_CHARGER_EN,     B, 0,  GPIO_OUT_LOW,  NULL)
 GPIO(USBC_VSEL_1,         A, 10, GPIO_OUT_LOW,  NULL)
 GPIO(USBC_VSEL_0,         C, 14, GPIO_OUT_LOW,  NULL)
 
+/* Case closed debugging */
+GPIO(CASE_CLOSE_EN,       A, 7,  GPIO_OUT_LOW,  NULL)
+GPIO(CASE_CLOSE_DFU_L,    A, 13, GPIO_OUT_HIGH, NULL)
+GPIO(DEBUG_TOGGLE,        B, 4,  GPIO_OUT_LOW,  NULL)
+
+/* Display port */
+GPIO(DPSRC_HPD,           B, 13, GPIO_INPUT,    NULL)
+
 /* Alternate functions */
 #if 0
 GPIO(UART_TX,             A, 14, GPIO_OUT_LOW,  NULL)
@@ -59,9 +66,6 @@ GPIO(UART_RX,             A, 15, GPIO_OUT_LOW,  NULL)
 GPIO(MASTER_I2C_SCL,       B, 10, GPIO_INPUT,    NULL)
 GPIO(MASTER_I2C_SDA,       B, 11, GPIO_INPUT,    NULL)
 
-/* Test points */
-GPIO(TP1,                  A, 13, GPIO_ODR_HIGH, NULL)
-
 /* Unimplemented signals which we need to emulate for now */
 UNIMPLEMENTED(ENTERING_RW)
 UNIMPLEMENTED(WP_L)