summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYH Lin <yueherngl@google.com>2023-11-06 18:45:36 +0000
committerFelix Held <felix-coreboot@felixheld.de>2023-11-08 19:28:46 +0000
commit045e431ca4a5e057f4d269318d30666e35716e87 (patch)
treea283102bce46d64c989eb3a3febb7ae43030d34e
parent17e1c895dde6ef7b1d17902fce0949600dfd6157 (diff)
downloadcoreboot-045e431ca4a5e057f4d269318d30666e35716e87.tar.gz
coreboot-045e431ca4a5e057f4d269318d30666e35716e87.tar.bz2
coreboot-045e431ca4a5e057f4d269318d30666e35716e87.zip
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 <yueherngl@google.com> Change-Id: Ied4d732ef7993e95edbb7eb281842b9392e72820 Reviewed-on: https://review.coreboot.org/c/coreboot/+/78939 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Subrata Banik <subratabanik@google.com>
-rw-r--r--src/mainboard/google/rex/variants/rex0/overridetree.cb15
1 files 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 6c05d9ed937f..781fd5914dea 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