commit 0eabe139e55e94bbd7c49f81248dd7eabdcf2a4b
author Furquan Shaikh <furquan@google.com> Tue Apr 28 21:57:07 2020 -0700
committer Furquan Shaikh <furquan@google.com> Thu Apr 30 21:00:23 2020 +0000
tree 93a450024e38572b919ec1a282bed94cdf6aa372
parent 69c2811acc685f1d46aff081583af039388f7aab

soc/amd/picasso: Add support for em100

This change enables support for em100 for Picasso platform. Since
em100 requires lower SPI speed, this change configures speed in all
modes as 16MHz.

BUG=b:147758054,b:153675510
BRANCH=trembyle-bringup
TEST=Verified that em100 works fine on trembyle.

Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: Ib5ea1fe094fda9b8dba63e94b37e61791629564f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40825
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/amd/picasso/Kconfig

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index fa053f9..5996cc6 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -21,6 +21,7 @@
 	select DRIVERS_I2C_DESIGNWARE
 	select GENERIC_GPIO_LIB
 	select IOAPIC
+	select HAVE_EM100_SUPPORT
 	select HAVE_USBDEBUG_OPTIONS
 	select TSC_MONOTONIC_TIMER
 	select SOC_AMD_COMMON_BLOCK_SPI

src/soc/amd/picasso/southbridge.c

diff --git a/src/soc/amd/picasso/southbridge.c b/src/soc/amd/picasso/southbridge.c
index 4f25802..d37f143 100644
--- a/src/soc/amd/picasso/southbridge.c
+++ b/src/soc/amd/picasso/southbridge.c
@@ -236,7 +236,7 @@
 	write32((void *)(base + SPI_CNTRL0), val | SPI_READ_MODE(mode));
 }
 
-static void sb_spi_config_modes(void)
+static void sb_spi_config_mb_modes(void)
 {
 	const struct soc_amd_picasso_config *cfg = config_of_soc();
 
@@ -245,6 +245,20 @@
 		      cfg->spi_tpm_speed);
 }
 
+static void sb_spi_config_em100_modes(void)
+{
+	sb_read_mode(SPI_READ_MODE_NORMAL33M);
+	sb_set_spi100(SPI_SPEED_16M, SPI_SPEED_16M, SPI_SPEED_16M, SPI_SPEED_16M);
+}
+
+static void sb_spi_config_modes(void)
+{
+	if (CONFIG(EM100))
+		sb_spi_config_em100_modes();
+	else
+		sb_spi_config_mb_modes();
+}
+
 static void sb_spi_init(void)
 {
 	lpc_enable_spi_prefetch();