2 files changed, 21 insertions, 6 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 3e70f5d386..c5a18c298e 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -67,7 +67,8 @@ struct device {
 
 	unsigned long rom_address;
 	struct device_operations *ops;
-	struct chip *chip;
+	struct chip_control *chip_control;
+	void *chip_info;
 };
 
 extern struct device	dev_root;	/* root bus */
diff --git a/src/include/device/path.h b/src/include/device/path.h
index cd6be6ac03..9df1d9fa67 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -9,11 +9,17 @@ enum device_path_type {
 	DEVICE_PATH_PNP,
 	DEVICE_PATH_I2C,
 	DEVICE_PATH_APIC,
+	DEVICE_PATH_PCI_DOMAIN,
+	DEVICE_APIC_CLUSTER,
+};
+
+struct pci_domain_path
+{
+	unsigned domain;
 };
 
 struct pci_path
 {
-	unsigned bus;
 	unsigned devfn;
 };
 
@@ -33,13 +39,21 @@ struct apic_path
 	unsigned apic_id;
 };
 
+struct apic_cluster_path
+{
+	unsigned cluster;
+};
+
+
 struct device_path {
 	enum device_path_type type;
 	union {
-		struct pci_path  pci;
-		struct pnp_path  pnp;
-		struct i2c_path  i2c;
-		struct apic_path apic;
+		struct pci_path   pci;
+		struct pnp_path   pnp;
+		struct i2c_path   i2c;
+		struct apic_path  apic;
+		struct pci_domain_path pci_domain;
+		struct apic_cluster_path apic_cluster;
 	} u;
 };