Patch set updated for coreboot: b2c695f nehalem: Simplify acpi.c by using __SIMPLE_DEVICE__

[Vladimir Serbinenko]

Vladimir Serbinenko ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4603

-gerrit

commit b2c695fca59e0781f4b5513cb05dd04eda11fe46
Author: Vladimir Serbinenko 
Date:   Thu Jan 2 10:10:14 2014 +0100

nehalem: Simplify acpi.c by using __SIMPLE_DEVICE__

Change-Id: I93351a2716cd58c2006400cecca1390b1704e94b
    Signed-off-by: Vladimir Serbinenko 
---
 src/northbridge/intel/nehalem/acpi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/northbridge/intel/nehalem/acpi.c b/src/northbridge/intel/nehalem/acpi.c
index df6cc1a..3ed6fd2 100644
--- a/src/northbridge/intel/nehalem/acpi.c
+++ b/src/northbridge/intel/nehalem/acpi.c
@@ -21,6 +21,8 @@
  * MA 02110-1301 USA
  */

+#define __SIMPLE_DEVICE__
+
 #include <types.h>
 #include <string.h>
 #include <console/console.h>
@@ -38,10 +40,8 @@ unsigned long acpi_fill_mcfg(unsigned long current)
    u32 pciexbar_reg;
    int max_buses;

-	/* Quickpath bus is not in standard coreboot device tree,
-	   so read register directly.  */
-	pciexbar_reg = read32(DEFAULT_PCIEXBAR
-			      | (QUICKPATH_BUS << 20) | 0x1050);
+	pciexbar_reg =
+	    pci_read_config32 (PCI_DEV (QUICKPATH_BUS, 0, 1), 0x50);

// MMCFG not supported or not enabled.
    if (!(pciexbar_reg & (1 << 0)))
@@ -173,7 +173,7 @@ int init_igd_opregion(igd_opregion_t * opregion)
    /* TODO This needs to happen in S3 resume, too.
     * Maybe it should move to the finalize handler
     */
-	igd = dev_find_slot(0, PCI_DEVFN(0x2, 0));
+	igd = PCI_DEV (0, 0x2, 0);

pci_write_config32(igd, ASLS, (u32) opregion);
    reg16 = pci_read_config16(igd, SWSCI);