From aac51beaac76af91138c074426bdebaaa60efb60 Mon Sep 17 00:00:00 2001 From: Sue Chen Date: Mon, 6 Dec 2021 08:44:50 +0800 Subject: Dewatt: Fix board fw config The C1 mux only use PS8818. All skus are convertible now. BUG=b:208167982, b:204347734 BRANCH=none TEST=Can initialize successfully C1 MUX PS8818 and motion sensors with empty fw_config. Signed-off-by: Sue Chen Change-Id: I44dc387c50e0cb2c7f7dc4f99ff0fb8841143d52 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3315763 Reviewed-by: Rob Barnes --- board/dewatt/board_fw_config.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/board/dewatt/board_fw_config.c b/board/dewatt/board_fw_config.c index c919d82851..ad4a880631 100644 --- a/board/dewatt/board_fw_config.c +++ b/board/dewatt/board_fw_config.c @@ -8,9 +8,7 @@ bool board_is_convertible(void) { - return (get_fw_config_field(FW_CONFIG_FORM_FACTOR_OFFSET, - FW_CONFIG_FORM_FACTOR_WIDTH) - == FW_CONFIG_FORM_FACTOR_CONVERTIBLE); + return 1; } bool board_has_kblight(void) @@ -21,22 +19,10 @@ bool board_has_kblight(void) enum board_usb_c1_mux board_get_usb_c1_mux(void) { - int usb_db = get_fw_config_field(FW_CONFIG_USB_DB_OFFSET, - FW_CONFIG_USB_DB_WIDTH); - if (usb_db == FW_CONFIG_USB_DB_A1_PS8811_C1_PS8818) - return USB_C1_MUX_PS8818; - if (usb_db == FW_CONFIG_USB_DB_A1_ANX7491_C1_ANX7451) - return USB_C1_MUX_ANX7451; - return USB_C1_MUX_UNKNOWN; + return USB_C1_MUX_PS8818; }; enum board_usb_a1_retimer board_get_usb_a1_retimer(void) { - int usb_db = get_fw_config_field(FW_CONFIG_USB_DB_OFFSET, - FW_CONFIG_USB_DB_WIDTH); - if (usb_db == FW_CONFIG_USB_DB_A1_PS8811_C1_PS8818) - return USB_A1_RETIMER_PS8811; - if (usb_db == FW_CONFIG_USB_DB_A1_ANX7491_C1_ANX7451) - return USB_A1_RETIMER_ANX7491; - return USB_A1_RETIMER_UNKNOWN; + return USB_A1_RETIMER_PS8811; }; -- cgit v1.2.1