[coreboot-gerrit] Change in coreboot[master]: soc/intel/apollolake: Use XDCI common code
Subrata Banik (Code Review)
gerrit at coreboot.org
Mon Apr 24 08:29:07 CEST 2017
Subrata Banik has uploaded a new change for review. ( https://review.coreboot.org/19429 )
Change subject: soc/intel/apollolake: Use XDCI common code
......................................................................
soc/intel/apollolake: Use XDCI common code
This patch performs apollolake specific XDCI
controller initialization.
Change-Id: I4649bffe1bb90d7df6a72b5334793bf8f0fdbaeb
Signed-off-by: Subrata Banik <subrata.banik at intel.com>
---
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/apollolake/xdci.c
2 files changed, 7 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/19429/1
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index acc6ff2..45d0e82 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -59,6 +59,7 @@
select SOC_INTEL_COMMON_BLOCK_RTC
select SOC_INTEL_COMMON_BLOCK_SA
select SOC_INTEL_COMMON_BLOCK_UART
+ select SOC_INTEL_COMMON_BLOCK_XDCI
select SOC_INTEL_COMMON_BLOCK_XHCI
select SOC_INTEL_COMMON_LPSS_I2C
select SOC_INTEL_COMMON_SMI
diff --git a/src/soc/intel/apollolake/xdci.c b/src/soc/intel/apollolake/xdci.c
index 22abec9..2578fa0 100644
--- a/src/soc/intel/apollolake/xdci.c
+++ b/src/soc/intel/apollolake/xdci.c
@@ -17,9 +17,8 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ids.h>
+#include <intelblocks/xdci.h>
#include <soc/pci_devs.h>
-#include <soc/pci_ids.h>
#include <timer.h>
#define DUAL_ROLE_CFG0 0x80d8
@@ -48,19 +47,19 @@
const struct resource *res;
uint32_t reg;
struct stopwatch sw;
- struct device *xhci_dev = PCH_DEV_XHCI;
+ struct device *xdci_dev = PCH_DEV_XDCI;
/*
* Only default to host mode if the xdci device is present and
* enabled. If it's disabled assume the switch was already done
* in FSP.
*/
- if (!dev->enabled || !xhci_dev->enabled)
+ if (!dev->enabled || !xdci_dev->enabled)
return;
printk(BIOS_INFO, "Putting port 0 into host mode.\n");
- res = find_resource(xhci_dev, PCI_BASE_ADDRESS_0);
+ res = find_resource(xdci_dev, PCI_BASE_ADDRESS_0);
cfg0 = (void *)(uintptr_t)(res->base + DUAL_ROLE_CFG0);
cfg1 = (void *)(uintptr_t)(res->base + DUAL_ROLE_CFG1);
@@ -82,24 +81,12 @@
}
}
- printk(BIOS_INFO, "XHCI port 0 host switch over took %lu ms\n",
+ printk(BIOS_INFO, "XDCI port 0 host switch over took %lu ms\n",
stopwatch_duration_msecs(&sw));
}
-static void xdci_init(struct device *dev)
+void soc_xdci_init(struct device *dev)
{
configure_host_mode_port0(dev);
}
-static const struct device_operations device_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = xdci_init,
-};
-
-static const struct pci_driver pmc __pci_driver = {
- .ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_APOLLOLAKE_XDCI,
-};
--
To view, visit https://review.coreboot.org/19429
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4649bffe1bb90d7df6a72b5334793bf8f0fdbaeb
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Subrata Banik <subrata.banik at intel.com>
More information about the coreboot-gerrit
mailing list