From 14b985ff9ff1e77223608c0802882af04ed3c040 Mon Sep 17 00:00:00 2001 From: Aseda Aboagye Date: Wed, 15 Nov 2017 16:50:25 -0800 Subject: [PATCH] meowth: Add temp sensor ADC channels. Additionally, meowth has GPIOs for sleep signals, therefore remove the "ifndef" for eSPI VW. BUG=b:69138817 BRANCH=None TEST=make -j buildall Change-Id: Ib78a8c5ff8037022adcaf690157836fd2db1ef0d Signed-off-by: Aseda Aboagye Reviewed-on: https://chromium-review.googlesource.com/775080 Commit-Ready: Aseda Aboagye Tested-by: Aseda Aboagye Reviewed-by: Shawn N --- board/zoombini/board.c | 19 ++++++++++++++++--- board/zoombini/board.h | 3 +++ board/zoombini/gpio.inc | 2 -- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/board/zoombini/board.c b/board/zoombini/board.c index 354fe19bb9..6dda4420d3 100644 --- a/board/zoombini/board.c +++ b/board/zoombini/board.c @@ -57,15 +57,28 @@ const enum gpio_signal hibernate_wake_pins[] = { }; const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); -/* TODO(aaboagye): Add the additional Meowth temps sensors */ const struct adc_t adc_channels[] = { +#ifdef BOARD_ZOOMBINI [ADC_TEMP_SENSOR_SOC] = { - "SOC", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0 + "SOC", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX + 1, 0 }, [ADC_TEMP_SENSOR_CHARGER] = { - "CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0 + "CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX + 1, 0 }, +#else /* defined(BOARD_MEOWTH) */ + [ADC_TEMP_SENSOR_CHARGER] = { + "CHARGER", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX + 1, 0 + }, + + [ADC_TEMP_SENSOR_SOC] = { + "SOC", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX + 1, 0 + }, + + [ADC_TEMP_SENSOR_WIFI] = { + "WIFI", NPCX_ADC_CH8, ADC_MAX_VOLT, ADC_READ_MAX + 1, 0 + }, +#endif /* defined(BOARD_ZOOMBINI) */ }; /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ diff --git a/board/zoombini/board.h b/board/zoombini/board.h index 9021d2184c..bbf56c28cc 100644 --- a/board/zoombini/board.h +++ b/board/zoombini/board.h @@ -171,6 +171,9 @@ enum adc_channel { ADC_VBUS = -1, ADC_TEMP_SENSOR_SOC, ADC_TEMP_SENSOR_CHARGER, +#ifdef BOARD_MEOWTH + ADC_TEMP_SENSOR_WIFI, +#endif /* defined(BOARD_MEOWTH) */ ADC_CH_COUNT }; diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc index 9851d07943..0b31503d7d 100644 --- a/board/zoombini/gpio.inc +++ b/board/zoombini/gpio.inc @@ -140,10 +140,8 @@ GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpowe /* Power Signals. */ GPIO_INT(PCH_SLP_S0_L, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) -#ifndef CONFIG_ESPI_VW_SIGNALS GPIO_INT(PCH_SLP_S3_L, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) GPIO_INT(PCH_SLP_S4_L, PIN(A, 3), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) -#endif /* defined(CONFIG_ESPI_VW_SIGNALS) */ GPIO_INT(PCH_SLP_SUS_L, PIN(D, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* TODO(aaboagye): Internal PU may be needed later on... */ GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt)