Signed-off-by: Kumar Gala galak@kernel.crashing.org --- board/atum8548/atum8548.c | 7 ------- board/freescale/mpc8536ds/mpc8536ds.c | 6 ------ board/freescale/mpc8544ds/mpc8544ds.c | 6 ------ board/freescale/mpc8548cds/mpc8548cds.c | 6 ------ board/freescale/mpc8568mds/mpc8568mds.c | 6 ------ board/freescale/mpc8569mds/mpc8569mds.c | 6 ------ board/freescale/mpc8572ds/mpc8572ds.c | 6 ------ board/freescale/mpc8610hpcd/mpc8610hpcd.c | 6 ------ board/freescale/mpc8641hpcn/mpc8641hpcn.c | 6 ------ board/sbc8548/sbc8548.c | 6 ------ board/sbc8641d/sbc8641d.c | 6 ------ board/tqc/tqm85xx/tqm85xx.c | 6 ------ board/xes/common/fsl_85xx_pci.c | 7 ------- include/asm-ppc/fsl_pci.h | 12 +++++++++--- 14 files changed, 9 insertions(+), 83 deletions(-)
diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index 3e5da08..c8085c7 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -172,9 +172,6 @@ static struct pci_controller pcie1_hose;
int first_free_busno=0;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { @@ -322,7 +319,6 @@ pci_init_board(void) #ifdef CONFIG_PCI2 { volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI2_ADDR; - extern void fsl_pci_init(struct pci_controller *hose); struct pci_controller *hose = &pci2_hose; struct pci_region *r = hose->regions;
@@ -366,9 +362,6 @@ int last_stage_init(void) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 88c6480..28b27ee 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -158,9 +158,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0;
void @@ -650,9 +647,6 @@ int board_eth_init(bd_t *bis) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 4edf420..34bdbad 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -93,9 +93,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0;
void @@ -477,9 +474,6 @@ int board_eth_init(bd_t *bis) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 4d8c698..ac1c9b4 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -262,9 +262,6 @@ static struct pci_controller pci2_hose; static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0;
void @@ -455,9 +452,6 @@ int last_stage_init(void)
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_pci_setup(void *blob, bd_t *bd) { #ifdef CONFIG_PCI1 diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index c0e4f49..8f991e5 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -311,9 +311,6 @@ static struct pci_controller pci1_hose = { static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0;
/* @@ -483,9 +480,6 @@ pci_init_board(void) #endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 49a8546..129c58c 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -232,9 +232,6 @@ local_bus_init(void) static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0;
#ifdef CONFIG_PCI @@ -315,9 +312,6 @@ pci_init_board(void) #endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 0542bf4..4b95617 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -139,9 +139,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0; #ifdef CONFIG_PCI void pci_init_board(void) @@ -557,9 +554,6 @@ int board_eth_init(bd_t *bis) #endif
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 1a6f8b4..a85ebea 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -229,9 +229,6 @@ static struct pci_controller pcie2_hose;
int first_free_busno = 0;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; @@ -402,9 +399,6 @@ void pci_init_board(void) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 0239abe..7422e6b 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -133,9 +133,6 @@ static struct pci_controller pci2_hose;
int first_free_busno = 0;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { #ifdef CONFIG_PCI1 @@ -251,9 +248,6 @@ void pci_init_board(void)
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 70b8119..9c05c2f 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -347,9 +347,6 @@ static struct pci_controller pcie1_hose;
int first_free_busno=0;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { @@ -512,9 +509,6 @@ int last_stage_init(void) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index ff48956..c39d2c0 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -209,9 +209,6 @@ static struct pci_controller pci2_hose;
int first_free_busno = 0;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; @@ -321,9 +318,6 @@ void pci_init_board(void)
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup (void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index b96e7c2..a70fd26 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -537,9 +537,6 @@ void local_bus_init (void) */ static int first_free_busno;
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - #ifdef CONFIG_PCI1 static struct pci_controller pci1_hose; #endif /* CONFIG_PCI1 */ @@ -700,9 +697,6 @@ void pci_init_board (void) }
#ifdef CONFIG_OF_BOARD_SETUP -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup (void *blob, bd_t *bd) { ft_cpu_setup (blob, bd); diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c index 683297c..af34fe6 100644 --- a/board/xes/common/fsl_85xx_pci.c +++ b/board/xes/common/fsl_85xx_pci.c @@ -28,10 +28,6 @@ #include <libfdt.h> #include <fdt_support.h>
-extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_config_unlock(struct pci_controller *hose); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0;
#ifdef CONFIG_PCI1 @@ -357,9 +353,6 @@ void pci_init_board(void) }
#if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_pci_setup(void *blob, bd_t *bd) { /* TODO - make node name (eg pci0) dynamic */ diff --git a/include/asm-ppc/fsl_pci.h b/include/asm-ppc/fsl_pci.h index 6715064..624ca56 100644 --- a/include/asm-ppc/fsl_pci.h +++ b/include/asm-ppc/fsl_pci.h @@ -17,8 +17,14 @@ * */
-#ifndef __IMMAP_85xx_fsl_pci__ -#define __IMMAP_85xx_fsl_pci__ +#ifndef __FSL_PCI_H_ +#define __FSL_PCI_H_ + +int fsl_pci_setup_inbound_windows(struct pci_region *r); +void fsl_pci_init(struct pci_controller *hose); +void fsl_pci_config_unlock(struct pci_controller *hose); +void ft_fsl_pci_setup(void *blob, const char *pci_alias, + struct pci_controller *hose);
/* * Common PCI/PCIE Register structure for mpc85xx and mpc86xx @@ -149,4 +155,4 @@ typedef struct ccsr_pci { char res24[252]; } ccsr_fsl_pci_t;
-#endif /*__IMMAP_fsl_pci__*/ +#endif