diff options
| -rw-r--r-- | board/atum8548/atum8548.c | 10 | ||||
| -rw-r--r-- | board/freescale/mpc8536ds/mpc8536ds.c | 13 | ||||
| -rw-r--r-- | board/freescale/mpc8544ds/mpc8544ds.c | 13 | ||||
| -rw-r--r-- | board/freescale/mpc8548cds/mpc8548cds.c | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8568mds/mpc8568mds.c | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8569mds/mpc8569mds.c | 4 | ||||
| -rw-r--r-- | board/freescale/mpc8572ds/mpc8572ds.c | 10 | ||||
| -rw-r--r-- | board/freescale/mpc8610hpcd/mpc8610hpcd.c | 12 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 6 | ||||
| -rw-r--r-- | board/freescale/p2020ds/p2020ds.c | 13 | ||||
| -rw-r--r-- | board/sbc8548/sbc8548.c | 6 | ||||
| -rw-r--r-- | board/sbc8641d/sbc8641d.c | 6 | ||||
| -rw-r--r-- | board/tqc/tqm85xx/tqm85xx.c | 8 | ||||
| -rw-r--r-- | board/xes/common/fsl_8xxx_pci.c | 16 | ||||
| -rw-r--r-- | drivers/pci/fsl_pci_init.c | 6 | ||||
| -rw-r--r-- | include/asm-ppc/fsl_pci.h | 2 | 
16 files changed, 42 insertions, 95 deletions
| diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index c8085c707..7a02cdc5b 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -244,9 +244,7 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf("    PCIE1 on bus %02x - %02x\n", @@ -302,9 +300,8 @@ pci_init_board(void)  			       PCI_REGION_IO);  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI1 on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); @@ -338,9 +335,8 @@ pci_init_board(void)  			       PCI_REGION_IO);  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI2 on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 8c5984bf5..9d2753e6e 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -250,9 +250,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCIE3 on bus %02x - %02x\n", @@ -313,9 +312,7 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf("    PCIE1 on bus %02x - %02x\n", @@ -375,9 +372,8 @@ pci_init_board(void)  #endif  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCIE2 on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); @@ -443,9 +439,8 @@ pci_init_board(void)  #endif  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index fd59839b3..60bde681e 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -166,9 +166,8 @@ pci_init_board(void)  #endif  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCIE3 on bus %02x - %02x\n", @@ -234,9 +233,7 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf("    PCIE1 on bus %02x - %02x\n", @@ -296,9 +293,8 @@ pci_init_board(void)  #endif  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCIE2 on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); @@ -364,9 +360,8 @@ pci_init_board(void)  #endif  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI on bus %02x - %02x\n",  			hose->first_busno,hose->last_busno); diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index ac1c9b478..d0856c43c 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -323,9 +323,8 @@ pci_init_board(void)  			table->config_device += gd->reloc_off;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI on bus %02x - %02x\n",hose->first_busno,hose->last_busno);  #ifdef CONFIG_PCIX_CHECK @@ -402,9 +401,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("PCIE on bus %d - %d\n",hose->first_busno,hose->last_busno);  		first_free_busno=hose->last_busno+1; diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 8f991e537..811bf5e52 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -409,9 +409,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno+1;  		printf ("PCI on bus %02x - %02x\n",hose->first_busno,hose->last_busno);  	} else { @@ -462,9 +461,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("PCIE on bus %02x - %02x\n",hose->first_busno,hose->last_busno);  		first_free_busno=hose->last_busno+1; diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 1e7526a1a..45c518a7b 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -367,10 +367,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, -					(int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("PCIE on bus %02x - %02x\n",  				hose->first_busno,hose->last_busno); diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 7c86134d5..9d5cfd79a 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -220,9 +220,8 @@ void pci_init_board(void)  			hose->region_count = r - hose->regions;  			hose->first_busno=first_free_busno; -			pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -			fsl_pci_init(hose); +			fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  			first_free_busno=hose->last_busno+1;  			printf ("    PCIE3 on bus %02x - %02x\n", @@ -289,9 +288,8 @@ void pci_init_board(void)  			hose->region_count = r - hose->regions;  			hose->first_busno=first_free_busno; -			pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -			fsl_pci_init(hose); +			fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  			first_free_busno=hose->last_busno+1;  			printf ("    PCIE2 on bus %02x - %02x\n",  					hose->first_busno,hose->last_busno); @@ -345,9 +343,7 @@ void pci_init_board(void)  			hose->region_count = r - hose->regions;  			hose->first_busno=first_free_busno; -			pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); - -			fsl_pci_init(hose); +			fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  			first_free_busno=hose->last_busno+1;  			printf("    PCIE1 on bus %02x - %02x\n", diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 2ac169b79..98896d18a 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -280,10 +280,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				 (int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno + 1;  		printf(" PCI-Express 1 on bus %02x - %02x\n", @@ -335,10 +333,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				 (int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno + 1;  		printf(" PCI-Express 2 on bus %02x - %02x\n", @@ -384,10 +380,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, -				 (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno + 1;  		printf(" PCI on bus %02x - %02x\n", diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index a8b211226..de899e8d8 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -193,9 +193,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCI-EXPRESS 1 on bus %02x - %02x\n", @@ -242,9 +241,8 @@ void pci_init_board(void)  	hose->region_count = r - hose->regions;  	hose->first_busno=first_free_busno; -	pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -	fsl_pci_init(hose); +	fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  	first_free_busno=hose->last_busno+1;  	printf ("    PCI-EXPRESS 2 on bus %02x - %02x\n", diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index 14de7e740..e2cd39c9e 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -254,10 +254,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				  (int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno+1;  		printf("    PCIE2 on bus %02x - %02x\n",  			hose->first_busno, hose->last_busno); @@ -327,10 +325,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				  (int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno+1;  		printf("    PCIE3 on bus %02x - %02x\n", @@ -381,10 +377,7 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				  (int)&pci->cfg_data); - -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno = hose->last_busno+1;  		printf("    PCIE1 on bus %02x - %02x\n", diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 9c05c2f17..978d91b4f 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -403,9 +403,8 @@ pci_init_board(void)  			table->config_device += gd->reloc_off;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("PCI on bus %02x - %02x\n",hose->first_busno,hose->last_busno);  #ifdef CONFIG_PCIX_CHECK @@ -486,9 +485,8 @@ pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("PCIE on bus %d - %d\n",hose->first_busno,hose->last_busno);  		first_free_busno=hose->last_busno+1; diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index f118a6eaa..6d68c8e84 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -259,9 +259,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno=first_free_busno; -		pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		first_free_busno=hose->last_busno+1;  		printf ("    PCI-EXPRESS 1 on bus %02x - %02x\n", @@ -302,9 +301,8 @@ void pci_init_board(void)  	hose->region_count = r - hose->regions;  	hose->first_busno=first_free_busno; -	pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data); -	fsl_pci_init(hose); +	fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  	first_free_busno=hose->last_busno+1;  	printf ("    PCI-EXPRESS 2 on bus %02x - %02x\n", diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index ab0e0dd88..07a6db3b8 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -596,10 +596,8 @@ static inline void init_pci1(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect (hose, (int)&pci->cfg_addr, -				    (int)&pci->cfg_data); -		fsl_pci_init (hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("       PCI on bus %02x..%02x\n",  			hose->first_busno, hose->last_busno); @@ -673,10 +671,8 @@ static inline void init_pcie1(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				   (int)&pci->cfg_data); -		fsl_pci_init (hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		printf ("       PCIe on bus %02x..%02x\n",  			hose->first_busno, hose->last_busno); diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 025cc1802..3a4e5236b 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -233,10 +233,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -				   (int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		/* Unlock inbound PCI configuration cycles */  		if (!host) @@ -289,10 +287,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -					(int) &pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		/* Unlock inbound PCI configuration cycles */  		if (!host) @@ -343,10 +339,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -					(int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		/* Unlock inbound PCI configuration cycles */  		if (!host) @@ -397,10 +391,8 @@ void pci_init_board(void)  		hose->region_count = r - hose->regions;  		hose->first_busno = first_free_busno; -		pci_setup_indirect(hose, (int)&pci->cfg_addr, -					(int)&pci->cfg_data); -		fsl_pci_init(hose); +		fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);  		/* Unlock inbound PCI configuration cycles */  		if (!host) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 19cf1ce1a..8858657b9 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -133,7 +133,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)  	return r - rgn_base;  } -void fsl_pci_init(struct pci_controller *hose) +void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)  {  	u16 temp16;  	u32 temp32; @@ -144,7 +144,7 @@ void fsl_pci_init(struct pci_controller *hose)  	int r;  	int bridge;  	int inbound = 0; -	volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) hose->cfg_addr; +	volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)cfg_addr;  	pci_dev_t dev = PCI_BDF(busno,0,0);  	/* Initialize ATMU registers based on hose regions and flags */ @@ -155,6 +155,8 @@ void fsl_pci_init(struct pci_controller *hose)  	int neg_link_w;  #endif +	pci_setup_indirect(hose, cfg_addr, cfg_data); +  	for (r=0; r<hose->region_count; r++) {  		u32 sz = (__ilog2_u64((u64)hose->regions[r].size) - 1);  		if (hose->regions[r].flags & PCI_REGION_SYS_MEMORY) { /* inbound */ diff --git a/include/asm-ppc/fsl_pci.h b/include/asm-ppc/fsl_pci.h index 624ca5685..0473b720c 100644 --- a/include/asm-ppc/fsl_pci.h +++ b/include/asm-ppc/fsl_pci.h @@ -21,7 +21,7 @@  #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_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data);  void fsl_pci_config_unlock(struct pci_controller *hose);  void ft_fsl_pci_setup(void *blob, const char *pci_alias,  			struct pci_controller *hose); |