soc/intel/common: Provide common block fast_spi_flash_ctrlr

Now that we have a common block driver for fast spi flash controller,
provide spi_ctrlr structure that can be used by different platforms
for defining the bus-ctrlr mapping. Only cs 0 is considered valid.

Change-Id: I7228ae885018d1e23e6e80dd8ce227b0d99d84a6
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19575
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 2 insertions, 19 deletions

diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c
index 87d4d01241..9a651ee048 100644
--- a/src/soc/intel/apollolake/spi.c
+++ b/src/soc/intel/apollolake/spi.c
@@ -15,28 +15,11 @@
  */
 
 #include <console/console.h>
+#include <intelblocks/fast_spi.h>
 #include <spi-generic.h>
 
-/* SPI controller managing the fast SPI. */
-static int fast_spi_ctrlr_setup(const struct spi_slave *dev)
-{
-	if ((dev->bus != 0) && (dev->cs != 0)) {
-		printk(BIOS_ERR, "%s: Unsupported device "
-		       "bus=0x%x,cs=0x%x!\n", __func__, dev->bus, dev->cs);
-		return -1;
-	}
-
-	printk(BIOS_INFO, "%s: Found controller for device "
-	       "(bus=0x%x,cs=0x%x)!!\n", __func__, dev->bus, dev->cs);
-	return 0;
-}
-
-static const struct spi_ctrlr fast_spi_ctrlr = {
-	.setup = fast_spi_ctrlr_setup,
-};
-
 const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
-	{ .ctrlr = &fast_spi_ctrlr, .bus_start = 0, .bus_end = 0 },
+	{ .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 },
 };
 
 const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);