From 045e431ca4a5e057f4d269318d30666e35716e87 Mon Sep 17 00:00:00 2001 From: YH Lin Date: Mon, 6 Nov 2023 18:45:36 +0000 Subject: [PATCH] mb/google/rex: split TOUCHSCREEN_I2C_SPI definition As TOUCHSCREEN_I2C_SPI will be used for two different configurations, splitting it to TOUCHSCREEN_GSPI and TOUCHSCREEN_THC, and re-order the FW_CONFIG bits by moving VPU to different bit position. BUG=b:307774932 TEST=build and boot rex Signed-off-by: YH Lin Change-Id: Ied4d732ef7993e95edbb7eb281842b9392e72820 Reviewed-on: https://review.coreboot.org/c/coreboot/+/78939 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- .../google/rex/variants/rex0/overridetree.cb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb index 6c05d9ed93..781fd5914d 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -43,18 +43,19 @@ fw_config option WIFI_CNVI 0 option WIFI_PCIE 1 end - field TOUCHSCREEN 19 + field TOUCHSCREEN 19 20 option TOUCHSCREEN_I2C 0 - option TOUCHSCREEN_I2C_SPI 1 - end - field VPU 20 - option VPU_DIS 0 - option VPU_EN 1 + option TOUCHSCREEN_GSPI 1 + option TOUCHSCREEN_THC 2 end field ISH 21 option ISH_DISABLE 0 option ISH_ENABLE 1 end + field VPU 22 + option VPU_DIS 0 + option VPU_EN 1 + end end chip soc/intel/meteorlake @@ -810,7 +811,7 @@ chip soc/intel/meteorlake probe DB_SD SD_GL9755S end device ref gspi0 on - probe TOUCHSCREEN TOUCHSCREEN_I2C_SPI + probe TOUCHSCREEN TOUCHSCREEN_GSPI end device ref gspi1 on chip drivers/spi/acpi