fsl_pci: Move prototypes into fsl_pci.h and remove explicit externs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
c8514622e2
commit
32049b4048
|
@ -172,9 +172,6 @@ static struct pci_controller pcie1_hose;
|
||||||
|
|
||||||
int first_free_busno=0;
|
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
|
void
|
||||||
pci_init_board(void)
|
pci_init_board(void)
|
||||||
{
|
{
|
||||||
|
@ -322,7 +319,6 @@ pci_init_board(void)
|
||||||
#ifdef CONFIG_PCI2
|
#ifdef CONFIG_PCI2
|
||||||
{
|
{
|
||||||
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI2_ADDR;
|
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_controller *hose = &pci2_hose;
|
||||||
struct pci_region *r = hose->regions;
|
struct pci_region *r = hose->regions;
|
||||||
|
|
||||||
|
@ -366,9 +362,6 @@ int last_stage_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -158,9 +158,6 @@ static struct pci_controller pcie2_hose;
|
||||||
static struct pci_controller pcie3_hose;
|
static struct pci_controller pcie3_hose;
|
||||||
#endif
|
#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;
|
int first_free_busno=0;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -650,9 +647,6 @@ int board_eth_init(bd_t *bis)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -93,9 +93,6 @@ static struct pci_controller pcie2_hose;
|
||||||
static struct pci_controller pcie3_hose;
|
static struct pci_controller pcie3_hose;
|
||||||
#endif
|
#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;
|
int first_free_busno=0;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -477,9 +474,6 @@ int board_eth_init(bd_t *bis)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -262,9 +262,6 @@ static struct pci_controller pci2_hose;
|
||||||
static struct pci_controller pcie1_hose;
|
static struct pci_controller pcie1_hose;
|
||||||
#endif /* CONFIG_PCIE1 */
|
#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;
|
int first_free_busno=0;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -455,9 +452,6 @@ int last_stage_init(void)
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_pci_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_PCI1
|
#ifdef CONFIG_PCI1
|
||||||
|
|
|
@ -311,9 +311,6 @@ static struct pci_controller pci1_hose = {
|
||||||
static struct pci_controller pcie1_hose;
|
static struct pci_controller pcie1_hose;
|
||||||
#endif /* CONFIG_PCIE1 */
|
#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;
|
int first_free_busno = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -483,9 +480,6 @@ pci_init_board(void)
|
||||||
#endif /* CONFIG_PCI */
|
#endif /* CONFIG_PCI */
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -232,9 +232,6 @@ local_bus_init(void)
|
||||||
static struct pci_controller pcie1_hose;
|
static struct pci_controller pcie1_hose;
|
||||||
#endif /* CONFIG_PCIE1 */
|
#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;
|
int first_free_busno = 0;
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
|
@ -315,9 +312,6 @@ pci_init_board(void)
|
||||||
#endif /* CONFIG_PCI */
|
#endif /* CONFIG_PCI */
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -139,9 +139,6 @@ static struct pci_controller pcie2_hose;
|
||||||
static struct pci_controller pcie3_hose;
|
static struct pci_controller pcie3_hose;
|
||||||
#endif
|
#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;
|
int first_free_busno=0;
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
void pci_init_board(void)
|
void pci_init_board(void)
|
||||||
|
@ -557,9 +554,6 @@ int board_eth_init(bd_t *bis)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
phys_addr_t base;
|
phys_addr_t base;
|
||||||
|
|
|
@ -229,9 +229,6 @@ static struct pci_controller pcie2_hose;
|
||||||
|
|
||||||
int first_free_busno = 0;
|
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)
|
void pci_init_board(void)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
|
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
|
||||||
|
@ -402,9 +399,6 @@ void pci_init_board(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#if defined(CONFIG_OF_BOARD_SETUP)
|
||||||
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
|
|
||||||
struct pci_controller *hose);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ft_board_setup(void *blob, bd_t *bd)
|
ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -133,9 +133,6 @@ static struct pci_controller pci2_hose;
|
||||||
|
|
||||||
int first_free_busno = 0;
|
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)
|
void pci_init_board(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_PCI1
|
#ifdef CONFIG_PCI1
|
||||||
|
@ -251,9 +248,6 @@ void pci_init_board(void)
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#if defined(CONFIG_OF_BOARD_SETUP)
|
||||||
extern void ft_fsl_pci_setup(void *blob, const char *pci_alias,
|
|
||||||
struct pci_controller *hose);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ft_board_setup(void *blob, bd_t *bd)
|
ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -347,9 +347,6 @@ static struct pci_controller pcie1_hose;
|
||||||
|
|
||||||
int first_free_busno=0;
|
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
|
void
|
||||||
pci_init_board(void)
|
pci_init_board(void)
|
||||||
{
|
{
|
||||||
|
@ -512,9 +509,6 @@ int last_stage_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -209,9 +209,6 @@ static struct pci_controller pci2_hose;
|
||||||
|
|
||||||
int first_free_busno = 0;
|
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)
|
void pci_init_board(void)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
|
volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
|
||||||
|
@ -321,9 +318,6 @@ void pci_init_board(void)
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_setup (void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup(blob, bd);
|
ft_cpu_setup(blob, bd);
|
||||||
|
|
|
@ -537,9 +537,6 @@ void local_bus_init (void)
|
||||||
*/
|
*/
|
||||||
static int first_free_busno;
|
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
|
#ifdef CONFIG_PCI1
|
||||||
static struct pci_controller pci1_hose;
|
static struct pci_controller pci1_hose;
|
||||||
#endif /* CONFIG_PCI1 */
|
#endif /* CONFIG_PCI1 */
|
||||||
|
@ -700,9 +697,6 @@ void pci_init_board (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_OF_BOARD_SETUP
|
#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)
|
void ft_board_setup (void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
ft_cpu_setup (blob, bd);
|
ft_cpu_setup (blob, bd);
|
||||||
|
|
|
@ -28,10 +28,6 @@
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
#include <fdt_support.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;
|
int first_free_busno = 0;
|
||||||
|
|
||||||
#ifdef CONFIG_PCI1
|
#ifdef CONFIG_PCI1
|
||||||
|
@ -357,9 +353,6 @@ void pci_init_board(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_OF_BOARD_SETUP)
|
#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)
|
void ft_board_pci_setup(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
/* TODO - make node name (eg pci0) dynamic */
|
/* TODO - make node name (eg pci0) dynamic */
|
||||||
|
|
|
@ -17,8 +17,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __IMMAP_85xx_fsl_pci__
|
#ifndef __FSL_PCI_H_
|
||||||
#define __IMMAP_85xx_fsl_pci__
|
#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
|
* Common PCI/PCIE Register structure for mpc85xx and mpc86xx
|
||||||
|
@ -149,4 +155,4 @@ typedef struct ccsr_pci {
|
||||||
char res24[252];
|
char res24[252];
|
||||||
} ccsr_fsl_pci_t;
|
} ccsr_fsl_pci_t;
|
||||||
|
|
||||||
#endif /*__IMMAP_fsl_pci__*/
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue