summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAamir Bohra <aamir.bohra@intel.com>2017-04-26 19:32:11 +0530
committerMartin Roth <martinroth@google.com>2017-05-09 17:58:42 +0200
commit935dff53b6e35a62db7b322c0d0867f667f0f0ae (patch)
tree5fe726ed88067cb237c952cdd2460f13c9d9bb5a
parent83f7baec308cffee0709e38c95e3b4726915e2ea (diff)
downloadcoreboot-935dff53b6e35a62db7b322c0d0867f667f0f0ae.tar.xz
soc/intel/apollolake: Use common/block/uart code
Change-Id: I92c654d59f1642bcd7c95de80dcc641bf816b542 Signed-off-by: Aamir Bohra <aamir.bohra@intel.com> Reviewed-on: https://review.coreboot.org/19491 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/intel/apollolake/include/soc/pci_ids.h4
-rw-r--r--src/soc/intel/apollolake/uart.c26
2 files changed, 2 insertions, 28 deletions
diff --git a/src/soc/intel/apollolake/include/soc/pci_ids.h b/src/soc/intel/apollolake/include/soc/pci_ids.h
index 8e1ac9f5cf..25e7f94157 100644
--- a/src/soc/intel/apollolake/include/soc/pci_ids.h
+++ b/src/soc/intel/apollolake/include/soc/pci_ids.h
@@ -35,10 +35,6 @@
#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 */
diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c
index 70d034f6cd..3db460a999 100644
--- a/src/soc/intel/apollolake/uart.c
+++ b/src/soc/intel/apollolake/uart.c
@@ -20,14 +20,12 @@
* shouldn't cause any fragmentation.
*/
-#include <console/uart.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <soc/pci_ids.h>
+#include <intelblocks/uart.h>
#include <soc/pci_devs.h>
-static void aplk_uart_read_resources(struct device *dev)
+void pch_uart_read_resources(struct device *dev)
{
pci_dev_read_resources(dev);
@@ -39,23 +37,3 @@ static void aplk_uart_read_resources(struct device *dev)
CONFIG_CONSOLE_UART_BASE_ADDRESS >> 10, 4, 0);
}
}
-
-static struct device_operations uart_ops = {
- .read_resources = aplk_uart_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = pci_dev_init,
- .enable = DEVICE_NOOP
-};
-
-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,
- 0
-};
-
-static const struct pci_driver uart_driver __pci_driver = {
- .ops = &uart_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .devices = uart_ids
-};