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>
This commit is contained in:
YH Lin 2023-11-06 18:45:36 +00:00 committed by Felix Held
parent 17e1c895dd
commit 045e431ca4
1 changed files with 8 additions and 7 deletions

View File

@ -43,18 +43,19 @@ fw_config
option WIFI_CNVI 0 option WIFI_CNVI 0
option WIFI_PCIE 1 option WIFI_PCIE 1
end end
field TOUCHSCREEN 19 field TOUCHSCREEN 19 20
option TOUCHSCREEN_I2C 0 option TOUCHSCREEN_I2C 0
option TOUCHSCREEN_I2C_SPI 1 option TOUCHSCREEN_GSPI 1
end option TOUCHSCREEN_THC 2
field VPU 20
option VPU_DIS 0
option VPU_EN 1
end end
field ISH 21 field ISH 21
option ISH_DISABLE 0 option ISH_DISABLE 0
option ISH_ENABLE 1 option ISH_ENABLE 1
end end
field VPU 22
option VPU_DIS 0
option VPU_EN 1
end
end end
chip soc/intel/meteorlake chip soc/intel/meteorlake
@ -810,7 +811,7 @@ chip soc/intel/meteorlake
probe DB_SD SD_GL9755S probe DB_SD SD_GL9755S
end end
device ref gspi0 on device ref gspi0 on
probe TOUCHSCREEN TOUCHSCREEN_I2C_SPI probe TOUCHSCREEN TOUCHSCREEN_GSPI
end end
device ref gspi1 on device ref gspi1 on
chip drivers/spi/acpi chip drivers/spi/acpi