Change in coreboot[master]: soc/intel/cannonlake: Make use of Intel SPI common block

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/22362

Change subject: soc/intel/cannonlake: Make use of Intel SPI common block
......................................................................

soc/intel/cannonlake: Make use of Intel SPI common block

TEST=Build and boot RVP

Change-Id: I5ff9867f08e43016a797b1b3719053df0c382174
Signed-off-by: Subrata Banik 
---
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/cannonlake/Makefile.inc
D src/soc/intel/cannonlake/spi.c
3 files changed, 1 insertion(+), 77 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/22362/1

diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 92aad28..36ea922 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -65,6 +65,7 @@
    select SOC_INTEL_COMMON_BLOCK_SMBUS
    select SOC_INTEL_COMMON_BLOCK_SMM
    select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP
+	select SOC_INTEL_COMMON_BLOCK_SPI
    select SOC_INTEL_COMMON_BLOCK_TIMER
    select SOC_INTEL_COMMON_BLOCK_UART
    select SOC_INTEL_COMMON_SPI_FLASH_PROTECT
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc
index de137f6..93cc457 100644
--- a/src/soc/intel/cannonlake/Makefile.inc
+++ b/src/soc/intel/cannonlake/Makefile.inc
@@ -17,7 +17,6 @@
 bootblock-y += gspi.c
 bootblock-y += i2c.c
 bootblock-y += memmap.c
-bootblock-y += spi.c
 bootblock-$(CONFIG_UART_DEBUG) += uart.c

romstage-y += gpio.c
@@ -26,7 +25,6 @@
 romstage-y += memmap.c
 romstage-y += pmutil.c
 romstage-y += reset.c
-romstage-y += spi.c
 romstage-$(CONFIG_UART_DEBUG) += uart.c

ramstage-y += acpi.c
@@ -44,7 +42,6 @@
 ramstage-y += pmutil.c
 ramstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c
 ramstage-y += smmrelocate.c
-ramstage-y += spi.c
 ramstage-y += systemagent.c
 ramstage-$(CONFIG_UART_DEBUG) += uart.c
 ramstage-$(CONFIG_UART_DEBUG) += uart_pch.c
@@ -54,19 +51,16 @@
 smm-y += gpio.c
 smm-y += pmutil.c
 smm-y += smihandler.c
-smm-$(CONFIG_SPI_FLASH_SMM) += spi.c
 smm-$(CONFIG_UART_DEBUG) += uart.c
 smm-$(CONFIG_UART_DEBUG) += uart_pch.c

postcar-y += memmap.c
 postcar-y += pmutil.c
-postcar-y += spi.c
 postcar-$(CONFIG_UART_DEBUG) += uart.c

verstage-y += gspi.c
 verstage-y += i2c.c
 verstage-y += pmutil.c
-verstage-y += spi.c
 verstage-$(CONFIG_UART_DEBUG) += uart.c

CPPFLAGS_common += -I$(src)/soc/intel/cannonlake/include/fsp20
diff --git a/src/soc/intel/cannonlake/spi.c b/src/soc/intel/cannonlake/spi.c
deleted file mode 100644
index 1d65dee..0000000
--- a/src/soc/intel/cannonlake/spi.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2017 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <device/spi.h>
-#include <intelblocks/fast_spi.h>
-#include <intelblocks/gspi.h>
-#include <soc/ramstage.h>
-#include <soc/pci_devs.h>
-#include <spi-generic.h>
-
-const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
-	{ .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 },
-#if !ENV_SMM
-	{ .ctrlr = &gspi_ctrlr, .bus_start = 1,
-	  .bus_end =  1 + (CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX - 1)},
-#endif
-};
-
-const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);
-
-#if ENV_RAMSTAGE
-
-static int spi_dev_to_bus(struct device *dev)
-{
-	return spi_devfn_to_bus(dev->path.pci.devfn);
-}
-
-static struct spi_bus_operations spi_bus_ops = {
-	.dev_to_bus			= &spi_dev_to_bus,
-};
-
-static struct device_operations spi_dev_ops = {
-	.read_resources			= &pci_dev_read_resources,
-	.set_resources			= &pci_dev_set_resources,
-	.enable_resources		= &pci_dev_enable_resources,
-	.scan_bus			= &scan_generic_bus,
-	.ops_spi_bus			= &spi_bus_ops,
-};
-
-static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_CNL_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_CNL_SPI0,
-	PCI_DEVICE_ID_INTEL_CNL_SPI1,
-	PCI_DEVICE_ID_INTEL_CNL_SPI2,
-	0
-};
-
-static const struct pci_driver pch_spi __pci_driver = {
-	.ops				= &spi_dev_ops,
-	.vendor				= PCI_VENDOR_ID_INTEL,
-	.devices			= pci_device_ids,
-};
-#endif