From 097b9dd8e3de4481c7b2ff19658bcd48cbc4a8b5 Mon Sep 17 00:00:00 2001 From: Zanxi Chen Date: Mon, 30 May 2022 17:08:26 +0800 Subject: [PATCH] mb/google/corsola: Enable ps8640 for steelix Currently, the display does not work in steelix. Steelix uses ps8640 eDP bridge IC, which is different from its reference board kingler. So we should enable ps8640 for steelix. BUG=b:232195941 TEST=firmware bootsplash is shown on eDP panel of steelix. Change-Id: I8c6310794c89fc8aa0e69e114c1f7ebd5479c549 Signed-off-by: Zanxi Chen Reviewed-on: https://review.coreboot.org/c/coreboot/+/64790 Tested-by: build bot (Jenkins) Reviewed-by: wen zhang Reviewed-by: Yu-Ping Wu --- src/mainboard/google/corsola/Kconfig | 4 ++-- src/mainboard/google/corsola/display.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig index 194166c9b6..aa57c9b806 100644 --- a/src/mainboard/google/corsola/Kconfig +++ b/src/mainboard/google/corsola/Kconfig @@ -38,8 +38,8 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_TPM2 if VBOOT select MAINBOARD_HAS_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER - select DRIVER_ANALOGIX_ANX7625 - select DRIVER_PARADE_PS8640 + select DRIVER_ANALOGIX_ANX7625 if BOARD_GOOGLE_KINGLER + select DRIVER_PARADE_PS8640 if BOARD_GOOGLE_KRABBY || BOARD_GOOGLE_STEELIX select RTC config MAINBOARD_DIR diff --git a/src/mainboard/google/corsola/display.c b/src/mainboard/google/corsola/display.c index 48ab58e324..2af9fe09b2 100644 --- a/src/mainboard/google/corsola/display.c +++ b/src/mainboard/google/corsola/display.c @@ -122,8 +122,8 @@ static const struct edp_bridge ps8640_bridge = { .post_power_on = bridge_ps8640_post_power_on, }; -_Static_assert(CONFIG(BOARD_GOOGLE_KINGLER_COMMON) + CONFIG(BOARD_GOOGLE_KRABBY_COMMON) == 1, - "Exactly one of KINGLER and KRABBY must be set"); +_Static_assert(CONFIG(DRIVER_ANALOGIX_ANX7625) + CONFIG(DRIVER_PARADE_PS8640) == 1, + "Exactly one of ANX7625 and PS8640 must be set"); int configure_display(void) { @@ -131,9 +131,9 @@ int configure_display(void) const u8 i2c_bus = I2C0; const struct edp_bridge *bridge; - if (CONFIG(BOARD_GOOGLE_KINGLER_COMMON)) + if (CONFIG(DRIVER_ANALOGIX_ANX7625)) bridge = &anx7625_bridge; - else /* BOARD_GOOGLE_KRABBY_COMMON */ + else if (CONFIG(DRIVER_PARADE_PS8640)) bridge = &ps8640_bridge; printk(BIOS_INFO, "%s: Starting display init\n", __func__);