| Message ID | 1449545956-2772-15-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 2b27d205290b43418c7f51026915782551f03e6b |
| Delegated to: | Bin Meng |
| Headers | show |
Hi Simon, On Tue, Dec 8, 2015 at 11:38 AM, Simon Glass <sjg@chromium.org> wrote: > 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> > --- > > arch/x86/cpu/ivybridge/bd82x6x.c | 2 +- > arch/x86/cpu/ivybridge/lpc.c | 2 +- > arch/x86/include/asm/arch-ivybridge/pch.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c > index fce6622..2222fb5 100644 > --- a/arch/x86/cpu/ivybridge/bd82x6x.c > +++ b/arch/x86/cpu/ivybridge/bd82x6x.c > @@ -69,7 +69,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 b3cc32d..f124de6 100644 > --- a/arch/x86/cpu/ivybridge/lpc.c > +++ b/arch/x86/cpu/ivybridge/lpc.c > @@ -547,7 +547,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 73309be..76d3c58 100644 > --- a/arch/x86/include/asm/arch-ivybridge/pch.h > +++ b/arch/x86/include/asm/arch-ivybridge/pch.h > @@ -460,7 +460,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 > -- The same comments as PCH, why can't we call lpc_init() in LPC's probe routine? Regards, Bin
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index fce6622..2222fb5 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -69,7 +69,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 b3cc32d..f124de6 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -547,7 +547,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 73309be..76d3c58 100644 --- a/arch/x86/include/asm/arch-ivybridge/pch.h +++ b/arch/x86/include/asm/arch-ivybridge/pch.h @@ -460,7 +460,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
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> --- arch/x86/cpu/ivybridge/bd82x6x.c | 2 +- arch/x86/cpu/ivybridge/lpc.c | 2 +- arch/x86/include/asm/arch-ivybridge/pch.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)