scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-10 17:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

meowth: Add temp sensor ADC channels.

Browse Source 
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 <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/775080
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
This commit is contained in:
Aseda Aboagye
2017-11-15 16:50:25 -08:00
committed by chrome-bot
parent 2590ce9538
commit 14b985ff9f
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
board/zoombini/board.c
View File

@@ -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. */

3
board/zoombini/board.h
View File

@@ -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
};

2
board/zoombini/gpio.inc
View File

@@ -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)