From 3f4c830bf64ac8a0761729f831d51f0a1d6c89f4 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 21 Jan 2024 20:39:03 -0600 Subject: mb/google/puff/var/*: Drop redundant device entries in overridetree Now that the puff baseboard uses chipset devicetree references, remove all references whose value is identical to the chipset devicetree default or the baseboard default, since they are pointless clutter. TEST=tested with rest of patch train Change-Id: Iada32111367fdc964d6126ee43e261c1feb123cf Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/80163 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- .../puff/variants/ambassador/overridetree.cb | 22 ++++----- .../google/puff/variants/dooly/overridetree.cb | 53 ++++++++++------------ .../google/puff/variants/duffy/overridetree.cb | 22 ++++----- .../google/puff/variants/faffy/overridetree.cb | 22 ++++----- .../google/puff/variants/genesis/overridetree.cb | 38 +++++++--------- .../google/puff/variants/kaisa/overridetree.cb | 22 ++++----- .../google/puff/variants/moonbuggy/overridetree.cb | 41 +++++++---------- .../google/puff/variants/noibat/overridetree.cb | 22 ++++----- .../google/puff/variants/puff/overridetree.cb | 22 ++++----- .../google/puff/variants/scout/overridetree.cb | 38 ++++++---------- .../google/puff/variants/wyvern/overridetree.cb | 22 ++++----- 11 files changed, 128 insertions(+), 196 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/puff/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb index 80bcb686c4..78801fdf4e 100644 --- a/src/mainboard/google/puff/variants/ambassador/overridetree.cb +++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb @@ -208,7 +208,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -273,7 +273,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -354,11 +354,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -367,7 +363,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -376,8 +372,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -391,8 +386,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -403,11 +398,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb index 8c3d473c50..9768ec3c0b 100644 --- a/src/mainboard/google/puff/variants/dooly/overridetree.cb +++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb @@ -185,7 +185,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -239,7 +239,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -261,8 +261,8 @@ chip soc/intel/cannonlake device usb 2.2 on end end chip drivers/usb/acpi - device usb 2.3 off end - end + device usb 2.3 off end + end chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port 1"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" @@ -270,8 +270,8 @@ chip soc/intel/cannonlake device usb 2.4 on end end chip drivers/usb/acpi - register "desc" = ""Camera"" - register "type" = "UPC_TYPE_INTERNAL" + register "desc" = ""Camera"" + register "type" = "UPC_TYPE_INTERNAL" device usb 2.5 on end end chip drivers/usb/acpi @@ -310,25 +310,24 @@ chip soc/intel/cannonlake end end end - device ref sdxc off end - device ref i2c0 on + device ref sdxc off end + device ref i2c0 on # ALC1015 chip drivers/i2c/generic - register "hid" = ""10EC1015"" - register "desc" = ""Realtek SPK AMP L"" - register "uid" = "0" - device i2c 28 on end - end - chip drivers/i2c/generic - register "hid" = ""10EC1015"" - register "desc" = ""Realtek SPK AMP R"" - register "uid" = "1" - device i2c 29 on end - end + register "hid" = ""10EC1015"" + register "desc" = ""Realtek SPK AMP L"" + register "uid" = "0" + device i2c 28 on end + end + chip drivers/i2c/generic + register "hid" = ""10EC1015"" + register "desc" = ""Realtek SPK AMP R"" + register "uid" = "1" + device i2c 29 on end + end end - device ref i2c1 off end - device ref i2c2 on end # LVDS - device ref i2c3 on + device ref i2c2 on end # LVDS + device ref i2c3 on # Touchscreen chip drivers/i2c/hid register "generic.hid" = ""WDHT2002"" @@ -343,8 +342,7 @@ chip soc/intel/cannonlake device i2c 2c on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -385,13 +383,12 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref emmc on end - device ref pcie_rp11 on + device ref emmc on end + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end - device ref hda on + device ref hda on chip drivers/sof register "spkr_tplg" = "rt1015" register "jack_tplg" = "rt5682" diff --git a/src/mainboard/google/puff/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb index 97a9af2938..a876be1ecc 100644 --- a/src/mainboard/google/puff/variants/duffy/overridetree.cb +++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb @@ -269,7 +269,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -332,7 +332,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -413,11 +413,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -426,7 +422,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -435,8 +431,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -450,8 +445,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -462,11 +457,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb index d8b8001978..6ef247273d 100644 --- a/src/mainboard/google/puff/variants/faffy/overridetree.cb +++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb @@ -277,7 +277,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive[0]" = "DPTF_PASSIVE(CPU, CPU, 95, 5000)" @@ -306,7 +306,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -387,11 +387,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -400,7 +396,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -409,8 +405,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -424,8 +419,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -436,11 +431,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb index ef207b9891..802ddf1d92 100644 --- a/src/mainboard/google/puff/variants/genesis/overridetree.cb +++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb @@ -243,7 +243,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -305,7 +305,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -384,11 +384,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -397,7 +393,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -406,8 +402,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -421,8 +416,7 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc off end - device ref pcie_rp7 on + device ref pcie_rp7 on # LAN chip drivers/net # RTL8111H Ethernet NIC register "customized_leds" = "0x05af" @@ -432,29 +426,29 @@ chip soc/intel/cannonlake device pci 00.0 on end end end - device ref pcie_rp8 on + device ref pcie_rp8 on # WLAN register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot end - device ref pcie_rp9 on + device ref pcie_rp9 on # TPU register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot end - device ref pcie_rp10 off end - device ref pcie_rp11 on end + device ref pcie_rp11 on # TPU1 register "PcieRpSlotImplemented[10]" = "1" # M.2 Slot - device ref pcie_rp12 on end + end + device ref pcie_rp12 on # TPU0 register "PcieRpSlotImplemented[11]" = "1" # M.2 Slot - device ref pcie_rp13 on + end + device ref pcie_rp13 on # X4 i350 NIC register "PcieRpSlotImplemented[12]" = "0" # Built-in end - device ref pcie_rp14 on end # non-root - device ref pcie_rp15 on end # non-root - device ref pcie_rp16 on end # non-root - device ref gspi1 off end + device ref pcie_rp14 on end # non-root + device ref pcie_rp15 on end # non-root + device ref pcie_rp16 on end # non-root end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb index 23ae76342f..45e4bc78b1 100644 --- a/src/mainboard/google/puff/variants/kaisa/overridetree.cb +++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb @@ -269,7 +269,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -332,7 +332,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -413,11 +413,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -426,7 +422,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -435,8 +431,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -450,8 +445,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -462,11 +457,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb index ddbedac3f3..4fb617b047 100644 --- a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb +++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb @@ -243,7 +243,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -305,7 +305,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -386,11 +386,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -399,7 +395,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -408,8 +404,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -423,8 +418,7 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc off end - device ref pcie_rp7 on + device ref pcie_rp7 on # LAN chip drivers/net # RTL8111H Ethernet NIC register "customized_leds" = "0x05af" @@ -434,31 +428,30 @@ chip soc/intel/cannonlake device pci 00.0 on end end end - device ref pcie_rp8 on + device ref pcie_rp8 on # WLAN register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot end - device ref pcie_rp9 on + device ref pcie_rp9 on # TPU register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot end - device ref pcie_rp10 off end - device ref pcie_rp11 on end + device ref pcie_rp11 on # TPU1 register "PcieRpSlotImplemented[10]" = "1" # M.2 Slot - device ref pcie_rp12 on end + end + device ref pcie_rp12 on # TPU0 register "PcieRpSlotImplemented[11]" = "1" # M.2 Slot - device ref pcie_rp13 on + end + device ref pcie_rp13 on # X4 i350 NIC register "PcieRpSlotImplemented[12]" = "0" # Built-in end - device ref pcie_rp14 on end # non-root - device ref pcie_rp15 on end # non-root - device ref pcie_rp16 on end # non-root - device ref uart0 on end - device ref uart1 on end - device ref gspi1 off end + device ref pcie_rp14 on end # non-root + device ref pcie_rp15 on end # non-root + device ref pcie_rp16 on end # non-root + device ref uart1 on end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb index 5cabe9a81c..d83459ccc4 100644 --- a/src/mainboard/google/puff/variants/noibat/overridetree.cb +++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb @@ -192,7 +192,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -255,7 +255,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -324,11 +324,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -337,7 +333,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -346,8 +342,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -361,8 +356,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -373,11 +368,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb index eee82e6691..474a2fa8aa 100644 --- a/src/mainboard/google/puff/variants/puff/overridetree.cb +++ b/src/mainboard/google/puff/variants/puff/overridetree.cb @@ -202,7 +202,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -267,7 +267,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -348,11 +348,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -361,7 +357,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -370,8 +366,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -385,8 +380,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -397,11 +392,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb index abf4ff3b2b..a61e41bdf6 100644 --- a/src/mainboard/google/puff/variants/scout/overridetree.cb +++ b/src/mainboard/google/puff/variants/scout/overridetree.cb @@ -235,7 +235,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -299,7 +299,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -378,10 +378,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 on + device ref i2c1 on # USI (Touch screen) chip drivers/i2c/hid register "generic.hid" = ""ILTK0001"" @@ -396,12 +393,10 @@ chip soc/intel/cannonlake device i2c 41 on end end end - device ref i2c2 on end # SCALER - device ref i2c3 on end # TPU - device ref heci1 on end - device ref i2c4 off end - device ref emmc on end - device ref pcie_rp7 on + device ref i2c2 on end # SCALER + device ref i2c3 on end # TPU + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -411,30 +406,25 @@ chip soc/intel/cannonlake device pci 00.0 on end end end - device ref pcie_rp8 on + device ref pcie_rp8 on # WLAN register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot end - device ref pcie_rp9 on + device ref pcie_rp9 on # SSD register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot end - device ref pcie_rp10 off end - device ref pcie_rp11 off end - device ref pcie_rp12 off end - device ref pcie_rp13 on + device ref pcie_rp13 on # TPU0 register "PcieRpSlotImplemented[12]" = "1" # M.2 Slot end - device ref pcie_rp14 on + device ref pcie_rp14 on # TPU1 register "PcieRpSlotImplemented[13]" = "1" # M.2 Slot end - device ref pcie_rp15 on end # non-root - device ref pcie_rp16 on end # non-root - device ref uart0 on end - device ref uart1 on end - device ref gspi1 off end + device ref pcie_rp15 on end # non-root + device ref pcie_rp16 on end # non-root + device ref uart1 on end end # VR Settings Configuration for 4 Domains diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb index 715ef7ffba..2c11e703b0 100644 --- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb +++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb @@ -203,7 +203,7 @@ chip soc/intel/cannonlake register "sata_port[1].TxGen3DeEmph" = "0x20" device domain 0 on - device ref dptf on + device ref dptf on chip drivers/intel/dptf ## Active Policy register "policies.active[0]" = "{.target=DPTF_CPU, @@ -268,7 +268,7 @@ chip soc/intel/cannonlake device generic 0 on end end end - device ref xhci on + device ref xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -349,11 +349,7 @@ chip soc/intel/cannonlake end end end - device ref i2c0 off - # RFU - Reserved for Future Use. - end - device ref i2c1 off end - device ref i2c2 on + device ref i2c2 on # PCON PS175 chip drivers/i2c/generic register "hid" = ""1AF80175"" @@ -362,7 +358,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref i2c3 on + device ref i2c3 on # Realtek RTD2142 chip drivers/i2c/generic register "hid" = ""10EC2142"" @@ -371,8 +367,7 @@ chip soc/intel/cannonlake device i2c 4a on end end end - device ref heci1 on end - device ref i2c4 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -386,8 +381,8 @@ chip soc/intel/cannonlake device i2c 1a on end end end - device ref emmc on end - device ref pcie_rp7 on + device ref emmc on end + device ref pcie_rp7 on # RTL8111H Ethernet NIC chip drivers/net register "customized_leds" = "0x05af" @@ -398,11 +393,10 @@ chip soc/intel/cannonlake end register "PcieRpSlotImplemented[6]" = "1" end - device ref pcie_rp11 on + device ref pcie_rp11 on # X2 NVMe register "PcieRpSlotImplemented[10]" = "1" end - device ref gspi1 off end end # VR Settings Configuration for 4 Domains -- cgit v1.2.3