soc/intel/apollolake: Remove soc/pci_ids dependency

and add pci ids for GLK and APL from device/pci_ids.h

Change-Id: If8101fe52591b09caadfe104ca8daab4258837c7
Signed-off-by: Hannah Williams <hannah.williams@intel.com>
Reviewed-on: https://review.coreboot.org/19999
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/soc/intel/apollolake/p2sb.c b/src/soc/intel/apollolake/p2sb.c
index 8056d14297..f0e584b27f 100644
--- a/src/soc/intel/apollolake/p2sb.c
+++ b/src/soc/intel/apollolake/p2sb.c
@@ -21,7 +21,6 @@
 #include <rules.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
-#include <soc/pci_ids.h>
 #include <soc/p2sb.h>
 
 #define P2SB_E0 0xe0
@@ -67,8 +66,14 @@ static const struct device_operations device_ops = {
 	.set_resources		= DEVICE_NOOP,
 };
 
+static const unsigned short pci_device_ids[] = {
+	PCI_DEVICE_ID_INTEL_APL_P2SB,
+	PCI_DEVICE_ID_INTEL_GLK_P2SB,
+	0,
+};
+
 static const struct pci_driver pmc __pci_driver = {
 	.ops	= &device_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_APOLLOLAKE_P2SB,
+	.devices = pci_device_ids,
 };