]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hose
authorZhao Chenhui <chenhui.zhao@freescale.com>
Wed, 24 Aug 2011 05:20:04 +0000 (13:20 +0800)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 9 Sep 2011 13:58:11 +0000 (08:58 -0500)
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>
board/freescale/mpc8548cds/mpc8548cds.c

index f5c799b9f9d6ebd38736bb626ec75fe6e23d9016..5ffae47d74583e011356bc1a5ca3888961074bb7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004, 2007, 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2004, 2007, 2009-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
  *
@@ -207,8 +207,7 @@ static struct pci_config_table pci_mpc85xxcds_config_table[] = {
        {},
 };
 
-static struct pci_controller pci1_hose = {
-       config_table: pci_mpc85xxcds_config_table};
+static struct pci_controller pci1_hose;
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_PCI2
@@ -253,6 +252,7 @@ void pci_init_board(void)
                        pci_arb ? "arbiter" : "external-arbiter",
                        pci_info.regs);
 
+               pci1_hose.config_table = pci_mpc85xxcds_config_table;
                first_free_busno = fsl_pci_init_port(&pci_info,
                                        &pci1_hose, first_free_busno);