From 6cb4469a8482786d1d22836ff7984ebf9da3f367 Mon Sep 17 00:00:00 2001 From: Jongpil Jung Date: Thu, 16 Nov 2017 13:25:31 +0900 Subject: [PATCH] nautilus: clean up code. remove base related code. remove anx74xx related code. Update GPIO PIN - unused PP3300_DX_SENSOR - unused EC_HAVEN_RESET_ODL - correct PP1800_DX_SENSOR and LTE. BUG=b:69389497 BRANCH=none TEST=build/flash nautilus rev1, power on and boot ok. Change-Id: I27fe5010bc082d4db941955d7ff49f5ae336901a Signed-off-by: Jongpil Jung Reviewed-on: https://chromium-review.googlesource.com/773320 Commit-Ready: Jongpil Jung Tested-by: Jongpil Jung Reviewed-by: Philip Chen --- board/nautilus/board.c | 29 +++-------------------------- board/nautilus/gpio.inc | 7 ++----- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/board/nautilus/board.c b/board/nautilus/board.c index 3bacf3a0e7..f594cedf05 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -398,9 +398,6 @@ void board_tcpc_init(void) /* Only reset TCPC if not sysjump */ if (!system_jumped_to_this_image()) { - gpio_set_level(GPIO_PP3300_USB_PD, 1); - /* TODO(crosbug.com/p/61098): How long do we need to wait? */ - msleep(10); board_reset_pd_mcu(); } @@ -413,6 +410,7 @@ void board_tcpc_init(void) * * NOTE: PS8751 A3 will wake on any I2C access. */ + i2c_read8(NPCX_I2C_PORT0_0, 0x10, 0xA0, ®); i2c_read8(NPCX_I2C_PORT0_1, 0x10, 0xA0, ®); /* Enable TCPC interrupts */ @@ -593,36 +591,15 @@ static void board_init(void) /* Enable sensors power supply */ gpio_set_level(GPIO_PP1800_DX_SENSOR, 1); - gpio_set_level(GPIO_PP3300_DX_SENSOR, 1); /* Enable VBUS interrupt */ - if (system_get_board_version() == 0) { - /* - * crosbug.com/p/61929: rev0 does not have VBUS detection, - * force detection on both ports. - */ - gpio_set_flags(GPIO_USB_C0_VBUS_WAKE_L, - GPIO_INPUT | GPIO_PULL_DOWN); - gpio_set_flags(GPIO_USB_C1_VBUS_WAKE_L, - GPIO_INPUT | GPIO_PULL_DOWN); - - vbus0_evt(GPIO_USB_C0_VBUS_WAKE_L); - vbus1_evt(GPIO_USB_C1_VBUS_WAKE_L); - } else { - gpio_enable_interrupt(GPIO_USB_C0_VBUS_WAKE_L); - gpio_enable_interrupt(GPIO_USB_C1_VBUS_WAKE_L); - } + gpio_enable_interrupt(GPIO_USB_C0_VBUS_WAKE_L); + gpio_enable_interrupt(GPIO_USB_C1_VBUS_WAKE_L); /* Enable pericom BC1.2 interrupts */ gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L); gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L); - /* - * If we jumped to this image and chipset is already in S0, enable - * base. - */ - if (system_jumped_to_this_image() && chipset_in_state(CHIPSET_STATE_ON)) - base_enable(); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc index 2485b9702a..af2638d561 100644 --- a/board/nautilus/gpio.inc +++ b/board/nautilus/gpio.inc @@ -50,7 +50,6 @@ GPIO(SYS_RESET_L, PIN(6, 1), GPIO_ODR_HIGH) /* Cold Reset to SOC */ GPIO(PMIC_SLP_SUS_L, PIN(8, 5), GPIO_OUT_LOW) /* SLP_SUS# to PMIC */ GPIO(BATTERY_PRESENT_L, PIN(3, 4), GPIO_INPUT) /* Battery Present */ GPIO(CCD_MODE_ODL, PIN(6, 3), GPIO_INPUT) /* Case Closed Debug Mode */ -GPIO(EC_HAVEN_RESET_ODL, PIN(0, 2), GPIO_ODR_HIGH) /* H1 Reset */ GPIO(ENTERING_RW, PIN(7, 6), GPIO_OUTPUT) /* EC Entering RW */ GPIO(PMIC_INT_L, PIN(6, 0), GPIO_INPUT) /* PMIC interrupt */ #ifndef CONFIG_POWER_S0IX @@ -64,12 +63,10 @@ GPIO(GPIOD2_NC, PIN(D, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(ALS_INT_L, PIN(2, 5), GPIO_INPUT) /* TODO(b/35585396): Make use of these GPIOs */ -GPIO(PP1800_DX_SENSOR, PIN(1, 4), GPIO_OUTPUT) -GPIO(PP3300_DX_SENSOR, PIN(2, 1), GPIO_OUTPUT) -GPIO(PP3300_USB_PD, PIN(2, 0), GPIO_OUTPUT) +GPIO(PP1800_DX_SENSOR, PIN(E, 7), GPIO_OUTPUT) GPIO(WLAN_PE_RST, PIN(1, 2), GPIO_OUTPUT) -GPIO(PP3300_DX_LTE, PIN(0, 5), GPIO_OUT_LOW) +GPIO(PP3300_DX_LTE, PIN(0, 2), GPIO_OUT_LOW) GPIO(LTE_GPS_OFF_L, PIN(0, 0), GPIO_ODR_HIGH) GPIO(LTE_BODY_SAR_L, PIN(0, 1), GPIO_ODR_HIGH) GPIO(LTE_WAKE_L, PIN(7, 1), GPIO_INPUT)