Hannah Williams has uploaded a new change for review. ( https://review.coreboot.org/19999 )
Change subject: soc/intel/apollolake: Remove soc/pci_ids dependency and add pci ids for GLK and APL from device/pci_ids.h ......................................................................
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 --- M src/soc/intel/apollolake/dsp.c M src/soc/intel/apollolake/graphics.c M src/soc/intel/apollolake/lpc.c M src/soc/intel/apollolake/northbridge.c M src/soc/intel/apollolake/p2sb.c M src/soc/intel/apollolake/pmc.c M src/soc/intel/apollolake/sd.c M src/soc/intel/apollolake/sram.c 8 files changed, 52 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/19999/1
diff --git a/src/soc/intel/apollolake/dsp.c b/src/soc/intel/apollolake/dsp.c index a2d21aa..76547ee 100644 --- a/src/soc/intel/apollolake/dsp.c +++ b/src/soc/intel/apollolake/dsp.c @@ -16,7 +16,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <soc/pci_ids.h>
static struct device_operations dsp_dev_ops = { .read_resources = &pci_dev_read_resources, @@ -25,8 +24,14 @@ .scan_bus = &scan_static_bus, };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_AUDIO, + PCI_DEVICE_ID_INTEL_GLK_AUDIO, + 0, +}; + static const struct pci_driver apollolake_dsp __pci_driver = { .ops = &dsp_dev_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_AUDIO + .devices = pci_device_ids, }; diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c index 9963d2c..7123e4f 100644 --- a/src/soc/intel/apollolake/graphics.c +++ b/src/soc/intel/apollolake/graphics.c @@ -23,7 +23,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <soc/pci_devs.h> -#include <soc/pci_ids.h> #include <soc/intel/common/opregion.h>
uintptr_t fsp_soc_get_igd_bar(void) @@ -91,8 +90,9 @@ };
static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_505, - PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_500, + PCI_DEVICE_ID_INTEL_APL_IGD_HD_505, + PCI_DEVICE_ID_INTEL_APL_IGD_HD_500, + PCI_DEVICE_ID_INTEL_GLK_IGD, 0, };
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c index 810c4c9..67c87b1 100644 --- a/src/soc/intel/apollolake/lpc.c +++ b/src/soc/intel/apollolake/lpc.c @@ -23,7 +23,6 @@ #include <pc80/mc146818rtc.h> #include <soc/acpi.h> #include <soc/lpc.h> -#include <soc/pci_ids.h> #include <soc/pm.h> #include <vboot/vbnv.h>
@@ -167,8 +166,14 @@ .scan_bus = scan_lpc_bus, };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_LPC, + PCI_DEVICE_ID_INTEL_GLK_LPC, + 0, +}; + static const struct pci_driver soc_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_LPC, + .devices = pci_device_ids, }; diff --git a/src/soc/intel/apollolake/northbridge.c b/src/soc/intel/apollolake/northbridge.c index 9519603..4997c6f 100644 --- a/src/soc/intel/apollolake/northbridge.c +++ b/src/soc/intel/apollolake/northbridge.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <soc/systemagent.h> -#include <soc/pci_ids.h>
static uint32_t get_bar(device_t dev, unsigned int index) { @@ -162,8 +161,14 @@ .enable = DEVICE_NOOP };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_NB, + PCI_DEVICE_ID_INTEL_GLK_NB, + 0, +}; + static const struct pci_driver northbridge_driver __pci_driver = { .ops = &northbridge_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_NB + .devices = pci_device_ids, }; diff --git a/src/soc/intel/apollolake/p2sb.c b/src/soc/intel/apollolake/p2sb.c index 8056d14..f0e584b 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 @@ .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, }; diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index ef39630..150f7ce 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/src/soc/intel/apollolake/pmc.c @@ -21,7 +21,6 @@ #include <console/console.h> #include <cpu/x86/smm.h> #include <soc/iomap.h> -#include <soc/pci_ids.h> #include <soc/gpio.h> #include <soc/pci_devs.h> #include <soc/pm.h> @@ -164,8 +163,14 @@ .init = &pmc_init, };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_PMC, + PCI_DEVICE_ID_INTEL_GLK_PMC, + 0, +}; + static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_PMC, + .devices= pci_device_ids, }; diff --git a/src/soc/intel/apollolake/sd.c b/src/soc/intel/apollolake/sd.c index 2f38061..e2b5ab4 100644 --- a/src/soc/intel/apollolake/sd.c +++ b/src/soc/intel/apollolake/sd.c @@ -75,8 +75,14 @@ #endif };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_SD, + PCI_DEVICE_ID_INTEL_GLK_SD, + 0, +}; + static const struct pci_driver pch_sd __pci_driver = { .ops = &dev_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x5aca + .devices= pci_device_ids, }; diff --git a/src/soc/intel/apollolake/sram.c b/src/soc/intel/apollolake/sram.c index 44eb0ee..0225327 100644 --- a/src/soc/intel/apollolake/sram.c +++ b/src/soc/intel/apollolake/sram.c @@ -17,7 +17,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <soc/pci_ids.h> #include <soc/pci_devs.h> #include <soc/iomap.h>
@@ -61,8 +60,14 @@ .enable_resources = pci_dev_enable_resources, };
+static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_INTEL_APL_SRAM, + PCI_DEVICE_ID_INTEL_GLK_SRAM, + 0, +}; + static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_SRAM, + .devices= pci_device_ids, };