Leroy P Leahy (leroy.p.leahy@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13734
-gerrit
commit e5ae7bad2b0d94a27df325ce0ce8d54239f87d91 Author: Lee Leahy leroy.p.leahy@intel.com Date: Wed Feb 17 08:47:58 2016 -0800
soc/intel/quark: Use single ID value for HSUART1
Use single ID value for HSUART1.
Testing on Galileo: * Edit the src/mainboard/intel/galileo/Makefile.inc file * Add "select ADD_FSP_PDAT_FILE" * Add "select ADD_FSP_RAW_BIN" * Add "select ADD_RMU_FILE" * Place the FSP.bin file in the location specified by CONFIG_FSP_FILE * Place the pdat.bin files in the location specified by CONFIG_FSP_PDAT_FILE * Place the rmu.bin file in the location specified by CONFIG_RMU_FILE * Testing successful if: * Debug serial output stays enabled after BS_DEV_RESOURCES state
Change-Id: I38eca247f151e67c2b243a8a3bb21d9d1f4603de Signed-off-by: Lee Leahy leroy.p.leahy@intel.com --- src/soc/intel/quark/include/soc/pci_devs.h | 2 ++ src/soc/intel/quark/uart.c | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h index 4ab23b9..d776e1e 100644 --- a/src/soc/intel/quark/include/soc/pci_devs.h +++ b/src/soc/intel/quark/include/soc/pci_devs.h @@ -25,6 +25,8 @@ #define MC_BDF PCI_DEV(PCI_BUS_NUMBER_QNC, MC_DEV, MC_FUN)
/* IO Fabric 1 */ +#define HSUART_DEVID 0x0936 + #define SIO1_DEV 0x14 # define HSUART1_DEV SIO1_DEV # define HSUART1_FUNC 5 diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c index b97fcea..b4af08e 100644 --- a/src/soc/intel/quark/uart.c +++ b/src/soc/intel/quark/uart.c @@ -19,6 +19,7 @@ #include <device/pci.h> #include <device/pci_def.h> #include <device/pci_ids.h> +#include <soc/pci_devs.h>
static void uart_read_resources(device_t dev) { @@ -40,13 +41,8 @@ static struct device_operations device_ops = { .enable_resources = &pci_dev_enable_resources, };
-static const unsigned short uart_ids[] = { - 0x0936, /* HSUART0, HSUART1 */ - 0 -}; - static const struct pci_driver uart_driver __pci_driver = { - .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .devices = uart_ids, + .ops = &device_ops, + .vendor = PCI_VENDOR_ID_INTEL, + .device = HSUART_DEVID, };