Patch set updated for coreboot: soc/intel/skylake: Use intel/common/xhci driver

[Subrata Banik]

Subrata Banik ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18223

-gerrit

commit 4b82f3cad36da4c15589649f17e6eb28eb4b3900
Author: Subrata Banik 
Date:   Tue Jan 24 18:56:12 2017 +0530

soc/intel/skylake: Use intel/common/xhci driver

Change-Id: I7bd83d293fcc1848f6f64526d8f38d010c1f69a3
    Signed-off-by: Subrata Banik 
---
 src/soc/intel/skylake/Kconfig      |  1 +
 src/soc/intel/skylake/Makefile.inc |  2 +-
 src/soc/intel/skylake/xhci.c       | 43 --------------------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 24c2e30..4fca67e 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -45,6 +45,7 @@ config CPU_SPECIFIC_OPTIONS
    select SOC_INTEL_COMMON_NHLT
    select SOC_INTEL_COMMON_RESET
    select SOC_INTEL_COMMON_SPI_FLASH_PROTECT
+	select SOC_INTEL_XHCI_DRIVER
    select SMM_TSEG
    select SMP
    select SSE2
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 4b6fcfc..6ae5897 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -8,6 +8,7 @@ subdirs-y += ../../../cpu/x86/lapic
 subdirs-y += ../../../cpu/x86/mtrr
 subdirs-y += ../../../cpu/x86/smm
 subdirs-y += ../../../cpu/x86/tsc
+subdirs-y += ../common/block/*

bootblock-y += bootblock/bootblock.c
 bootblock-y += bootblock/cache_as_ram.S
@@ -90,7 +91,6 @@ ramstage-y += tsc_freq.c
 ramstage-y += uart.c
 ramstage-$(CONFIG_UART_DEBUG) += uart_debug.c
 ramstage-y += vr_config.c
-ramstage-y += xhci.c

smm-y += cpu_info.c
 smm-y += gpio.c
diff --git a/src/soc/intel/skylake/xhci.c b/src/soc/intel/skylake/xhci.c
deleted file mode 100644
index 6b4a19a..0000000
--- a/src/soc/intel/skylake/xhci.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Google Inc.
- * Copyright (C) 2015 Intel Corporation.
- *
- * 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; version 2 of the License.
- *
- * 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 <delay.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <soc/ramstage.h>
-#include <soc/xhci.h>
-#include <soc/cpu.h>
-
-static struct device_operations usb_xhci_ops = {
-	.read_resources		= &pci_dev_read_resources,
-	.set_resources		= &pci_dev_set_resources,
-	.enable_resources	= &pci_dev_enable_resources,
-	.ops_pci		= &soc_pci_ops,
-};
-
-static const unsigned short pci_device_ids[] = {
-	0x9d2f, /* SunRisePoint LP */
-	0
-};
-
-static const struct pci_driver pch_usb_xhci __pci_driver = {
-	.ops	 = &usb_xhci_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
-	.devices = pci_device_ids,
-};