diff options
| author | Subrata Banik <subrata.banik@intel.com> | 2018-05-22 16:18:16 +0530 |
|---|---|---|
| committer | Subrata Banik <subrata.banik@intel.com> | 2018-05-27 01:48:21 +0000 |
| commit | 98376b84592aea85089f047957c39b3889136574 (patch) | |
| tree | d4356426011f236163a3c8901e6662a88dc854c3 /src/soc/intel | |
| parent | 8173ad1ed79e6d191c5ed7d4a06c20d0536b485b (diff) | |
soc/intel/cannonlake: Select common XHCI code
This patch select CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI to include
common xhci code block.
BUG=b:78109109
BRANCH=none
TEST=Build and boot cnlrvp
Change-Id: I7f1e59792159dae5835fbbe7fcb1604fc01893ba
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/26465
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/cannonlake/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/chip.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/common/block/xhci/xhci.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 92b0af05bc..a095fb9f1f 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -72,6 +72,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_BLOCK_TIMER select SOC_INTEL_COMMON_BLOCK_UART select SOC_INTEL_COMMON_BLOCK_XDCI + select SOC_INTEL_COMMON_BLOCK_XHCI select SOC_INTEL_COMMON_NHLT select SOC_INTEL_COMMON_RESET select SSE2 diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index b64d804d61..fd9ce526f5 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -20,6 +20,7 @@ #include <device/pci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <intelblocks/acpi.h> #include <intelblocks/xdci.h> #include <romstage_handoff.h> #include <soc/intel/common/vbt.h> @@ -28,7 +29,7 @@ #include <string.h> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) -static const char *soc_acpi_name(const struct device *dev) +const char *soc_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index d76426211c..c38d19f034 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -31,7 +31,9 @@ static struct device_operations usb_xhci_ops = { .init = soc_xhci_init, .ops_pci = &pci_dev_ops_pci, .scan_bus = &scan_usb_bus, +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, +#endif }; static const unsigned short pci_device_ids[] = { |