From eb2eedf6f7d6ac1cff65ed8672701f6efd3b19dd Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 25 Oct 2013 09:12:45 -0500 Subject: baytrail: remove gfx read_resources() work around Before the special PUNIT settings the GFX pci device had the same device id as the transaction router. This required a special case in the transaction router's driver to do the proper thing for read_resources(). However, that requirement is no longer needed as the PUNIT special message is now being done. Therefore, remove the work around. BUG=None BRANCH=None TEST=Built and looked at resource allocation logs to confirm work around is no longer needed. Change-Id: I90b155cb5560ca3291f146c2f586456e5529f6b2 Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/174652 Reviewed-by: Duncan Laurie Reviewed-on: http://review.coreboot.org/4902 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/soc/intel/baytrail/northcluster.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c index 0616e5d168..714d532eef 100644 --- a/src/soc/intel/baytrail/northcluster.c +++ b/src/soc/intel/baytrail/northcluster.c @@ -64,7 +64,7 @@ */ #define RES_IN_KiB(r) ((r) >> 10) -static void soc_trans_router_read_resources(device_t dev) +static void nc_read_resources(device_t dev) { unsigned long mmconf; unsigned long bmbound; @@ -119,18 +119,6 @@ static void soc_trans_router_read_resources(device_t dev) bmbound_hi - four_gig_kib); } -static void nc_read_resources(device_t dev) -{ - /* For some reason the graphics pci device (0, 2, 0) and the SoC - * transaction router are coming up with the same device id. */ - if (dev_find_slot(0, PCI_DEVFN(SOC_DEV, SOC_FUNC)) == dev) - return soc_trans_router_read_resources(dev); - else - /* Read standard PCI resources. */ - pci_dev_read_resources(dev); - -} - static struct device_operations nc_ops = { .read_resources = nc_read_resources, .set_resources = NULL, -- cgit v1.2.3