From 8facfa84acee18b069a6a6b53491358a7ad1017e Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 21 Jan 2024 20:48:26 -0600 Subject: mb/google/puff/var/*: Clean up SerialIO/I2C config in overridetree Ensure that the SerialIoDevMode config and common_soc_config registers for each variant are programmed consistently with the devices' enabled status in that variant's overridetree; remove and disable extraneous devices as appropriate. TEST=build/boot several puff variants, verify all components working as expected, nothing missing from cbmem, lspci, etc. Change-Id: Ib9d0cf48e405be7c00c553646651fc6f28c4e3f0 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/80164 Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) --- src/mainboard/google/puff/variants/wyvern/overridetree.cb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/mainboard/google/puff/variants/wyvern/overridetree.cb') diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb index 2c11e703b0..89530f3dd9 100644 --- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb +++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb @@ -11,9 +11,9 @@ chip soc/intel/cannonlake [PchSerialIoIndexI2C2] = PchSerialIoPci, [PchSerialIoIndexI2C3] = PchSerialIoPci, [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, + [PchSerialIoIndexI2C5] = PchSerialIoDisabled, [PchSerialIoIndexSPI0] = PchSerialIoPci, - [PchSerialIoIndexSPI1] = PchSerialIoPci, + [PchSerialIoIndexSPI1] = PchSerialIoDisabled, [PchSerialIoIndexSPI2] = PchSerialIoDisabled, [PchSerialIoIndexUART0] = PchSerialIoSkipInit, [PchSerialIoIndexUART1] = PchSerialIoDisabled, @@ -152,7 +152,6 @@ chip soc/intel/cannonlake #| | required to set up a BAR | #| | for TPM communication | #| | before memory is up | - #| I2C0 | RFU | #| I2C2 | PS175 | #| I2C3 | MST | #| I2C4 | Audio | @@ -162,11 +161,6 @@ chip soc/intel/cannonlake .speed_mhz = 1, .early_init = 1, }, - .i2c[0] = { - .speed = I2C_SPEED_FAST, - .rise_time_ns = 0, - .fall_time_ns = 0, - }, .i2c[2] = { .speed = I2C_SPEED_FAST, .rise_time_ns = 60, -- cgit v1.2.3