Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Simon Glass 2016-01-17 16:11:40 -07:00 committed by Bin Meng
parent 865c24eea1
commit 4e19072907
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/cpu/ivybridge/bd82x6x.c
View file

@ -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);

17
arch/x86/cpu/ivybridge/lpc.c
View file

@ -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[] = {

2
arch/x86/include/asm/arch-ivybridge/pch.h
View file

@ -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