diff --git a/src/mainboard/google/rex/variants/karis/gpio.c b/src/mainboard/google/rex/variants/karis/gpio.c index cc3aeb000e..e4a551dfb5 100644 --- a/src/mainboard/google/rex/variants/karis/gpio.c +++ b/src/mainboard/google/rex/variants/karis/gpio.c @@ -252,16 +252,16 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_F12, NONE, DEEP, NF5), /* GPP_F13 : GSPI1_SOC_DI_FPMCU_DO_LS_R */ PAD_CFG_NF(GPP_F13, NONE, DEEP, NF5), - /* GPP_F14 : GSPI0_SOC_DO_TCHSCR_DI */ - PAD_CFG_NF(GPP_F14, NONE, DEEP, NF8), - /* GPP_F15 : [] ==> GSPI0_SOC_DI_TCHSCR_DO */ - PAD_CFG_NF(GPP_F15, NONE, DEEP, NF8), - /* GPP_F16 : [] ==> GSPI0_SOC_TCHSCR_CLK */ - PAD_CFG_NF(GPP_F16, NONE, DEEP, NF8), + /* GPP_F14 : net NC. */ + PAD_NC(GPP_F19, NONE), + /* GPP_F15 : net NC. */ + PAD_NC(GPP_F19, NONE), + /* GPP_F16 : net NC. */ + PAD_NC(GPP_F19, NONE), /* GPP_F17 : [] ==> GSPI1_SOC_CS_L */ PAD_CFG_NF(GPP_F17, NONE, DEEP, NF5), - /* GPP_F18 : [] ==> GSPI0_SOC_TCHSCR_CS_L */ - PAD_CFG_NF(GPP_F18, NONE, DEEP, NF8), + /* GPP_F18 : net NC. */ + PAD_NC(GPP_F18, NONE), /* GPP_F19 : [] ==> GPP_F19_STRAP */ PAD_NC(GPP_F19, NONE), /* GPP_F20 : [] ==> GPP_F20_STRAP */ diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index 37f84b2fc6..2fee812ff9 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -34,10 +34,6 @@ fw_config option WIFI_CNVI 0 option WIFI_PCIE 1 end - field TOUCHSCREEN 19 - option TOUCHSCREEN_I2C 0 - option TOUCHSCREEN_I2C_SPI 1 - end field VPU 20 option VPU_DIS 0 option VPU_EN 1 @@ -73,7 +69,7 @@ chip soc/intel/meteorlake }" register "serial_io_gspi_mode" = "{ - [PchSerialIoIndexGSPI0] = PchSerialIoPci, + [PchSerialIoIndexGSPI0] = PchSerialIoDisabled, [PchSerialIoIndexGSPI1] = PchSerialIoPci, [PchSerialIoIndexGSPI2] = PchSerialIoDisabled, }" @@ -421,9 +417,7 @@ chip soc/intel/meteorlake register "generic.stop_off_delay_ms" = "2" register "generic.has_power_resource" = "1" register "hid_desc_reg_offset" = "0x01" - device i2c 10 on - probe TOUCHSCREEN TOUCHSCREEN_I2C - end + device i2c 10 on end end chip drivers/generic/gpio_keys register "name" = ""PENH"" @@ -582,9 +576,6 @@ chip soc/intel/meteorlake end end end #PCIE6 WWAN card - device ref gspi0 on - probe TOUCHSCREEN TOUCHSCREEN_I2C_SPI - end device ref gspi1 on chip drivers/spi/acpi register "name" = ""CRFP""