diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-03-25 17:34:22 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-11 21:20:28 +0000 |
| commit | fae894230df4f0e34dc4f13c587ee4d721dfa812 (patch) | |
| tree | 292ddce115af73226d0a631019ba30e47cb2535f | |
| parent | b96da60a177950446fa3db6d538e6f32badaf7ff (diff) | |
| download | chrome-ec-fae894230df4f0e34dc4f13c587ee4d721dfa812.tar.gz | |
Coachz: Remove PCHG from RO
Peripheral devices don't need to be charged until EC jumps to RW.
This patch removes PCHG from the RO copy.
BUG=b:173235954
BRANCH=trogdor
TEST=Charge stylus on Coachz.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I8156d1408bf69f4c1fccecaf3a77eaec29fa2c99
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2795065
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/coachz/board.c | 2 | ||||
| -rw-r--r-- | board/coachz/board.h | 2 | ||||
| -rw-r--r-- | board/coachz/ec.tasklist | 2 | ||||
| -rw-r--r-- | board/coachz/gpio.inc | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/board/coachz/board.c b/board/coachz/board.c index 0cae0659b6..3c15f33aed 100644 --- a/board/coachz/board.c +++ b/board/coachz/board.c @@ -50,6 +50,7 @@ static void ks_interrupt(enum gpio_signal s); #include "gpio_list.h" +#ifdef SECTION_IS_RW extern struct pchg_drv ctn730_drv; struct pchg pchgs[] = { @@ -65,6 +66,7 @@ struct pchg pchgs[] = { }, }; const int pchg_count = ARRAY_SIZE(pchgs); +#endif /* GPIO Interrupt Handlers */ static void tcpc_alert_event(enum gpio_signal signal) diff --git a/board/coachz/board.h b/board/coachz/board.h index 268dcb5b89..e4adcb6b49 100644 --- a/board/coachz/board.h +++ b/board/coachz/board.h @@ -65,10 +65,12 @@ #define GPIO_KS_OPEN GPIO_LID_INT_N_HALL2 /* WLC pins */ +#ifdef SECTION_IS_RW #define GPIO_PCHG_P0 GPIO_WLC_IRQ_CONN #define CONFIG_PERIPHERAL_CHARGER #define CONFIG_DEVICE_EVENT #define CONFIG_CTN730 +#endif #ifndef __ASSEMBLER__ diff --git a/board/coachz/ec.tasklist b/board/coachz/ec.tasklist index dc5b32b4cf..819bdb23f1 100644 --- a/board/coachz/ec.tasklist +++ b/board/coachz/ec.tasklist @@ -9,7 +9,7 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PCHG, pchg_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS_RW(PCHG, pchg_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, ULTRA_TASK_STACK_SIZE) \ diff --git a/board/coachz/gpio.inc b/board/coachz/gpio.inc index 8f5f1498a1..2971a4abbc 100644 --- a/board/coachz/gpio.inc +++ b/board/coachz/gpio.inc @@ -30,7 +30,9 @@ GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) / GPIO_INT(DEPRECATED_AP_RST_REQ, PIN(C, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Deprecated AP initiated reset indicator */ /* WLC interrupt. GPIO_PULL_DOWN ensures no IRQ when WLC chip is off. */ +#ifdef SECTION_IS_RW GPIO_INT(WLC_IRQ_CONN, PIN(7, 4), GPIO_INT_RISING | GPIO_PULL_DOWN, pchg_irq) +#endif /* * When switch-cap is off, the POWER_GOOD signal is floating. Need a pull-down |