From a98d7a9ed1e3520097307a3b6c07304507538cce Mon Sep 17 00:00:00 2001 From: Anil Kumar Date: Wed, 18 Jan 2023 11:56:36 -0800 Subject: Revert "mb/google/brya: Add EC mux device to brya0" This reverts commit 197d550d069f918698fa7cd8dda73e09fbfda30c. Reason for revert: breaks TBT and TypeC display on Brya0 Bug=265375098 Branch=firmware-brya-14505.B Test=Build and boot Skolas board with Brya0 image. Test TBT and TypeC display functionality. Change-Id: Ia0283b023949476e90edff7151d605fa36331bfd Signed-off-by: Anil Kumar Reviewed-on: https://review.coreboot.org/c/coreboot/+/72081 Reviewed-by: Prashant Malani Tested-by: build bot (Jenkins) Reviewed-by: Tarun Tuli Reviewed-by: Nick Vaccaro --- src/mainboard/google/brya/Kconfig | 1 - .../google/brya/variants/brya0/overridetree.cb | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index a7f459454a..dad98217b2 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -19,7 +19,6 @@ config BOARD_GOOGLE_BRYA_COMMON select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI - select EC_GOOGLE_CHROMEEC_MUX select EC_GOOGLE_CHROMEEC_SKUID select FW_CONFIG select FW_CONFIG_SOURCE_CHROMEEC_CBI diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb index 1291f2025d..5f5e8977eb 100644 --- a/src/mainboard/google/brya/variants/brya0/overridetree.cb +++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb @@ -804,24 +804,7 @@ chip soc/intel/alderlake use conn0 as mux_conn[0] use conn1 as mux_conn[1] use conn2 as mux_conn[2] - use ecmux0 as retimer_conn[0] - use ecmux1 as retimer_conn[1] - use ecmux2 as retimer_conn[2] - device pnp 0c09.0 on - chip ec/google/chromeec/mux - device generic 0 on - chip ec/google/chromeec/mux/conn - device generic 0 alias ecmux0 on end - end - chip ec/google/chromeec/mux/conn - device generic 1 alias ecmux1 on end - end - chip ec/google/chromeec/mux/conn - device generic 2 alias ecmux2 on end - end - end - end - end + device pnp 0c09.0 on end end end device ref pmc hidden -- cgit v1.2.3