summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Chenhui <chenhui.zhao@freescale.com>2011-08-24 13:20:06 +0800
committerKumar Gala <galak@kernel.crashing.org>2011-09-09 08:58:11 -0500
commitd5c784ed537fa774deefa76ebe3b726728d144e1 (patch)
tree0eb9cc0e1508890945da7f9511f43a1276605452
parentb813cbe916f2ac5869b01cf19db49d1f542274bd (diff)
downloadu-boot-imx-d5c784ed537fa774deefa76ebe3b726728d144e1.zip
u-boot-imx-d5c784ed537fa774deefa76ebe3b726728d144e1.tar.gz
u-boot-imx-d5c784ed537fa774deefa76ebe3b726728d144e1.tar.bz2
powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose
The function fsl_setup_hose clears the variable pci1_hose. Set pci1_hose.config_table after it. Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/freescale/mpc8610hpcd/mpc8610hpcd.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 8aceddb..1854e27 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -227,11 +227,7 @@ static struct pci_config_table pci_fsl86xxads_config_table[] = {
#endif
-static struct pci_controller pci1_hose = {
-#ifndef CONFIG_PCI_PNP
-config_table:pci_mpc86xxcts_config_table
-#endif
-};
+static struct pci_controller pci1_hose;
#endif /* CONFIG_PCI */
void pci_init_board(void)
@@ -261,6 +257,9 @@ void pci_init_board(void)
" (base address %lx)\n",
pci_agent ? "Agent" : "Host",
pci_info.regs);
+#ifndef CONFIG_PCI_PNP
+ pci1_hose.config_table = pci_mpc86xxcts_config_table;
+#endif
first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno);
} else {