[U-Boot] [PATCH 1/3] powerpc/mpc8548cds: 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 --- board/freescale/mpc8548cds/mpc8548cds.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index f5c799b..5ffae47 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -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);
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 --- board/freescale/mpc8568mds/mpc8568mds.c | 11 +++++------ 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 {
On Aug 24, 2011, at 12:20 AM, Zhao Chenhui wrote:
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
board/freescale/mpc8568mds/mpc8568mds.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
applied to 85xx
- k
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 --- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 11 +++++------ 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 {
On Aug 24, 2011, at 12:20 AM, Zhao Chenhui wrote:
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
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
applied to 85xx
- k
On Aug 24, 2011, at 12:20 AM, Zhao Chenhui wrote:
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
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
applied to 85xx
- k
participants (3)
-
Kumar Gala -
Kumar Gala -
Zhao Chenhui