x86: ivybridge: Move LPC init into the LPC probe() method

Drop the lpc_init_extra() function and just use the post-relocation LPC
probe() instead.

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 9e7e30aa11aba9ca715b104f00495c5ed54acc88..5cb41521e15a5230044e17f02cafb168f233f56d 100644 (file)
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -21,16 +21,12 @@
 static int bd82x6x_probe(struct udevice *dev)
 {
        const void *blob = gd->fdt_blob;
-       struct pci_controller *hose;
        int gma_node;
        int ret;
 
        if (!(gd->flags & GD_FLG_RELOC))
                return 0;
 
-       hose = pci_bus_to_hose(0);
-       lpc_init_extra(hose, PCH_LPC_DEV);
-
        /* Cause the SATA device to do its init */
        uclass_first_device(UCLASS_DISK, &dev);
 

diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 44c4825f134380f323b12c0af2fd7818239b378f..79224d93881bccee1bd6621c857c762d59c3f87c 100644 (file)
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -538,7 +538,7 @@ static int lpc_early_init(struct udevice *dev)
        return 0;
 }
 
-int lpc_init_extra(struct pci_controller *hose, pci_dev_t dev)
+static int lpc_init_extra(struct pci_controller *hose, pci_dev_t dev)
 {
        const void *blob = gd->fdt_blob;
        int node;
@@ -626,16 +626,17 @@ static int bd82x6x_lpc_probe(struct udevice *dev)
 {
        int ret;
 
-       if (gd->flags & GD_FLG_RELOC)
-               return 0;
+       if (!(gd->flags & GD_FLG_RELOC)) {
+               ret = lpc_early_init(dev);
+               if (ret) {
+                       debug("%s: lpc_early_init() failed\n", __func__);
+                       return ret;
+               }
 
-       ret = lpc_early_init(dev);
-       if (ret) {
-               debug("%s: lpc_early_init() failed\n", __func__);
-               return ret;
+               return bd82x6x_lpc_early_init(dev);
        }
 
-       return bd82x6x_lpc_early_init(dev);
+       return lpc_init_extra(pci_bus_to_hose(0), PCH_LPC_DEV);
 }
 
 static const struct udevice_id bd82x6x_lpc_ids[] = {

diff --git a/arch/x86/include/asm/arch-ivybridge/pch.h b/arch/x86/include/asm/arch-ivybridge/pch.h
index 682a557fbd7c8a07368b737988314ad15b6b5253..629a1448169d7a46431e1b9619741875ce175ea9 100644 (file)
--- a/arch/x86/include/asm/arch-ivybridge/pch.h
+++ b/arch/x86/include/asm/arch-ivybridge/pch.h
@@ -470,6 +470,4 @@ void pch_iobp_update(u32 address, u32 andvalue, u32 orvalue);
 #define   DMISCI_STS   (1 << 9)
 #define TCO2_STS       0x66
 
-int lpc_init_extra(struct pci_controller *hose, pci_dev_t dev);
-
 #endif