soc/intel/common: Add Cannonlake pci ids for common

Add Cannonlake pci device ids for all the merged intel common code. As
of now only have CNL-U and CNL-Y pci ids.

Change-Id: Iee5087cdeba53919d83ff665d0c417075279294c
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/20823
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>

9 files changed, 34 insertions, 0 deletions

diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index 6debe88eeb..f4b1e8c5ff 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -179,6 +179,12 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_I2C5,
 	PCI_DEVICE_ID_INTEL_APL_I2C6,
 	PCI_DEVICE_ID_INTEL_APL_I2C7,
+	PCI_DEVICE_ID_INTEL_CNL_I2C0,
+	PCI_DEVICE_ID_INTEL_CNL_I2C1,
+	PCI_DEVICE_ID_INTEL_CNL_I2C2,
+	PCI_DEVICE_ID_INTEL_CNL_I2C3,
+	PCI_DEVICE_ID_INTEL_CNL_I2C4,
+	PCI_DEVICE_ID_INTEL_CNL_I2C5,
 	PCI_DEVICE_ID_INTEL_GLK_I2C0,
 	PCI_DEVICE_ID_INTEL_GLK_I2C1,
 	PCI_DEVICE_ID_INTEL_GLK_I2C2,
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index dfc92fed27..19133f0b55 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -139,6 +139,22 @@ static const unsigned short pcie_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP22,
 	PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP23,
 	PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP24,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP3,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP4,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP5,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP6,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP7,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP8,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP9,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP10,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP11,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP12,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP13,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP14,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP15,
+	PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP16,
 	0
 };
 
diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c
index f0274860a6..5cacc95ce0 100644
--- a/src/soc/intel/common/block/sata/sata.c
+++ b/src/soc/intel/common/block/sata/sata.c
@@ -64,6 +64,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SPT_U_SATA,
 	PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA,
 	PCI_DEVICE_ID_INTEL_SPT_KBL_SATA,
+	PCI_DEVICE_ID_INTEL_CNL_SATA,
+	PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA,
+	PCI_DEVICE_ID_INTEL_CNL_COMPAT_SATA,
 	0
 };
 
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index ec5f6e8cac..d6f48431bf 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -65,6 +65,7 @@ static struct device_operations dev_ops = {
 
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_SD,
+	PCI_DEVICE_ID_INTEL_CNL_SD,
 	PCI_DEVICE_ID_INTEL_GLK_SD,
 	PCI_DEVICE_ID_INTEL_SKL_SD,
 	0
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index cd066ace58..8ee38eeeb4 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -89,6 +89,7 @@ static struct device_operations smbus_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
+	PCI_DEVICE_ID_INTEL_CNL_SMBUS,
 	PCI_DEVICE_ID_INTEL_SPT_LP_SMBUS,
 	PCI_DEVICE_ID_INTEL_SPT_H_SMBUS,
 	0
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index f2e74cc29f..206f4a0f87 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -289,6 +289,8 @@ static struct device_operations systemagent_ops = {
 static const unsigned short systemagent_ids[] = {
 	PCI_DEVICE_ID_INTEL_GLK_NB,
 	PCI_DEVICE_ID_INTEL_APL_NB,
+	PCI_DEVICE_ID_INTEL_CNL_ID_U,
+	PCI_DEVICE_ID_INTEL_CNL_ID_Y,
 	PCI_DEVICE_ID_INTEL_SKL_ID_U,
 	PCI_DEVICE_ID_INTEL_SKL_ID_Y,
 	PCI_DEVICE_ID_INTEL_SKL_ID_ULX,
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 632fb95f8e..e8f1bc8094 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -60,6 +60,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_UART1,
 	PCI_DEVICE_ID_INTEL_APL_UART2,
 	PCI_DEVICE_ID_INTEL_APL_UART3,
+	PCI_DEVICE_ID_INTEL_CNL_UART0,
+	PCI_DEVICE_ID_INTEL_CNL_UART1,
+	PCI_DEVICE_ID_INTEL_CNL_UART2,
 	PCI_DEVICE_ID_INTEL_GLK_UART0,
 	PCI_DEVICE_ID_INTEL_GLK_UART1,
 	PCI_DEVICE_ID_INTEL_GLK_UART2,
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index c5d4e002a1..7b74b215d3 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -31,6 +31,7 @@ static struct device_operations usb_xdci_ops = {
 
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_XDCI,
+	PCI_DEVICE_ID_INTEL_CNL_LP_XDCI,
 	PCI_DEVICE_ID_INTEL_GLK_XDCI,
 	PCI_DEVICE_ID_INTEL_SPT_LP_XDCI,
 	0
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index 50fe1de69c..ac7bd580cb 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -31,6 +31,7 @@ static struct device_operations usb_xhci_ops = {
 
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_XHCI,
+	PCI_DEVICE_ID_INTEL_CNL_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_GLK_XHCI,
 	PCI_DEVICE_ID_INTEL_SPT_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_KBP_H_XHCI,