[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: Prepare to use common HECI driver

[Andrey Petrov (andrey.petrov@intel.com)]

Andrey Petrov (andrey.petrov at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18546

-gerrit

commit 5106890a73dee7a9ed3f0bb7d19b583c80071f39
Author: Andrey Petrov <andrey.petrov at intel.com>
Date:   Thu Mar 2 08:50:57 2017 -0800

    soc/intel/apollolake: Prepare to use common HECI driver
    
    Change-Id: Ib284493d886b223e8c85607de5fdb56b698fe5fa
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/soc/intel/apollolake/cse.c                  | 2 +-
 src/soc/intel/apollolake/heci.c                 | 2 +-
 src/soc/intel/apollolake/include/soc/pci_devs.h | 4 ++--
 src/soc/intel/apollolake/include/soc/pci_ids.h  | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c
index b8ab1f0..ba3898da 100644
--- a/src/soc/intel/apollolake/cse.c
+++ b/src/soc/intel/apollolake/cse.c
@@ -28,7 +28,7 @@
 
 static uint32_t dump_status(int index, int reg_addr)
 {
-	uint32_t reg = pci_read_config32(CSE_DEV, reg_addr);
+	uint32_t reg = pci_read_config32(HECI1_DEV, reg_addr);
 
 	printk(BIOS_DEBUG, "CSE FWSTS%d: 0x%08x\n", index, reg);
 
diff --git a/src/soc/intel/apollolake/heci.c b/src/soc/intel/apollolake/heci.c
index 4685895..55da98c 100644
--- a/src/soc/intel/apollolake/heci.c
+++ b/src/soc/intel/apollolake/heci.c
@@ -22,7 +22,7 @@
 
 uint32_t heci_fw_sts(void)
 {
-	return pci_read_config32(CSE_DEV, REG_SEC_FW_STS0);
+	return pci_read_config32(HECI1_DEV, REG_SEC_FW_STS0);
 }
 
 bool heci_cse_normal(void)
diff --git a/src/soc/intel/apollolake/include/soc/pci_devs.h b/src/soc/intel/apollolake/include/soc/pci_devs.h
index d058f8b..572fd38 100644
--- a/src/soc/intel/apollolake/include/soc/pci_devs.h
+++ b/src/soc/intel/apollolake/include/soc/pci_devs.h
@@ -52,8 +52,8 @@
 #define HDA_DEV				_PCI_DEV(0xe, 0)
 #define HDA_DEVFN			_PCI_DEVFN(0xe, 0)
 
-#define CSE_DEV				_PCI_DEV(0xf, 0)
-#define CSE_DEVFN			_PCI_DEVFN(0xf, 0)
+#define HECI1_DEV			_PCI_DEV(0xf, 0)
+#define HECI1_DEVFN			_PCI_DEVFN(0xf, 0)
 
 #define ISH_DEV				_PCI_DEV(0x11, 0)
 #define ISH_DEVFN			_PCI_DEVFN(0x11, 0)
diff --git a/src/soc/intel/apollolake/include/soc/pci_ids.h b/src/soc/intel/apollolake/include/soc/pci_ids.h
index 4c2956f..8b548ee 100644
--- a/src/soc/intel/apollolake/include/soc/pci_ids.h
+++ b/src/soc/intel/apollolake/include/soc/pci_ids.h
@@ -26,6 +26,8 @@
 #define PCI_DEVICE_ID_APOLLOLAKE_HWSEQ_SPI	0x5a96		/* 00:0d.2 */
 #define PCI_DEVICE_ID_APOLLOLAKE_SRAM		0x5aec		/* 00:0d.3 */
 #define PCI_DEVICE_ID_APOLLOLAKE_AUDIO		0x5a98		/* 00:0e.0 */
+#define PCI_DEVICE_ID_APOLLOLAKE_CSE0		0x5a9a		/* 00:0f.0 */
+#define PCI_DEVICE_ID_HECI1			PCI_DEVICE_ID_APOLLOLAKE_CSE0
 #define PCI_DEVICE_ID_APOLLOLAKE_SATA		0x5ae0		/* 00:12.0 */
 #define PCI_DEVICE_ID_APOLLOLAKE_XHCI		0x5aa8		/* 00:15.0 */
 #define PCI_DEVICE_ID_APOLLOLAKE_XDCI		0x5aaa		/* 00:15.1 */