UPSTREAM: soc/intel/common/block: correct apollolake device ids

The device ids changed names between patches. Fix them to
not break the build any more.

BUG=none
BRANCH=none
TEST=none

Change-Id: I5e4a2522e45c5aa60db90b53aa7fd7c9b61bd572
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: f27d98fadc
Original-Change-Id: I1d74d95ec6b516c4d8354a714b2b302557743fe0
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19600
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/498324

src/soc/intel/common/block/cse/cse.c

@@ -471,7 +471,7 @@ static const struct pci_driver cse_driver __pci_driver = {
 	.ops			= &cse_ops,
 	.vendor			= PCI_VENDOR_ID_INTEL,
 	/* SoC/chipset needs to provide PCI device ID */
-	.device			= PCI_DEVICE_ID_INTEL_APOLLOLAKE_CSE0
+	.device			= PCI_DEVICE_ID_INTEL_APL_CSE0,
 };
 
 #endif

src/soc/intel/common/block/xdci/xdci.c

@@ -30,7 +30,7 @@ static struct device_operations usb_xdci_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_APOLLOLAKE_XDCI,
+	PCI_DEVICE_ID_INTEL_APL_XDCI,
 	PCI_DEVICE_ID_INTEL_GLK_XDCI,
 	PCI_DEVICE_ID_INTEL_SPT_LP_XDCI,
 	0

src/soc/intel/common/block/xhci/xhci.c

@@ -30,7 +30,7 @@ static struct device_operations usb_xhci_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_APOLLOLAKE_XHCI,
+	PCI_DEVICE_ID_INTEL_APL_XHCI,
 	PCI_DEVICE_ID_INTEL_GLK_XHCI,
 	PCI_DEVICE_ID_INTEL_SPT_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_KBP_H_XHCI,