cpu/intel/model_206ax: Remove fake lapic device
Instead of using a fake lapic device hook up the cpu cluster to chip
cpu/intel/model_206ax.
The lapic device is also not needed as the mp init will allocate it for
the BSP at runtime.
Change-Id: Id3b1c4ca027e2905535e137691c3e3e60417dbf3
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59316
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
diff --git a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
index 8f94378..62b0b0b 100644
--- a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
+++ b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
@@ -1,10 +1,8 @@
chip northbridge/intel/sandybridge
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- register "tcc_offset" = "5" # TCC of 95C
- device lapic 0 on end
- device lapic 0xacac off end
- end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
+
+ register "tcc_offset" = "5" # TCC of 95C
end
device domain 0 on
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 77f58c2..87d0ed9 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -19,14 +19,10 @@
register "max_mem_clock_mhz" = "666"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "tcc_offset" = "5" # TCC of 95C
- end
+ register "tcc_offset" = "5" # TCC of 95C
end
device domain 0 on
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index fef8992..2eeb745 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -11,15 +11,12 @@
# Enable DVI Hotplug with 6ms pulse
register "gpu_dp_b_hotplug" = "0x06"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
- register "acpi_c1" = "CPU_ACPI_C3"
- register "acpi_c2" = "CPU_ACPI_C6"
- end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
+
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
device domain 0 on
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index a72b94f..bf87661 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -2,15 +2,11 @@
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 2e5ee0f..44e7372 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -17,15 +17,11 @@
register "gpu_cpu_backlight" = "0x0000001a"
register "gpu_pch_backlight" = "0x002e0000"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index 20b1c9a..c6aa44c 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -17,15 +17,11 @@
register "gpu_cpu_backlight" = "0x00000ac8"
register "gpu_pch_backlight" = "0x13120000"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index cd7b907..10aeb44 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -11,15 +11,11 @@
register "max_mem_clock_mhz" = "666"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c1" = "CPU_ACPI_C3"
- register "acpi_c2" = "CPU_ACPI_C6"
- end
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
device domain 0 on