From a5f11ebdd70eb4d05a309c02eebebd342897acea Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 12 Oct 2022 19:07:15 +0200 Subject: [PATCH] mb/amd,google/*/devicetree: drop CPU cluster device for Stoneyridge Since commit 60e9114c6210 ("include/device: ensure valid link/bus is passed to mp_cpu_bus_init"), no dummy LAPIC device is required under the CPU cluster device. Since the CPU cluster device is already present in the Stoneyridge chipset devicetree, drop the whole CPU cluster part from the mainboard's devicetrees. Signed-off-by: Felix Held Change-Id: I8918c14be25ac9756926a9c6a2806a3dceced42a Reviewed-on: https://review.coreboot.org/c/coreboot/+/68317 Reviewed-by: Matt DeVillier Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/mainboard/amd/gardenia/devicetree.cb | 3 --- src/mainboard/amd/padmelon/devicetree.cb | 4 ---- src/mainboard/google/kahlee/variants/aleena/devicetree.cb | 3 --- src/mainboard/google/kahlee/variants/careena/devicetree.cb | 3 --- src/mainboard/google/kahlee/variants/grunt/devicetree.cb | 3 --- src/mainboard/google/kahlee/variants/liara/devicetree.cb | 3 --- src/mainboard/google/kahlee/variants/nuwani/devicetree.cb | 3 --- src/mainboard/google/kahlee/variants/treeya/devicetree.cb | 3 --- 8 files changed, 25 deletions(-) diff --git a/src/mainboard/amd/gardenia/devicetree.cb b/src/mainboard/amd/gardenia/devicetree.cb index bb90ed43e2..23b1377f73 100644 --- a/src/mainboard/amd/gardenia/devicetree.cb +++ b/src/mainboard/amd/gardenia/devicetree.cb @@ -7,9 +7,6 @@ chip soc/amd/stoneyridge { {0xA2, 0x00} }, // socket 0 - Channel 0, slots 0 & 1 }" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on subsystemid 0x1022 0x1410 inherit device pci 0.0 on end # Root Complex diff --git a/src/mainboard/amd/padmelon/devicetree.cb b/src/mainboard/amd/padmelon/devicetree.cb index 9b3ddd7649..d1f35962b9 100644 --- a/src/mainboard/amd/padmelon/devicetree.cb +++ b/src/mainboard/amd/padmelon/devicetree.cb @@ -3,10 +3,6 @@ chip soc/amd/stoneyridge register "uma_mode" = "UMAMODE_AUTO_LEGACY" - device cpu_cluster 0 on - device lapic 10 on end - end - device domain 0 on subsystemid 0x1022 0x1410 inherit device pci 0.0 on end # Root Complex diff --git a/src/mainboard/google/kahlee/variants/aleena/devicetree.cb b/src/mainboard/google/kahlee/variants/aleena/devicetree.cb index 9d49a6573e..2bf00ba0f2 100644 --- a/src/mainboard/google/kahlee/variants/aleena/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/aleena/devicetree.cb @@ -44,9 +44,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery) diff --git a/src/mainboard/google/kahlee/variants/careena/devicetree.cb b/src/mainboard/google/kahlee/variants/careena/devicetree.cb index 4ace016c5d..c68fcf5c57 100644 --- a/src/mainboard/google/kahlee/variants/careena/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/careena/devicetree.cb @@ -44,9 +44,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery) diff --git a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb index 29bbf3ea99..15e40abe62 100644 --- a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb @@ -44,9 +44,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery) diff --git a/src/mainboard/google/kahlee/variants/liara/devicetree.cb b/src/mainboard/google/kahlee/variants/liara/devicetree.cb index 3c73341e85..fe70ed57b3 100644 --- a/src/mainboard/google/kahlee/variants/liara/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/liara/devicetree.cb @@ -43,9 +43,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery) diff --git a/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb b/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb index db77bd5c78..ae2379cb1e 100644 --- a/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb @@ -47,9 +47,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery) diff --git a/src/mainboard/google/kahlee/variants/treeya/devicetree.cb b/src/mainboard/google/kahlee/variants/treeya/devicetree.cb index b39efb8468..569831c09a 100644 --- a/src/mainboard/google/kahlee/variants/treeya/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/treeya/devicetree.cb @@ -47,9 +47,6 @@ chip soc/amd/stoneyridge register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ GPIO_I2C2_SCL | GPIO_I2C3_SCL" - device cpu_cluster 0 on - device lapic 10 on end - end device domain 0 on device pci 0.0 on end # Root Complex device pci 0.2 off end # IOMMU (Disabled for performance and battery)