summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Chao <scott_chao@wistron.corp-partner.google.com>2021-10-07 09:18:16 +0800
committerCommit Bot <commit-bot@chromium.org>2021-10-15 21:50:51 +0000
commit2cd12461139946453045695e7034ae8c10a63698 (patch)
treed6ee5268eb26c28976ae0c525db507fea93b7b24
parentf0fcad109d75ff48459d2cc7e4c3dde9e691af3f (diff)
downloadchrome-ec-2cd12461139946453045695e7034ae8c10a63698.tar.gz
gimble: control prochot
BUG=b:198689488 BRANCH=none TEST=make -j BOARD=gimble Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com> Change-Id: I87c05cc9c1cac2671d8c722df5dec6db352f9e05 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3210249 Tested-by: Will Tsai <will_tsai@wistron.corp-partner.google.com> Commit-Queue: Boris Mittelberg <bmbm@google.com> Reviewed-by: Boris Mittelberg <bmbm@google.com>
-rw-r--r--board/gimble/board.h4
-rw-r--r--board/gimble/ec.tasklist3
-rw-r--r--board/gimble/sensors.c7
3 files changed, 13 insertions, 1 deletions
diff --git a/board/gimble/board.h b/board/gimble/board.h
index 2cd80a2fa5..b7a31631f7 100644
--- a/board/gimble/board.h
+++ b/board/gimble/board.h
@@ -184,6 +184,9 @@
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
+/* PROCHOT defines */
+#define BATT_MAX_CONTINUE_DISCHARGE_WATT 45
+
#ifndef __ASSEMBLER__
#include "gpio_signal.h" /* needed by registers.h */
@@ -194,6 +197,7 @@ enum adc_channel {
ADC_TEMP_SENSOR_1_DDR_SOC,
ADC_TEMP_SENSOR_2_FAN,
ADC_TEMP_SENSOR_3_CHARGER,
+ ADC_IADPT,
ADC_CH_COUNT
};
diff --git a/board/gimble/ec.tasklist b/board/gimble/ec.tasklist
index 290c17c748..2742967660 100644
--- a/board/gimble/ec.tasklist
+++ b/board/gimble/ec.tasklist
@@ -26,4 +26,5 @@
TASK_ALWAYS(PD_C0, pd_task, NULL, VENTI_TASK_STACK_SIZE) \
TASK_ALWAYS(PD_C1, pd_task, NULL, VENTI_TASK_STACK_SIZE) \
TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, TASK_STACK_SIZE) \
- TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, TASK_STACK_SIZE)
+ TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, TASK_STACK_SIZE) \
+ TASK_NOTEST(PROCHOT, prochot_task, NULL, LARGER_TASK_STACK_SIZE)
diff --git a/board/gimble/sensors.c b/board/gimble/sensors.c
index 24c7215900..3468e3eb35 100644
--- a/board/gimble/sensors.c
+++ b/board/gimble/sensors.c
@@ -41,6 +41,13 @@ const struct adc_t adc_channels[] = {
.factor_div = ADC_READ_MAX + 1,
.shift = 0,
},
+ [ADC_IADPT] = {
+ .name = "CHARGER_IADPT",
+ .input_ch = NPCX_ADC_CH3,
+ .factor_mul = ADC_MAX_VOLT,
+ .factor_div = ADC_READ_MAX + 1,
+ .shift = 0,
+ },
};
BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);