diff options
Diffstat (limited to 'board/marzipan/gpio.inc')
-rw-r--r-- | board/marzipan/gpio.inc | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/board/marzipan/gpio.inc b/board/marzipan/gpio.inc index d85b83d9a6..be69f4f509 100644 --- a/board/marzipan/gpio.inc +++ b/board/marzipan/gpio.inc @@ -15,7 +15,6 @@ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* I GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb1_evt) /* Interrupt from port-1 BC1.2 */ -GPIO_INT(USB_A0_OC_ODL, PIN(D, 1), GPIO_INT_BOTH | GPIO_PULL_UP, usba_oc_interrupt) /* System interrupts */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ @@ -43,13 +42,6 @@ GPIO_INT(AP_EC_SPI_CS_L, PIN(5, 3), GPIO_INT_FALLING | GPIO_PULL_DOWN, shi_cs GPIO_INT(TABLET_MODE_L, PIN(C, 6), GPIO_INT_BOTH, gmr_tablet_switch_isr) GPIO_INT(ACCEL_GYRO_INT_L, PIN(A, 0), GPIO_INT_FALLING, motion_interrupt) /* Accelerometer/gyro interrupt */ -/* Switchcap - * - * For DA9313 SKUs, it is GPIO0 of DA9313. The GPIO0 is configured as PVC_PG. - * For LN9310 SKUs, it is the interrupt line of LN9310. - */ -GPIO_INT(DA9313_GPIO0, PIN(E, 2), GPIO_INT_FALLING, ln9310_interrupt) - /* * EC_RST_ODL used to be a wake source from PSL mode. However, we disabled * the PSL mode. This GPIO does nothing now. Simply set it an INPUT. @@ -67,8 +59,6 @@ GPIO(QSIP_ON, PIN(5, 0), GPIO_OUT_LOW) /* Not used, for non-swit /* Power enables */ GPIO(HIBERNATE_L, PIN(5, 2), GPIO_OUT_HIGH) /* EC hibernate */ GPIO(SWITCHCAP_ON, PIN(D, 5), GPIO_OUT_LOW) /* Enable switch cap; will be configured in the board init */ -/* TODO(waihong): Remove it. The VBOB switch is for backup. */ -GPIO(VBOB_EN, PIN(D, 3), GPIO_OUT_LOW) /* Enable VBOB */ GPIO(EN_PP3300_A, PIN(A, 6), GPIO_OUT_LOW) /* Enable PP3300 */ GPIO(EN_PP5000_A, PIN(6, 7), GPIO_OUT_LOW) /* Enable PP5000 */ GPIO(EC_BL_DISABLE_L, PIN(B, 6), GPIO_OUT_LOW) /* Backlight disable signal from EC */ @@ -86,10 +76,6 @@ GPIO(DP_MUX_OE_L, PIN(9, 6), GPIO_ODR_HIGH) /* DP mux enable, actuall GPIO(DP_MUX_SEL, PIN(4, 5), GPIO_OUT_LOW) /* DP mux selection: L:C0, H:C1 */ GPIO(DP_HOT_PLUG_DET, PIN(9, 5), GPIO_OUT_LOW) /* DP HPD to AP */ -/* USB-A */ -GPIO(EN_USB_A_5V, PIN(8, 6), GPIO_OUT_LOW) -GPIO(USB_A_CDP_ILIM_EN, PIN(7, 5), GPIO_OUT_HIGH) /* H: CDP, L:SDP. Only one USB-A port, always CDP */ - /* LEDs */ GPIO(EC_CHG_LED_Y_C1, PIN(C, 3), GPIO_OUT_LOW) GPIO(EC_CHG_LED_B_C1, PIN(C, 4), GPIO_OUT_LOW) @@ -132,6 +118,13 @@ GPIO(SKU_ID0, PIN(F, 0), GPIO_INPUT) GPIO(SKU_ID1, PIN(4, 1), GPIO_INPUT) GPIO(SKU_ID2, PIN(D, 4), GPIO_INPUT) +/* Switchcap */ +/* + * GPIO0 is configured as PVC_PG. When the chip in power down mode, it outputs + * high-Z. Set pull-down to avoid floating. + */ +GPIO(DA9313_GPIO0, PIN(E, 2), GPIO_INPUT | GPIO_PULL_DOWN) /* Switchcap GPIO0 */ + /* Special straps */ GPIO(ARM_X86, PIN(6, 6), GPIO_OUT_LOW) /* NC, low for power saving */ @@ -160,6 +153,10 @@ UNUSED(PIN(3, 5)) UNUSED(PIN(9, 7)) UNUSED(PIN(6, 0)) UNUSED(PIN(7, 2)) +UNUSED(PIN(D, 3)) +UNUSED(PIN(8, 6)) +UNUSED(PIN(7, 5)) +UNUSED(PIN(D, 1)) /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART (GPIO64/65) */ |