summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Petrov <andrey.petrov@intel.com>2017-03-02 08:50:57 -0800
committerMartin Roth <martinroth@google.com>2017-03-09 04:40:00 +0100
commitfba74895745d9fe498bc15023192a8876576c356 (patch)
tree1168b1ea08243a36207d3b54e6046f3d19eb8340
parent010905ed2fdaea92116f5d2764073176c06dce31 (diff)
downloadcoreboot-fba74895745d9fe498bc15023192a8876576c356.tar.xz
soc/intel/apollolake: Prepare to use common HECI driver
Change-Id: Ib284493d886b223e8c85607de5fdb56b698fe5fa Signed-off-by: Andrey Petrov <andrey.petrov@intel.com> Reviewed-on: https://review.coreboot.org/18546 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/intel/apollolake/cse.c2
-rw-r--r--src/soc/intel/apollolake/heci.c2
-rw-r--r--src/soc/intel/apollolake/include/soc/pci_devs.h4
-rw-r--r--src/soc/intel/apollolake/include/soc/pci_ids.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c
index b8ab1f0a1a..ba3898dad0 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 468589531c..55da98cca7 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 d058f8b946..572fd38100 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 4c2956f259..8b548ee022 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 */