diff options
| author | Boris Mittelberg <bmbm@google.com> | 2022-12-12 23:38:17 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-13 01:17:52 +0000 |
| commit | 88612c8c6667e4e3d0280bffc691f1cfc144ba58 (patch) | |
| tree | d97728f941d1ea78e6a4f6cf79af4ebccc17c848 | |
| parent | 352f9d4c64f414c41b7f9331d318e65daad5232c (diff) | |
| download | chrome-ec-88612c8c6667e4e3d0280bffc691f1cfc144ba58.tar.gz | |
Revert "dratini: Set TCPC_AUX_SWITCH to 0xC on Port 0 on CCD enable"
This reverts commit 515990a91e4430ff66cae9e532332a0ee33162de.
Reason for revert: Doesn't work if rddkeepalive is enabled
Original change's description:
> dratini: Set TCPC_AUX_SWITCH to 0xC on Port 0 on CCD enable
>
> When the screen brightness is changed, DP sends signal on AUX channel.
> This causes CCD mode to be disconnected.
>
> This patch sets the MUX to aux+ <-> sbu2, aux- <-> sbu1 to fix it.
>
> Same change as I3dba1bdfd44a921077a2f60dec17119bb0077238
>
> BUG=b:183123775
> BRANCH=none
> TEST=manually verify servod doesn't exit when screen brightness is changed
>
> Signed-off-by: Boris Mittelberg <bmbm@google.com>
> Change-Id: Iff91a4b4753b42ee42cd5baac36ba8243d966ce0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2785192
> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Bug: b:183123775
Change-Id: I6b72f8b0e7d5242c26721ad9024899f697a2da72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4098336
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Auto-Submit: Boris Mittelberg <bmbm@google.com>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Tested-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
| -rw-r--r-- | board/dratini/board.c | 24 | ||||
| -rw-r--r-- | board/dratini/board.h | 2 | ||||
| -rw-r--r-- | board/dratini/gpio.inc | 3 |
3 files changed, 0 insertions, 29 deletions
diff --git a/board/dratini/board.c b/board/dratini/board.c index 1f0a0ae899..4aca0c3938 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -423,26 +423,6 @@ static void board_update_sensor_config_from_sku(void) } } -static void anx7447_set_aux_switch(void) -{ - const int port = USB_PD_PORT_TCPC_0; - - /* Debounce */ - if (gpio_get_level(GPIO_CCD_MODE_ODL)) - return; - - CPRINTS("C%d: AUX_SW_SEL=0x%x", port, 0xc); - if (tcpc_write(port, ANX7447_REG_TCPC_AUX_SWITCH, 0xc)) - CPRINTS("C%d: Setting AUX_SW_SEL failed", port); -} -DECLARE_DEFERRED(anx7447_set_aux_switch); - -void ccd_mode_isr(enum gpio_signal signal) -{ - /* Wait 2 seconds until all mux setting is done by PD task */ - hook_call_deferred(&anx7447_set_aux_switch_data, 2 * SECOND); -} - static void board_init(void) { /* Initialize Fans */ @@ -457,10 +437,6 @@ static void board_init(void) /* Enable HDMI HPD interrupt. */ gpio_enable_interrupt(GPIO_HDMI_CONN_HPD); - /* Trigger once to set mux in case CCD cable is already connected. */ - ccd_mode_isr(GPIO_CCD_MODE_ODL); - gpio_enable_interrupt(GPIO_CCD_MODE_ODL); - board_update_sensor_config_from_sku(); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/dratini/board.h b/board/dratini/board.h index 9bb4347158..8cdbf0947f 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -172,8 +172,6 @@ enum battery_type { bool board_is_convertible(void); -void ccd_mode_isr(enum gpio_signal signal); - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/dratini/gpio.inc b/board/dratini/gpio.inc index b8649ca3b1..654a3ae4d0 100644 --- a/board/dratini/gpio.inc +++ b/board/dratini/gpio.inc @@ -38,9 +38,6 @@ GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 5), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C1_BC12_INT_ODL, PIN(E, 4), GPIO_INT_FALLING, bc12_interrupt) -/* CCD mode line*/ -GPIO_INT(CCD_MODE_ODL, PIN(E, 5), GPIO_INT_FALLING, ccd_mode_isr) - GPIO_INT(HDMI_CONN_HPD, PIN(7, 2), GPIO_INT_BOTH, hdmi_hpd_interrupt) /* Volume button interrupts */ |