fsl_pci: Renamed immap_fsl_pci.h to fsl_pci.h
PATCH 1/2 fsl_pci: Renamed immap_fsl_pci.h to fsl_pci.h
Rename the pci header for FSL HW so we can move some prototypes in there and stop doing explicit externs
Signed-off-by Kumar Gala <[email protected]>
--- board/atum8548/atum8548.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/sbc8548/sbc8548.c | 2 +- board/sbc8641d/sbc8641d.c | 2 +- board/tqc/tqm85xx/tqm85xx.c | 2 +- board/xes/common/fsl_85xx_pci.c | 2 +- board/xes/xpedite5200/xpedite5200.c | 2 +- board/xes/xpedite5370/xpedite5370.c | 2 +- drivers/pci/fsl_pci_init.c | 2 +- include/asm-ppc/fsl_pci.h | 152 +++++++++++++++++++++++++++++ include/asm-ppc/immap_fsl_pci.h | 152 ----------------------------- 18 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 include/asm-ppc/fsl_pci.h delete mode 100644 include/asm-ppc/immap_fsl_pci.h
board/atum8548/atum8548.c +1 -1
@@ -28,7 +28,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/mmu.h>
board/freescale/mpc8536ds/mpc8536ds.c +1 -1
@@ -27,7 +27,7 @@#include <asm/mmu.h> #include <asm/cache.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <spd.h>
board/freescale/mpc8544ds/mpc8544ds.c +1 -1
@@ -26,7 +26,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <miiphy.h>
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -27,7 +27,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <miiphy.h>
board/freescale/mpc8568mds/mpc8568mds.c +1 -1
@@ -27,7 +27,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <i2c.h>
board/freescale/mpc8569mds/mpc8569mds.c +1 -1
@@ -27,7 +27,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <spd_sdram.h>
board/freescale/mpc8572ds/mpc8572ds.c +1 -1
@@ -27,7 +27,7 @@#include <asm/mmu.h> #include <asm/cache.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <miiphy.h>
board/freescale/mpc8610hpcd/mpc8610hpcd.c +1 -1
@@ -25,7 +25,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <i2c.h> #include <asm/io.h>
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 -1
@@ -24,7 +24,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <libfdt.h>
board/sbc8548/sbc8548.c +1 -1
@@ -29,7 +29,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <miiphy.h>
board/sbc8641d/sbc8641d.c +1 -1
@@ -33,7 +33,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <libfdt.h> #include <fdt_support.h>
board/tqc/tqm85xx/tqm85xx.c +1 -1
@@ -36,7 +36,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <ioports.h> #include <flash.h>
board/xes/common/fsl_85xx_pci.c +1 -1
@@ -24,7 +24,7 @@#include <common.h> #include <pci.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <libfdt.h> #include <fdt_support.h>
board/xes/xpedite5200/xpedite5200.c +1 -1
@@ -26,7 +26,7 @@#include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <asm/cache.h> #include <asm/mmu.h>
board/xes/xpedite5370/xpedite5370.c +1 -1
@@ -25,7 +25,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <asm/cache.h> #include <libfdt.h>
drivers/pci/fsl_pci_init.c +1 -1
@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;*/ #include <pci.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> /* Freescale-specific PCI config registers */ #define FSL_PCI_PBFR 0x44
include/asm-ppc/fsl_pci.h new file +152 -0
152 lines not on this page · raw message
include/asm-ppc/immap_fsl_pci.h deleted +0 -152
152 lines not on this page · raw message
Signature · 1 line
1.5.6.6
PATCH 2/2 fsl_pci: Move prototypes into fsl_pci.h and remove explicit externs
Signed-off-by Kumar Gala <[email protected]>
--- 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(-)
board/atum8548/atum8548.c +0 -7
@@ -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);
board/freescale/mpc8536ds/mpc8536ds.c +0 -6
@@ -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);
board/freescale/mpc8544ds/mpc8544ds.c +0 -6
@@ -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);
board/freescale/mpc8548cds/mpc8548cds.c +0 -6
@@ -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
board/freescale/mpc8568mds/mpc8568mds.c +0 -6
@@ -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);
board/freescale/mpc8569mds/mpc8569mds.c +0 -6
@@ -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);
board/freescale/mpc8572ds/mpc8572ds.c +0 -6
@@ -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;
board/freescale/mpc8610hpcd/mpc8610hpcd.c +0 -6
@@ -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) {
board/freescale/mpc8641hpcn/mpc8641hpcn.c +0 -6
@@ -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) {
board/sbc8548/sbc8548.c +0 -6
@@ -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);
board/sbc8641d/sbc8641d.c +0 -6
@@ -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);
board/tqc/tqm85xx/tqm85xx.c +0 -6
@@ -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);
board/xes/common/fsl_85xx_pci.c +0 -7
@@ -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 */
include/asm-ppc/fsl_pci.h +9 -3
@@ -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
Signature · 1 line
1.5.6.6