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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80164
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/puff/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
index 78801fd..5a1002a 100644
--- a/src/mainboard/google/puff/variants/ambassador/overridetree.cb
+++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
@@ -15,9 +15,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -157,7 +157,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -167,11 +166,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb
index 9768ec3..fce8eec 100644
--- a/src/mainboard/google/puff/variants/dooly/overridetree.cb
+++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb
@@ -22,9 +22,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
diff --git a/src/mainboard/google/puff/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb
index a876be1..27768df 100644
--- a/src/mainboard/google/puff/variants/duffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb
@@ -15,9 +15,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -218,7 +218,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -228,11 +227,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb
index 6ef2472..d024043 100644
--- a/src/mainboard/google/puff/variants/faffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb
@@ -15,9 +15,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -226,7 +226,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -236,11 +235,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb
index 802ddf1..2ec3aa1 100644
--- a/src/mainboard/google/puff/variants/genesis/overridetree.cb
+++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb
@@ -8,9 +8,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -150,7 +150,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -160,11 +159,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
index 45e4bc7..3e71aa4 100644
--- a/src/mainboard/google/puff/variants/kaisa/overridetree.cb
+++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
@@ -15,9 +15,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -218,7 +218,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -228,11 +227,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
index 4fb617b..aa2377e 100644
--- a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
@@ -8,9 +8,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoPci,
@@ -150,7 +150,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -160,11 +159,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb
index d83459c..0986048 100644
--- a/src/mainboard/google/puff/variants/noibat/overridetree.cb
+++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb
@@ -13,9 +13,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -141,7 +141,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -151,11 +150,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb
index 474a2fa..349740c 100644
--- a/src/mainboard/google/puff/variants/puff/overridetree.cb
+++ b/src/mainboard/google/puff/variants/puff/overridetree.cb
@@ -9,9 +9,9 @@
[PchSerialIoIndexI2C2] = PchSerialIoPci,
[PchSerialIoIndexI2C3] = PchSerialIoPci,
[PchSerialIoIndexI2C4] = PchSerialIoPci,
- [PchSerialIoIndexI2C5] = PchSerialIoPci,
+ [PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoDisabled,
@@ -151,7 +151,6 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
#| I2C2 | PS175 |
#| I2C3 | MST |
#| I2C4 | Audio |
@@ -161,11 +160,6 @@
.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,
diff --git a/src/mainboard/google/puff/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb
index a61e41b..7729ccc 100644
--- a/src/mainboard/google/puff/variants/scout/overridetree.cb
+++ b/src/mainboard/google/puff/variants/scout/overridetree.cb
@@ -10,7 +10,7 @@
[PchSerialIoIndexI2C4] = PchSerialIoDisabled,
[PchSerialIoIndexI2C5] = PchSerialIoDisabled,
[PchSerialIoIndexSPI0] = PchSerialIoPci,
- [PchSerialIoIndexSPI1] = PchSerialIoPci,
+ [PchSerialIoIndexSPI1] = PchSerialIoDisabled,
[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
[PchSerialIoIndexUART0] = PchSerialIoSkipInit,
[PchSerialIoIndexUART1] = PchSerialIoPci,
diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
index 2c11e70..89530f3 100644
--- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb
+++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
@@ -11,9 +11,9 @@
[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 @@
#| | 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 @@
.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,