From e1e79dc53b29f779258d033cec6d457df0d67990 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 25 Jan 2026 17:50:20 -0600 Subject: [PATCH] mb/google/dedede: Rework I2C enablement In order to keep coreboot and FSP in sync for which i2c ports are enabled, disable all I2C ports in the baseboard, in both the PCI devices and the SerialIoI2cMode register. Each variant enables only the ports it uses by overriding the SerialIoI2cMode register index for those ports, and enabling the PCI device(s) and defining the attached devices. References to i2c ports which were off/disabled are removed from all variants, as they are redundant. TEST=build google/dedede (dexi), verify SerialIoI2cMode in static.c enables only the single port used (i2c4) Change-Id: I7fcab382cc0eaf4fb0bc9d8095587018b4e226b1 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90897 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- .../dedede/variants/awasuki/overridetree.cb | 13 +++--------- .../dedede/variants/baseboard/devicetree.cb | 20 +++++++++---------- .../dedede/variants/beadrix/overridetree.cb | 12 ++++------- .../dedede/variants/blipper/overridetree.cb | 13 +++--------- .../dedede/variants/boten/overridetree.cb | 14 +++++-------- .../dedede/variants/boxy/overridetree.cb | 6 ++---- .../dedede/variants/bugzzy/overridetree.cb | 7 +++++++ .../dedede/variants/cappy2/overridetree.cb | 6 ++++++ .../dedede/variants/corori/overridetree.cb | 12 +---------- .../dedede/variants/cret/overridetree.cb | 13 +++--------- .../dedede/variants/dexi/overridetree.cb | 6 ++---- .../dedede/variants/dibbi/overridetree.cb | 6 ++---- .../dedede/variants/dita/overridetree.cb | 6 ++---- .../dedede/variants/drawcia/overridetree.cb | 6 ++++++ .../dedede/variants/driblee/overridetree.cb | 13 ++---------- .../dedede/variants/galtic/overridetree.cb | 10 +++------- .../dedede/variants/gooey/overridetree.cb | 14 +++++-------- .../dedede/variants/haboki/overridetree.cb | 6 ++++++ .../dedede/variants/kracko/overridetree.cb | 14 +++++-------- .../dedede/variants/lalala/overridetree.cb | 6 ++++++ .../dedede/variants/lantis/overridetree.cb | 13 +++--------- .../dedede/variants/madoo/overridetree.cb | 13 +++--------- .../dedede/variants/magolor/overridetree.cb | 6 ++++++ .../variants/metaknight/overridetree.cb | 13 ++++-------- .../dedede/variants/pirika/overridetree.cb | 10 +++------- .../dedede/variants/sasuke/overridetree.cb | 7 +++++++ .../dedede/variants/sasukette/overridetree.cb | 6 ++++++ .../dedede/variants/shotzo/overridetree.cb | 6 ++++-- .../dedede/variants/storo/overridetree.cb | 13 +++++------- .../dedede/variants/taranza/overridetree.cb | 6 ++---- .../dedede/variants/waddledee/overridetree.cb | 6 ++++++ .../dedede/variants/waddledoo/overridetree.cb | 7 +++++++ 32 files changed, 139 insertions(+), 170 deletions(-) diff --git a/src/mainboard/google/dedede/variants/awasuki/overridetree.cb b/src/mainboard/google/dedede/variants/awasuki/overridetree.cb index 76b7033f54..f791468b2b 100644 --- a/src/mainboard/google/dedede/variants/awasuki/overridetree.cb +++ b/src/mainboard/google/dedede/variants/awasuki/overridetree.cb @@ -53,14 +53,9 @@ chip soc/intel/jasperlake }" # SerialIO device mode selection - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ @@ -191,7 +186,6 @@ chip soc/intel/jasperlake device i2c 15 on end end end # I2C 0 - device pci 15.1 off end # I2C 1 device pci 15.2 on probe TOUCHSCREEN TOUCHSCREEN_PRESENT chip drivers/i2c/generic @@ -213,7 +207,6 @@ chip soc/intel/jasperlake device i2c 10 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/rt5645 register "hid" = ""10EC5650"" diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index 94e0bae07c..2ce85b2813 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -80,11 +80,11 @@ chip soc/intel/jasperlake register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/1 Type-A Port A1 register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoPci, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoPci, - [PchSerialIoIndexI2C4] = PchSerialIoPci, + [PchSerialIoIndexI2C0] = PchSerialIoDisabled, + [PchSerialIoIndexI2C1] = PchSerialIoDisabled, + [PchSerialIoIndexI2C2] = PchSerialIoDisabled, + [PchSerialIoIndexI2C3] = PchSerialIoDisabled, + [PchSerialIoIndexI2C4] = PchSerialIoDisabled, [PchSerialIoIndexI2C5] = PchSerialIoDisabled, }" @@ -368,16 +368,16 @@ chip soc/intel/jasperlake end end # CNVi wifi device pci 14.5 on end # SDCard - device pci 15.0 on end # I2C 0 - device pci 15.1 on end # I2C 1 - device pci 15.2 on end # I2C 2 - device pci 15.3 on end # I2C 3 + device pci 15.0 off end # I2C 0 + device pci 15.1 off end # I2C 1 + device pci 15.2 off end # I2C 2 + device pci 15.3 off end # I2C 3 device pci 16.0 on end # HECI 1 device pci 16.1 off end # HECI 2 device pci 16.4 off end # HECI 3 device pci 16.5 off end # HECI 4 device pci 17.0 off end # SATA - device pci 19.0 on end # I2C 4 + device pci 19.0 off end # I2C 4 device pci 19.1 off end # I2C 5 device pci 19.2 on end # UART 2 device pci 1a.0 on end # eMMC diff --git a/src/mainboard/google/dedede/variants/beadrix/overridetree.cb b/src/mainboard/google/dedede/variants/beadrix/overridetree.cb index c4e550c172..cba95da235 100644 --- a/src/mainboard/google/dedede/variants/beadrix/overridetree.cb +++ b/src/mainboard/google/dedede/variants/beadrix/overridetree.cb @@ -54,14 +54,10 @@ chip soc/intel/jasperlake }, }" - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" device domain 0 on device pci 04.0 on diff --git a/src/mainboard/google/dedede/variants/blipper/overridetree.cb b/src/mainboard/google/dedede/variants/blipper/overridetree.cb index 4b42f0e3aa..db0bdc2049 100644 --- a/src/mainboard/google/dedede/variants/blipper/overridetree.cb +++ b/src/mainboard/google/dedede/variants/blipper/overridetree.cb @@ -50,14 +50,9 @@ chip soc/intel/jasperlake register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # UF Camera register "usb2_ports[6]" = "USB2_PORT_EMPTY" # Not Used - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" register "tcc_offset" = "10" # TCC of 95C @@ -126,7 +121,6 @@ chip soc/intel/jasperlake device i2c 0x2c on end end end # I2C 0 - device pci 15.1 off end # I2C 1 device pci 15.2 on chip drivers/i2c/hid register "generic.hid" = ""GTCH7503"" @@ -164,7 +158,6 @@ chip soc/intel/jasperlake device i2c 10 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/boten/overridetree.cb b/src/mainboard/google/dedede/variants/boten/overridetree.cb index 3e0e7b32fc..56b2d935bc 100644 --- a/src/mainboard/google/dedede/variants/boten/overridetree.cb +++ b/src/mainboard/google/dedede/variants/boten/overridetree.cb @@ -73,14 +73,11 @@ chip soc/intel/jasperlake register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # UF Camera register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # WF Camera - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoPci, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" # Enable Acoustic noise mitigation and set slew rate to 1/8 # Rest of the parameters are 0 by default. @@ -258,7 +255,6 @@ chip soc/intel/jasperlake device i2c 10 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/boxy/overridetree.cb b/src/mainboard/google/dedede/variants/boxy/overridetree.cb index 36eadcbd1f..11c7ae399e 100644 --- a/src/mainboard/google/dedede/variants/boxy/overridetree.cb +++ b/src/mainboard/google/dedede/variants/boxy/overridetree.cb @@ -33,6 +33,8 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 6, @@ -192,10 +194,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb b/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb index 6c399f8768..a1303d7a4f 100644 --- a/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb +++ b/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb @@ -86,6 +86,13 @@ chip soc/intel/jasperlake .fall_time_ns = 8, }, }" + + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + device domain 0 on device pci 04.0 on chip drivers/intel/dptf diff --git a/src/mainboard/google/dedede/variants/cappy2/overridetree.cb b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb index e4e39f331d..2b361a3d93 100644 --- a/src/mainboard/google/dedede/variants/cappy2/overridetree.cb +++ b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb @@ -41,6 +41,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "disable_external_bypass_vr" = "1" # Does not support external vnn power rail register "tcc_offset" = "10" # TCC of 95C diff --git a/src/mainboard/google/dedede/variants/corori/overridetree.cb b/src/mainboard/google/dedede/variants/corori/overridetree.cb index ed4a0976a1..59afb06e93 100644 --- a/src/mainboard/google/dedede/variants/corori/overridetree.cb +++ b/src/mainboard/google/dedede/variants/corori/overridetree.cb @@ -17,14 +17,7 @@ chip soc/intel/jasperlake register "usb3_ports[1]" = "USB3_PORT_EMPTY" # None register "usb3_ports[3]" = "USB3_PORT_EMPTY" # None - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoDisabled, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -120,9 +113,6 @@ chip soc/intel/jasperlake device i2c 15 on end end end #I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/cret/overridetree.cb b/src/mainboard/google/dedede/variants/cret/overridetree.cb index 1c834f411d..f1a00ffb20 100644 --- a/src/mainboard/google/dedede/variants/cret/overridetree.cb +++ b/src/mainboard/google/dedede/variants/cret/overridetree.cb @@ -18,14 +18,9 @@ chip soc/intel/jasperlake register "usb3_ports[1]" = "USB3_PORT_EMPTY" # None register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # LTE - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -155,7 +150,6 @@ chip soc/intel/jasperlake device i2c 2c on end end end #I2C 0 - device pci 15.1 off end # I2C 1 device pci 15.2 on chip drivers/i2c/hid register "generic.hid" = ""WDHT0002"" @@ -246,7 +240,6 @@ chip soc/intel/jasperlake device i2c 40 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 1c.7 on end device pci 19.0 on chip drivers/i2c/da7219 diff --git a/src/mainboard/google/dedede/variants/dexi/overridetree.cb b/src/mainboard/google/dedede/variants/dexi/overridetree.cb index f53a11a89e..38a2d520a8 100644 --- a/src/mainboard/google/dedede/variants/dexi/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dexi/overridetree.cb @@ -25,6 +25,8 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 6, @@ -261,10 +263,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" diff --git a/src/mainboard/google/dedede/variants/dibbi/overridetree.cb b/src/mainboard/google/dedede/variants/dibbi/overridetree.cb index c7d6afb495..eb05d24c94 100644 --- a/src/mainboard/google/dedede/variants/dibbi/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dibbi/overridetree.cb @@ -25,6 +25,8 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 6, @@ -228,10 +230,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" diff --git a/src/mainboard/google/dedede/variants/dita/overridetree.cb b/src/mainboard/google/dedede/variants/dita/overridetree.cb index f53a11a89e..38a2d520a8 100644 --- a/src/mainboard/google/dedede/variants/dita/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dita/overridetree.cb @@ -25,6 +25,8 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 6, @@ -261,10 +263,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" diff --git a/src/mainboard/google/dedede/variants/drawcia/overridetree.cb b/src/mainboard/google/dedede/variants/drawcia/overridetree.cb index c84f9487fe..3ba688fb67 100644 --- a/src/mainboard/google/dedede/variants/drawcia/overridetree.cb +++ b/src/mainboard/google/dedede/variants/drawcia/overridetree.cb @@ -67,6 +67,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "tcc_offset" = "20" # TCC of 85C # Enable Acoustic noise mitigation and set slew rate to 1/4 diff --git a/src/mainboard/google/dedede/variants/driblee/overridetree.cb b/src/mainboard/google/dedede/variants/driblee/overridetree.cb index 3c9c92c98e..a703ada882 100644 --- a/src/mainboard/google/dedede/variants/driblee/overridetree.cb +++ b/src/mainboard/google/dedede/variants/driblee/overridetree.cb @@ -9,14 +9,8 @@ chip soc/intel/jasperlake register "usb3_ports[1]" = "USB3_PORT_EMPTY" # None register "usb3_ports[3]" = "USB3_PORT_EMPTY" # None - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoDisabled, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -119,9 +113,6 @@ chip soc/intel/jasperlake device i2c 2c on end end end #I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/cs42l42 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" diff --git a/src/mainboard/google/dedede/variants/galtic/overridetree.cb b/src/mainboard/google/dedede/variants/galtic/overridetree.cb index 0ef9cdb5da..3a5597c3f4 100644 --- a/src/mainboard/google/dedede/variants/galtic/overridetree.cb +++ b/src/mainboard/google/dedede/variants/galtic/overridetree.cb @@ -59,13 +59,9 @@ chip soc/intel/jasperlake }, }" - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # USB Port Configuration register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Camera diff --git a/src/mainboard/google/dedede/variants/gooey/overridetree.cb b/src/mainboard/google/dedede/variants/gooey/overridetree.cb index 728ab919e1..d7e9d47241 100644 --- a/src/mainboard/google/dedede/variants/gooey/overridetree.cb +++ b/src/mainboard/google/dedede/variants/gooey/overridetree.cb @@ -49,14 +49,11 @@ chip soc/intel/jasperlake register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # UF Camera register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # WF Camera - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoPci, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" register "SerialIoGSpiMode[PchSerialIoIndexGSPI0]" = "PchSerialIoDisabled" # Disable GSPI0 register "SerialIoGSpiCsMode[PchSerialIoIndexGSPI0]" = "0" @@ -237,7 +234,6 @@ chip soc/intel/jasperlake device i2c 10 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/haboki/overridetree.cb b/src/mainboard/google/dedede/variants/haboki/overridetree.cb index 92b3bb2c48..030b143204 100644 --- a/src/mainboard/google/dedede/variants/haboki/overridetree.cb +++ b/src/mainboard/google/dedede/variants/haboki/overridetree.cb @@ -35,6 +35,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "tcc_offset" = "20" # TCC of 85C register "SerialIoGSpiMode[PchSerialIoIndexGSPI0]" = "PchSerialIoDisabled" # Disable GSPI0 diff --git a/src/mainboard/google/dedede/variants/kracko/overridetree.cb b/src/mainboard/google/dedede/variants/kracko/overridetree.cb index e4d9ad966e..388850570b 100644 --- a/src/mainboard/google/dedede/variants/kracko/overridetree.cb +++ b/src/mainboard/google/dedede/variants/kracko/overridetree.cb @@ -11,14 +11,11 @@ chip soc/intel/jasperlake register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Camera register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # WF Camera - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoPci, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -244,7 +241,6 @@ chip soc/intel/jasperlake end end # I2C 2 - device pci 15.3 off end #I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/lalala/overridetree.cb b/src/mainboard/google/dedede/variants/lalala/overridetree.cb index 9609011a0c..90620d6c7d 100644 --- a/src/mainboard/google/dedede/variants/lalala/overridetree.cb +++ b/src/mainboard/google/dedede/variants/lalala/overridetree.cb @@ -56,6 +56,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 7, diff --git a/src/mainboard/google/dedede/variants/lantis/overridetree.cb b/src/mainboard/google/dedede/variants/lantis/overridetree.cb index 5f6ed2368b..c21ccf2643 100644 --- a/src/mainboard/google/dedede/variants/lantis/overridetree.cb +++ b/src/mainboard/google/dedede/variants/lantis/overridetree.cb @@ -15,14 +15,9 @@ chip soc/intel/jasperlake # USB Port Configuration register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -180,7 +175,6 @@ chip soc/intel/jasperlake device i2c 15 on end end end #I2C 0 - device pci 15.1 off end #I2C 1 device pci 15.2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" @@ -240,7 +234,6 @@ chip soc/intel/jasperlake device i2c 0x5d on end end end # I2C 2 - device pci 15.3 off end #I2C 3 device pci 1c.7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" diff --git a/src/mainboard/google/dedede/variants/madoo/overridetree.cb b/src/mainboard/google/dedede/variants/madoo/overridetree.cb index 437c60a5cd..c69b482ef0 100644 --- a/src/mainboard/google/dedede/variants/madoo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/madoo/overridetree.cb @@ -3,14 +3,9 @@ chip soc/intel/jasperlake # USB Port Configuration register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Intel Common SoC Config #+-------------------+---------------------------+ @@ -114,7 +109,6 @@ chip soc/intel/jasperlake device i2c 15 on end end end #I2C 0 - device pci 15.1 off end # I2C 1 device pci 15.2 on chip drivers/i2c/hid register "generic.hid" = ""GDIX0000"" @@ -132,7 +126,6 @@ chip soc/intel/jasperlake device i2c 0x5d on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 1c.7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" diff --git a/src/mainboard/google/dedede/variants/magolor/overridetree.cb b/src/mainboard/google/dedede/variants/magolor/overridetree.cb index a09adeeff2..c32429dc24 100644 --- a/src/mainboard/google/dedede/variants/magolor/overridetree.cb +++ b/src/mainboard/google/dedede/variants/magolor/overridetree.cb @@ -95,6 +95,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 7, diff --git a/src/mainboard/google/dedede/variants/metaknight/overridetree.cb b/src/mainboard/google/dedede/variants/metaknight/overridetree.cb index d50fb7c59d..c116cccdae 100644 --- a/src/mainboard/google/dedede/variants/metaknight/overridetree.cb +++ b/src/mainboard/google/dedede/variants/metaknight/overridetree.cb @@ -62,14 +62,10 @@ chip soc/intel/jasperlake }, }" - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoPci, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoDisabled, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ @@ -243,7 +239,6 @@ chip soc/intel/jasperlake device i2c 15 on end end end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""10EC5682"" diff --git a/src/mainboard/google/dedede/variants/pirika/overridetree.cb b/src/mainboard/google/dedede/variants/pirika/overridetree.cb index cf1f95e722..d413e060e0 100644 --- a/src/mainboard/google/dedede/variants/pirika/overridetree.cb +++ b/src/mainboard/google/dedede/variants/pirika/overridetree.cb @@ -46,13 +46,9 @@ chip soc/intel/jasperlake }, }" - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoDisabled, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" # USB Port Configuration register "usb2_ports[0]" = "{ diff --git a/src/mainboard/google/dedede/variants/sasuke/overridetree.cb b/src/mainboard/google/dedede/variants/sasuke/overridetree.cb index 0da00caef2..6f72562fe9 100644 --- a/src/mainboard/google/dedede/variants/sasuke/overridetree.cb +++ b/src/mainboard/google/dedede/variants/sasuke/overridetree.cb @@ -77,6 +77,13 @@ chip soc/intel/jasperlake .fall_time_ns = 8, }, }" + + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + device domain 0 on device pci 04.0 on chip drivers/intel/dptf diff --git a/src/mainboard/google/dedede/variants/sasukette/overridetree.cb b/src/mainboard/google/dedede/variants/sasukette/overridetree.cb index ba262b6282..aa61b8e11d 100644 --- a/src/mainboard/google/dedede/variants/sasukette/overridetree.cb +++ b/src/mainboard/google/dedede/variants/sasukette/overridetree.cb @@ -59,6 +59,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # USB Port Configuration register "usb2_ports[2]" = "{ .enable = 1, diff --git a/src/mainboard/google/dedede/variants/shotzo/overridetree.cb b/src/mainboard/google/dedede/variants/shotzo/overridetree.cb index 0935457092..7a821d7f8f 100644 --- a/src/mainboard/google/dedede/variants/shotzo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/shotzo/overridetree.cb @@ -38,6 +38,10 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "disable_external_bypass_vr" = "1" # Does not support external vnn power rail # Power limit config @@ -183,7 +187,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 device pci 15.2 on chip drivers/i2c/hid register "generic.hid" = ""ILTK0001"" @@ -200,7 +203,6 @@ chip soc/intel/jasperlake device i2c 41 on end end end # I2C 2 - device pci 15.3 off end #I2C 3 device pci 1c.7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" diff --git a/src/mainboard/google/dedede/variants/storo/overridetree.cb b/src/mainboard/google/dedede/variants/storo/overridetree.cb index c22c796f68..f893829dc0 100644 --- a/src/mainboard/google/dedede/variants/storo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/storo/overridetree.cb @@ -73,14 +73,11 @@ chip soc/intel/jasperlake .pre_emp_bit = USB2_HALF_BIT_PRE_EMP, }" # WWAN - register "SerialIoI2cMode" = "{ - [PchSerialIoIndexI2C0] = PchSerialIoPci, - [PchSerialIoIndexI2C1] = PchSerialIoDisabled, - [PchSerialIoIndexI2C2] = PchSerialIoPci, - [PchSerialIoIndexI2C3] = PchSerialIoPci, - [PchSerialIoIndexI2C4] = PchSerialIoPci, - [PchSerialIoIndexI2C5] = PchSerialIoPci, - }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ diff --git a/src/mainboard/google/dedede/variants/taranza/overridetree.cb b/src/mainboard/google/dedede/variants/taranza/overridetree.cb index f53a11a89e..38a2d520a8 100644 --- a/src/mainboard/google/dedede/variants/taranza/overridetree.cb +++ b/src/mainboard/google/dedede/variants/taranza/overridetree.cb @@ -25,6 +25,8 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + # Power limit config register "power_limits_config[JSL_N4500_6W_CORE]" = "{ .tdp_pl1_override = 6, @@ -261,10 +263,6 @@ chip soc/intel/jasperlake end end end # USB xHCI - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 device pci 19.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" diff --git a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb index c177a8b32e..4fdddd18cc 100644 --- a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb +++ b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb @@ -54,6 +54,12 @@ chip soc/intel/jasperlake }, }" + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + device domain 0 on device pci 05.0 on end # IPU - MIPI Camera device pci 14.0 on diff --git a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb index 321b05eda5..8a1d5556c1 100644 --- a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb @@ -49,6 +49,13 @@ chip soc/intel/jasperlake } }, }" + + register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C3]" = "PchSerialIoPci" + register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" + device domain 0 on device pci 05.0 on # IPU - MIPI Camera chip drivers/intel/mipi_camera