mb/google/rex/var/karis: Disable GSPI0
According to the schematic, karis does not have a SPI touchscreen,
remove related settings.
BUG=b:294155897
TEST=emerge-rex coreboot
Change-Id: I55eb9e3cebe426fcd023789831ce64a18d075d69
Signed-off-by: Tyler Wang <tyler.wang@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77347
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jakub Czapiga <jacz@semihalf.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
diff --git a/src/mainboard/google/rex/variants/karis/gpio.c b/src/mainboard/google/rex/variants/karis/gpio.c
index cc3aeb0..e4a551d 100644
--- a/src/mainboard/google/rex/variants/karis/gpio.c
+++ b/src/mainboard/google/rex/variants/karis/gpio.c
@@ -252,16 +252,16 @@
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 37f84b2..2fee812 100644
--- a/src/mainboard/google/rex/variants/karis/overridetree.cb
+++ b/src/mainboard/google/rex/variants/karis/overridetree.cb
@@ -34,10 +34,6 @@
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 @@
}"
register "serial_io_gspi_mode" = "{
- [PchSerialIoIndexGSPI0] = PchSerialIoPci,
+ [PchSerialIoIndexGSPI0] = PchSerialIoDisabled,
[PchSerialIoIndexGSPI1] = PchSerialIoPci,
[PchSerialIoIndexGSPI2] = PchSerialIoDisabled,
}"
@@ -421,9 +417,7 @@
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 @@
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""