Hannah Williams (hannah.williams@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17812
-gerrit
commit 30cb72ee6a6d460288a51b44cf16ee6260e9b5ab Author: Hannah Williams hannah.williams@intel.com Date: Fri Oct 7 11:33:16 2016 -0700
soc/glk: Add PCI IDs for GLK SOC (WIP)
Change-Id: I41c54761f7eaad0a94a2c37aa0d6c533447f7de7 Signed-off-by: Hannah Williams hannah.williams@intel.com --- src/soc/intel/glk/dsp.c | 2 +- src/soc/intel/glk/graphics.c | 3 +- src/soc/intel/glk/i2c.c | 16 +++++----- src/soc/intel/glk/include/soc/pci_ids.h | 52 ++++++++++++++++----------------- src/soc/intel/glk/lpc.c | 2 +- src/soc/intel/glk/northbridge.c | 2 +- src/soc/intel/glk/p2sb.c | 2 +- src/soc/intel/glk/pmc.c | 2 +- src/soc/intel/glk/uart.c | 4 +-- src/soc/intel/glk/xhci.c | 2 +- 10 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/src/soc/intel/glk/dsp.c b/src/soc/intel/glk/dsp.c index a2d21aa..86f00ca 100644 --- a/src/soc/intel/glk/dsp.c +++ b/src/soc/intel/glk/dsp.c @@ -28,5 +28,5 @@ static struct device_operations dsp_dev_ops = { static const struct pci_driver apollolake_dsp __pci_driver = { .ops = &dsp_dev_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_AUDIO + .device = PCI_DEVICE_ID_GLK_AUDIO }; diff --git a/src/soc/intel/glk/graphics.c b/src/soc/intel/glk/graphics.c index 9b4dbc9..594e7cb 100644 --- a/src/soc/intel/glk/graphics.c +++ b/src/soc/intel/glk/graphics.c @@ -91,8 +91,7 @@ static const struct device_operations igd_ops = { };
static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_505, - PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_500, + PCI_DEVICE_ID_GLK_IGD, 0, };
diff --git a/src/soc/intel/glk/i2c.c b/src/soc/intel/glk/i2c.c index 4080987..ade8602 100644 --- a/src/soc/intel/glk/i2c.c +++ b/src/soc/intel/glk/i2c.c @@ -108,14 +108,14 @@ static struct device_operations i2c_dev_ops = { };
static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_APOLLOLAKE_I2C0, - PCI_DEVICE_ID_APOLLOLAKE_I2C1, - PCI_DEVICE_ID_APOLLOLAKE_I2C2, - PCI_DEVICE_ID_APOLLOLAKE_I2C3, - PCI_DEVICE_ID_APOLLOLAKE_I2C4, - PCI_DEVICE_ID_APOLLOLAKE_I2C5, - PCI_DEVICE_ID_APOLLOLAKE_I2C6, - PCI_DEVICE_ID_APOLLOLAKE_I2C7, + PCI_DEVICE_ID_GLK_I2C0, + PCI_DEVICE_ID_GLK_I2C1, + PCI_DEVICE_ID_GLK_I2C2, + PCI_DEVICE_ID_GLK_I2C3, + PCI_DEVICE_ID_GLK_I2C4, + PCI_DEVICE_ID_GLK_I2C5, + PCI_DEVICE_ID_GLK_I2C6, + PCI_DEVICE_ID_GLK_I2C7, 0, };
diff --git a/src/soc/intel/glk/include/soc/pci_ids.h b/src/soc/intel/glk/include/soc/pci_ids.h index e1adc21..6646e8a 100644 --- a/src/soc/intel/glk/include/soc/pci_ids.h +++ b/src/soc/intel/glk/include/soc/pci_ids.h @@ -1,8 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2015 Intel Corp. - * (Written by Alexandru Gagniuc alexandrux.gagniuc@intel.com for Intel Corp.) + * Copyright (C) 2016 Intel Corp. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,30 +17,29 @@ #ifndef _SOC_GLK_PCI_IDS_H_ #define _SOC_GLK_PCI_IDS_H_
-#define PCI_DEVICE_ID_APOLLOLAKE_NB 0x5af0 /* 00:00.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_505 0x5a84 /* 00:02.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_IGD_HD_500 0x5a85 /* 00:02.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_P2SB 0x5a92 /* 00:0d.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_PMC 0x5a94 /* 00:0d.1 */ -#define PCI_DEVICE_ID_APOLLOLAKE_HWSEQ_SPI 0x5a96 /* 00:0d.2 */ -#define PCI_DEVICE_ID_APOLLOLAKE_AUDIO 0x5a98 /* 00:0e.0 */ -#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_I2C0 0x5aac /* 00:16.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C1 0x5aae /* 00:16.1 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C2 0x5ab0 /* 00:16.2 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C3 0x5ab2 /* 00:16.3 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C4 0x5ab4 /* 00:17.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C5 0x5ab6 /* 00:17.1 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C6 0x5ab8 /* 00:17.2 */ -#define PCI_DEVICE_ID_APOLLOLAKE_I2C7 0x5aba /* 00:17.3 */ -#define PCI_DEVICE_ID_APOLLOLAKE_UART0 0x5abc /* 00:18.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_UART1 0x5abe /* 00:18.1 */ -#define PCI_DEVICE_ID_APOLLOLAKE_UART2 0x5ac0 /* 00:18.2 */ -#define PCI_DEVICE_ID_APOLLOLAKE_UART3 0x5aee /* 00:18.3 */ -#define PCI_DEVICE_ID_APOLLOLAKE_SPI0 0x5ac2 /* 00:19.0 */ -#define PCI_DEVICE_ID_APOLLOLAKE_SPI1 0x5ac4 /* 00:19.1 */ -#define PCI_DEVICE_ID_APOLLOLAKE_SPI2 0x5ac6 /* 00:19.2 */ -#define PCI_DEVICE_ID_APOLLOLAKE_LPC 0x5ae8 /* 00:1f.0 */ +#define PCI_DEVICE_ID_GLK_NB 0x31f0 /* 00:00.0 */ +#define PCI_DEVICE_ID_GLK_IGD 0x3184 /* 00:02.0 */ +#define PCI_DEVICE_ID_GLK_P2SB 0x3192 /* 00:0d.0 */ +#define PCI_DEVICE_ID_GLK_PMC 0x3194 /* 00:0d.1 */ +#define PCI_DEVICE_ID_GLK_HWSEQ_SPI 0x3196 /* 00:0d.2 */ +#define PCI_DEVICE_ID_GLK_AUDIO 0x3198 /* 00:0e.0 */ +#define PCI_DEVICE_ID_GLK_SATA 0x31e0 /* 00:12.0 */ +#define PCI_DEVICE_ID_GLK_XHCI 0x31a8 /* 00:15:0 */ +#define PCI_DEVICE_ID_GLK_I2C0 0x31ac /* 00:16.0 */ +#define PCI_DEVICE_ID_GLK_I2C1 0x31ae /* 00:16.1 */ +#define PCI_DEVICE_ID_GLK_I2C2 0x31b0 /* 00:16.2 */ +#define PCI_DEVICE_ID_GLK_I2C3 0x31b2 /* 00:16.3 */ +#define PCI_DEVICE_ID_GLK_I2C4 0x31b4 /* 00:17.0 */ +#define PCI_DEVICE_ID_GLK_I2C5 0x31b6 /* 00:17.1 */ +#define PCI_DEVICE_ID_GLK_I2C6 0x31b8 /* 00:17.2 */ +#define PCI_DEVICE_ID_GLK_I2C7 0x31ba /* 00:17.3 */ +#define PCI_DEVICE_ID_GLK_UART0 0x31bc /* 00:18.0 */ +#define PCI_DEVICE_ID_GLK_UART1 0x31be /* 00:18.0 */ +#define PCI_DEVICE_ID_GLK_UART2 0x31c0 /* 00:18.0 */ +#define PCI_DEVICE_ID_GLK_UART3 0x31ee /* 00:18.0 */ +#define PCI_DEVICE_ID_GLK_SPI0 0x31c2 /* 00:19.0 */ +#define PCI_DEVICE_ID_GLK_SPI1 0x31c4 /* 00:19.1 */ +#define PCI_DEVICE_ID_GLK_SPI2 0x31c6 /* 00:19.2 */ +#define PCI_DEVICE_ID_GLK_LPC 0x31e8 /* 00:1f.0 */
#endif /* _SOC_GLK_PCI_IDS_H_ */ diff --git a/src/soc/intel/glk/lpc.c b/src/soc/intel/glk/lpc.c index aec8a9f..9f655b7 100644 --- a/src/soc/intel/glk/lpc.c +++ b/src/soc/intel/glk/lpc.c @@ -172,5 +172,5 @@ static struct device_operations device_ops = { static const struct pci_driver soc_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_LPC, + .device = PCI_DEVICE_ID_GLK_LPC, }; diff --git a/src/soc/intel/glk/northbridge.c b/src/soc/intel/glk/northbridge.c index cc097ba..e5b70c7 100644 --- a/src/soc/intel/glk/northbridge.c +++ b/src/soc/intel/glk/northbridge.c @@ -165,5 +165,5 @@ static struct device_operations northbridge_ops = { static const struct pci_driver northbridge_driver __pci_driver = { .ops = &northbridge_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_NB + .device = PCI_DEVICE_ID_GLK_NB }; diff --git a/src/soc/intel/glk/p2sb.c b/src/soc/intel/glk/p2sb.c index 7834e38..51ac5cf 100644 --- a/src/soc/intel/glk/p2sb.c +++ b/src/soc/intel/glk/p2sb.c @@ -70,5 +70,5 @@ static const struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_P2SB, + .device = PCI_DEVICE_ID_GLK_P2SB, }; diff --git a/src/soc/intel/glk/pmc.c b/src/soc/intel/glk/pmc.c index 7e5cf35..89034b6 100644 --- a/src/soc/intel/glk/pmc.c +++ b/src/soc/intel/glk/pmc.c @@ -153,5 +153,5 @@ static const struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_PMC, + .device = PCI_DEVICE_ID_GLK_PMC, }; diff --git a/src/soc/intel/glk/uart.c b/src/soc/intel/glk/uart.c index 7b50a21..04ce50d 100644 --- a/src/soc/intel/glk/uart.c +++ b/src/soc/intel/glk/uart.c @@ -49,8 +49,8 @@ static struct device_operations uart_ops = { };
static const unsigned short uart_ids[] = { - PCI_DEVICE_ID_APOLLOLAKE_UART0, PCI_DEVICE_ID_APOLLOLAKE_UART1, - PCI_DEVICE_ID_APOLLOLAKE_UART2, PCI_DEVICE_ID_APOLLOLAKE_UART3, + PCI_DEVICE_ID_GLK_UART0, PCI_DEVICE_ID_GLK_UART1, + PCI_DEVICE_ID_GLK_UART2, PCI_DEVICE_ID_GLK_UART3, 0 };
diff --git a/src/soc/intel/glk/xhci.c b/src/soc/intel/glk/xhci.c index 7b3cb46..4f7395f 100644 --- a/src/soc/intel/glk/xhci.c +++ b/src/soc/intel/glk/xhci.c @@ -101,5 +101,5 @@ static const struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_APOLLOLAKE_XHCI, + .device = PCI_DEVICE_ID_GLK_XHCI, };