x86: ivybridge: Rename lpc_init() to lpc_init_extra()

In preparation for adding an init() method to the LPC uclass, rename this
existing function so that it will not conflict.

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 6556eeb11d01e85e19ddef99b7b48d9315506721..c71596d0739995046fcbc04be76a617604023506 100644 (file)
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -70,7 +70,7 @@ static int bd82x6x_probe(struct udevice *dev)
 
        hose = pci_bus_to_hose(0);
        lpc_enable(PCH_LPC_DEV);
-       lpc_init(hose, PCH_LPC_DEV);
+       lpc_init_extra(hose, PCH_LPC_DEV);
        sata_node = fdtdec_next_compatible(blob, 0,
                                           COMPAT_INTEL_PANTHERPOINT_AHCI);
        if (sata_node < 0) {

diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 9dad9e4ee95c97d74c04a7d5931853ac7f737ed1..9f41f22850b4394ee4ade27e8858adb7e6c77f2e 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(struct pci_controller *hose, pci_dev_t dev)
+int lpc_init_extra(struct pci_controller *hose, pci_dev_t dev)
 {
        const void *blob = gd->fdt_blob;
        int node;

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