Felix Singer submitted this change.

View Change

Approvals: Subrata Banik: Looks good to me, approved build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
cfl/cml/whl mainboards: Drop superfluous cpu_cluster device

The cpu_cluster device is defined in the chipset devicetree. So drop it
from the mainboards.

Change-Id: I65bfeaf0b8771c123c0615531c2cc608b222949b
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83440
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/puff/variants/baseboard/devicetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/cfl_h/overridetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb
M src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/protectli/vault_cml/devicetree.cb
M src/mainboard/purism/librem_cnl/devicetree.cb
M src/mainboard/purism/librem_l1um_v2/devicetree.cb
M src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
M src/mainboard/system76/addw1/devicetree.cb
M src/mainboard/system76/bonw14/devicetree.cb
M src/mainboard/system76/cml-u/devicetree.cb
M src/mainboard/system76/gaze15/devicetree.cb
M src/mainboard/system76/oryp5/devicetree.cb
M src/mainboard/system76/oryp6/devicetree.cb
M src/mainboard/system76/whl-u/devicetree.cb
21 files changed, 0 insertions(+), 41 deletions(-)

diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb b/src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
index a98d144..10db5f8 100644
--- a/src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
+++ b/src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
@@ -55,8 +55,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
subsystemid 0x1558 0x1401 inherit
device pci 00.0 on end # Host Bridge
diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index c4679e3..39cea80 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -195,8 +195,6 @@
register "gpio_pm[COMM_3]" = "0"
register "gpio_pm[COMM_4]" = "0"

- device cpu_cluster 0 on end
-
device domain 0 on
device ref igpu on end
device ref thermal on end
diff --git a/src/mainboard/google/puff/variants/baseboard/devicetree.cb b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
index 6768711..9e8e96a 100644
--- a/src/mainboard/google/puff/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
@@ -195,8 +195,6 @@
register "gpio_pm[COMM_3]" = "0"
register "gpio_pm[COMM_4]" = "0"

- device cpu_cluster 0 on end
-
device domain 0 on
device ref igpu on end
device ref thermal on end
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb
index 051eba0..bee71aa 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
# FSP configuration
register "SaGv" = "SaGv_Enabled"
register "ScsEmmcHs400Enabled" = "1"
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/overridetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/overridetree.cb
index 2269d74..304b4d5 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/overridetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/overridetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
# FSP configuration
register "RMT" = "1"

diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb
index b6bf5a8..cfccfc9 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
# FSP configuration
register "RMT" = "1"

diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb
index ce46c63..0ba9e83 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
register "PchHdaDspEnable" = "1"
register "PchHdaAudioLinkHda" = "1"

diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb
index b9fe423..50bff81 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
# Enable eDP device
register "DdiPortEdp" = "1"
# Enable HPD for DDI ports B/C
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb
index 9c08023..2265d64 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb
+++ b/src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb
@@ -1,7 +1,5 @@
chip soc/intel/cannonlake

- device cpu_cluster 0 on end
-
# Enable eDP device
register "DdiPortEdp" = "1"
# Enable HPD for DDI ports B/C/D/F
diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb
index ee73800..bc000c7 100644
--- a/src/mainboard/prodrive/hermes/devicetree.cb
+++ b/src/mainboard/prodrive/hermes/devicetree.cb
@@ -136,8 +136,6 @@

register "DisableHeciRetry" = "1"

- device cpu_cluster 0 on end
-
device domain 0 on
device ref system_agent on end
device ref peg0 on # x8 / Slot 2
diff --git a/src/mainboard/protectli/vault_cml/devicetree.cb b/src/mainboard/protectli/vault_cml/devicetree.cb
index 740c3af..ccfe118 100644
--- a/src/mainboard/protectli/vault_cml/devicetree.cb
+++ b/src/mainboard/protectli/vault_cml/devicetree.cb
@@ -139,7 +139,6 @@
[PchSerialIoIndexUART2] = PchSerialIoDisabled,
}"

- device cpu_cluster 0 on end
device domain 0 on
device ref system_agent on end
device ref igpu on end
diff --git a/src/mainboard/purism/librem_cnl/devicetree.cb b/src/mainboard/purism/librem_cnl/devicetree.cb
index 5287872..cc1433d 100644
--- a/src/mainboard/purism/librem_cnl/devicetree.cb
+++ b/src/mainboard/purism/librem_cnl/devicetree.cb
@@ -41,8 +41,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
device ref igpu on end
device ref dptf on
diff --git a/src/mainboard/purism/librem_l1um_v2/devicetree.cb b/src/mainboard/purism/librem_l1um_v2/devicetree.cb
index e86b7a0..80c497b 100644
--- a/src/mainboard/purism/librem_l1um_v2/devicetree.cb
+++ b/src/mainboard/purism/librem_l1um_v2/devicetree.cb
@@ -37,8 +37,6 @@

register "DisableHeciRetry" = "1"

- device cpu_cluster 0 on end
-
device domain 0 on
device ref system_agent on end
device ref peg0 on # x16 or x8
diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
index 5757439..6f800cb 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
@@ -50,8 +50,6 @@
register "PcieClkSrcClkReq[5]" = "PCIE_CLK_NOTUSED"

# Actual device tree.
- device cpu_cluster 0 on end
-
device domain 0 on
device ref system_agent on end
device ref igpu on end
diff --git a/src/mainboard/system76/addw1/devicetree.cb b/src/mainboard/system76/addw1/devicetree.cb
index 1f45452..2a4a21a 100644
--- a/src/mainboard/system76/addw1/devicetree.cb
+++ b/src/mainboard/system76/addw1/devicetree.cb
@@ -49,8 +49,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
subsystemid 0x1558 0x65d1 inherit
device ref peg0 on
diff --git a/src/mainboard/system76/bonw14/devicetree.cb b/src/mainboard/system76/bonw14/devicetree.cb
index 918a0b8..dee0bf5 100644
--- a/src/mainboard/system76/bonw14/devicetree.cb
+++ b/src/mainboard/system76/bonw14/devicetree.cb
@@ -52,8 +52,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
subsystemid 0x1558 0x7714 inherit
device ref peg0 on
diff --git a/src/mainboard/system76/cml-u/devicetree.cb b/src/mainboard/system76/cml-u/devicetree.cb
index 7eaa0e7..aaffd4e 100644
--- a/src/mainboard/system76/cml-u/devicetree.cb
+++ b/src/mainboard/system76/cml-u/devicetree.cb
@@ -56,8 +56,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
device ref igpu on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
diff --git a/src/mainboard/system76/gaze15/devicetree.cb b/src/mainboard/system76/gaze15/devicetree.cb
index 47e9b3c..ba88a71 100644
--- a/src/mainboard/system76/gaze15/devicetree.cb
+++ b/src/mainboard/system76/gaze15/devicetree.cb
@@ -49,8 +49,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
device ref peg0 on
# PCI Express Graphics #0 x16, Clock 8 (NVIDIA GPU)
diff --git a/src/mainboard/system76/oryp5/devicetree.cb b/src/mainboard/system76/oryp5/devicetree.cb
index 13da8f1..4eea043 100644
--- a/src/mainboard/system76/oryp5/devicetree.cb
+++ b/src/mainboard/system76/oryp5/devicetree.cb
@@ -56,8 +56,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
subsystemid 0x1558 0x95e6 inherit
device ref peg0 on
diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb
index b285b97..c198ea9 100644
--- a/src/mainboard/system76/oryp6/devicetree.cb
+++ b/src/mainboard/system76/oryp6/devicetree.cb
@@ -54,8 +54,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
device ref peg0 on
# PCI Express Graphics #0 x16, Clock 8 (NVIDIA GPU)
diff --git a/src/mainboard/system76/whl-u/devicetree.cb b/src/mainboard/system76/whl-u/devicetree.cb
index 24ea49f..53d5943 100644
--- a/src/mainboard/system76/whl-u/devicetree.cb
+++ b/src/mainboard/system76/whl-u/devicetree.cb
@@ -56,8 +56,6 @@
register "gpe0_dw2" = "PMC_GPP_E"

# Actual device tree
- device cpu_cluster 0 on end
-
device domain 0 on
device ref igpu on
register "gfx" = "GMA_STATIC_DISPLAYS(0)"

To view, visit change 83440. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I65bfeaf0b8771c123c0615531c2cc608b222949b
Gerrit-Change-Number: 83440
Gerrit-PatchSet: 5
Gerrit-Owner: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Christian Walter <christian.walter@9elements.com>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Reviewer: Jeremy Soller <jeremy@system76.com>
Gerrit-Reviewer: Jonathon Hall <jonathon.hall@puri.sm>
Gerrit-Reviewer: Michael Niewöhner <foss@mniewoehner.de>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski@3mdeb.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro@chromium.org>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com>
Gerrit-Reviewer: Piotr Król <piotr.krol@3mdeb.com>
Gerrit-Reviewer: Sean Rhodes <sean@starlabs.systems>
Gerrit-Reviewer: Subrata Banik <subratabanik@google.com>
Gerrit-Reviewer: Tim Crawford <tcrawford@system76.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>