From ee09878f4520e04547757d5af9e597d44f9c82db Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Mon, 30 Jul 2018 12:05:22 -0700 Subject: [PATCH] soc/amd/stoneyridge/lpc.c: Fix LPC host control naming 2 bits of LPC host control were originally not public, and wrongly identified as IMC related. Now that the bits are available in public BKDG, fix the naming of the bits. BUG=b:111912080 TEST=build and boot grunt. Change-Id: I1921f46c6be54eda6329c98267cec27004caadd5 Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/27744 Reviewed-by: Marshall Dawson Tested-by: build bot (Jenkins) --- src/soc/amd/stoneyridge/include/soc/southbridge.h | 4 ++-- src/soc/amd/stoneyridge/lpc.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h index ece78b625e..15c95813ee 100644 --- a/src/soc/amd/stoneyridge/include/soc/southbridge.h +++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h @@ -213,8 +213,8 @@ #define SPI_FROM_USB_PREFETCH_EN BIT(23) #define LPC_HOST_CONTROL 0xbb -#define IMC_PAGE_FROM_HOST_EN BIT(0) -#define IMC_PORT_FROM_HOST_EN BIT(3) +#define PREFETCH_EN_SPI_FROM_HOST BIT(0) +#define T_START_ENH BIT(3) /* SPI Controller */ #define SPI_CNTRL0 0x00 diff --git a/src/soc/amd/stoneyridge/lpc.c b/src/soc/amd/stoneyridge/lpc.c index 4bf5a4f1b4..6833db6a8a 100644 --- a/src/soc/amd/stoneyridge/lpc.c +++ b/src/soc/amd/stoneyridge/lpc.c @@ -76,12 +76,11 @@ static void lpc_init(struct device *dev) pci_write_config8(dev, LPC_MISC_CONTROL_BITS, byte); /* - * IMC is not used, but some of its registers and ports need to be - * programmed/accessed. So enable CPU access to them. This fixes - * SPI_CS# timing issue when running at 66MHz. + * Enable hand-instance of the pulse generator and SPI + * controller prefetch of flash. */ byte = pci_read_config8(dev, LPC_HOST_CONTROL); - byte |= IMC_PAGE_FROM_HOST_EN | IMC_PORT_FROM_HOST_EN; + byte |= PREFETCH_EN_SPI_FROM_HOST | T_START_ENH; pci_write_config8(dev, LPC_HOST_CONTROL, byte); cmos_check_update_date();