summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Chenhui <chenhui.zhao@freescale.com>2011-08-24 13:20:05 +0800
committerKumar Gala <galak@kernel.crashing.org>2011-09-09 08:58:10 -0500
commitb092072e4780c1b1aaf5579e7bf887ebf0ccbdc0 (patch)
tree00d5560a95d2d1db4f957c9b06e8457713edb113
parent49ea2e342b6b9c35623915125e4e0af734cfa594 (diff)
downloadu-boot-imx-b092072e4780c1b1aaf5579e7bf887ebf0ccbdc0.zip
u-boot-imx-b092072e4780c1b1aaf5579e7bf887ebf0ccbdc0.tar.gz
u-boot-imx-b092072e4780c1b1aaf5579e7bf887ebf0ccbdc0.tar.bz2
powerpc/mpc8568mds: 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/mpc8568mds/mpc8568mds.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 5cda81c..225c5d8 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
*
@@ -259,11 +259,7 @@ static struct pci_config_table pci_mpc8568mds_config_table[] = {
};
#endif
-static struct pci_controller pci1_hose = {
-#ifndef CONFIG_PCI_PNP
- config_table: pci_mpc8568mds_config_table,
-#endif
-};
+static struct pci_controller pci1_hose;
#endif /* CONFIG_PCI */
/*
@@ -347,6 +343,9 @@ void pci_init_board(void)
pci_arb ? "arbiter" : "external-arbiter",
pci_info.regs);
+#ifndef CONFIG_PCI_PNP
+ pci1_hose.config_table = pci_mpc8568mds_config_table;
+#endif
first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno);
} else {