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/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 44c4825..79224d9 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -538,7 +538,7 @@
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 @@
{
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[] = {