[coreboot-gerrit] [S] Change in coreboot[master]: nb/intel/sandybridge: Hook up CPU bus and PCI domain ops to devicetree

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69291 )

(

13 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: nb/intel/sandybridge: Hook up CPU bus and PCI domain ops to devicetree
......................................................................

nb/intel/sandybridge: Hook up CPU bus and PCI domain ops to devicetree

Change-Id: I718d9dbc184c8bca38f452efea3202901018cb04
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69291
Reviewed-by: Kyösti Mälkki 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/northbridge/intel/sandybridge/chipset.cb
M src/northbridge/intel/sandybridge/northbridge.c
2 files changed, 18 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
index ae02a5b..e7ade19 100644
--- a/src/northbridge/intel/sandybridge/chipset.cb
+++ b/src/northbridge/intel/sandybridge/chipset.cb
@@ -2,6 +2,7 @@

chip northbridge/intel/sandybridge
    device cpu_cluster 0 on
+		ops sandybridge_cpu_bus_ops
    	chip cpu/intel/model_206ax
    		# Magic APIC ID to locate this chip
    		device lapic 0 on end
@@ -14,5 +15,6 @@
    end

device domain 0 on
+		ops sandybridge_pci_domain_ops
    end
 end
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 521044b..ad85d68 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -52,7 +52,7 @@
    return NULL;
 }

-static struct device_operations pci_domain_ops = {
+struct device_operations sandybridge_pci_domain_ops = {
    .read_resources    = pci_domain_read_resources,
    .set_resources     = pci_domain_set_resources,
    .scan_bus          = pci_domain_scan_bus,
@@ -412,23 +412,12 @@
    .devices = pci_device_ids,
 };

-static struct device_operations cpu_bus_ops = {
+struct device_operations sandybridge_cpu_bus_ops = {
    .read_resources   = noop_read_resources,
    .set_resources    = noop_set_resources,
    .init             = mp_cpu_bus_init,
 };

-static void enable_dev(struct device *dev)
-{
-	/* Set the operations if it is a special bus type */
-	if (dev->path.type == DEVICE_PATH_DOMAIN) {
-		dev->ops = &pci_domain_ops;
-	} else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) {
-		dev->ops = &cpu_bus_ops;
-	}
-}
-
 struct chip_operations northbridge_intel_sandybridge_ops = {
    CHIP_NAME("Intel SandyBridge/IvyBridge integrated Northbridge")
-	.enable_dev = enable_dev,
 };