x86: ivybridge: Rename bd82x6x_init()

Rename the existing bd82x6x_init() to bd82x6x_init_extra(). We will remove
this in a later patch.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 72f2ed4d712c929210450ff6d5383eaed899cbc5..6556eeb11d01e85e19ddef99b7b48d9315506721 100644 (file)
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -102,7 +102,7 @@ static int bd82x6x_probe(struct udevice *dev)
 }
 
 /* TODO(sjg@chromium.org): Move this to the PCH init() method */
-int bd82x6x_init(void)
+int bd82x6x_init_extra(void)
 {
        const void *blob = gd->fdt_blob;
        int sata_node;

diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 1e6f656685fe58ba5d507e48c53f875d3c952d60..2a15fc02205c7562bc6138a6f077f2db2363bd1a 100644 (file)
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <pch.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
@@ -211,6 +212,7 @@ int print_cpuinfo(void)
 {
        enum pei_boot_mode_t boot_mode = PEI_BOOT_NONE;
        char processor_name[CPU_MAX_NAME_LEN];
+       struct udevice *dev;
        const char *name;
        uint32_t pm1_cnt;
        uint16_t pm1_sts;
@@ -241,6 +243,12 @@ int print_cpuinfo(void)
        }
 
        /* Early chipset init required before RAM init can work */
+       ret = uclass_first_device(UCLASS_PCH, &dev);
+       if (ret)
+               return ret;
+       if (!dev)
+               return -ENODEV;
+
        sandybridge_early_init(SANDYBRIDGE_MOBILE);
 
        /* Check PM1_STS[15] to see if we are waking from Sx */

diff --git a/arch/x86/cpu/ivybridge/pci.c b/arch/x86/cpu/ivybridge/pci.c
index 5e90f30e08b03069de53e49779fa2e6223b08e94..8af99b44474887bc39115a7534cf65d750c14b84 100644 (file)
--- a/arch/x86/cpu/ivybridge/pci.c
+++ b/arch/x86/cpu/ivybridge/pci.c
@@ -26,7 +26,7 @@ static int pci_ivybridge_probe(struct udevice *bus)
        if (!(gd->flags & GD_FLG_RELOC))
                return 0;
        post_code(0x50);
-       bd82x6x_init();
+       bd82x6x_init_extra();
        post_code(0x51);
 
        reg16 = 0xff;

diff --git a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h b/arch/x86/include/asm/arch-ivybridge/bd82x6x.h
index fcdf6e26cbb2ef6b66cfe710c920388bc6242c30..d76cb8dd7894a736b797c6803fe4d74a9d5d2ccd 100644 (file)
--- a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h
+++ b/arch/x86/include/asm/arch-ivybridge/bd82x6x.h
@@ -13,7 +13,7 @@ void bd82x6x_pci_init(pci_dev_t dev);
 void bd82x6x_usb_ehci_init(pci_dev_t dev);
 void bd82x6x_usb_xhci_init(pci_dev_t dev);
 int gma_func0_init(struct udevice *dev, const void *blob, int node);
-int bd82x6x_init(void);
+int bd82x6x_init_extra(void);
 
 /**
  * struct x86_cpu_priv - Information about a single CPU