diff options
| author | Jia Hongtao <B38951@freescale.com> | 2012-08-28 15:44:08 +0800 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2012-09-12 14:57:12 -0500 |
| commit | 905e75c46dba5f3061049277e4eb7110beedba43 (patch) | |
| tree | 3a83c25efa8f93360772520c23f3d8b8b9d9aef1 /arch/powerpc/sysdev/fsl_pci.h | |
| parent | 9e67886becd7fab36c97ef43bb81515c18a66be1 (diff) | |
| download | linux-905e75c46dba5f3061049277e4eb7110beedba43.tar.gz linux-905e75c46dba5f3061049277e4eb7110beedba43.tar.bz2 linux-905e75c46dba5f3061049277e4eb7110beedba43.zip | |
powerpc/fsl-pci: Unify pci/pcie initialization code
We unified the Freescale pci/pcie initialization by changing the fsl_pci
to a platform driver. In previous PCI code architecture the initialization
routine is called at board_setup_arch stage. Now the initialization is done
in probe function which is architectural better. Also It's convenient for
adding PM support for PCI controller in later patch.
Now we registered pci controllers as platform devices. So we combine two
initialization code as one platform driver.
Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.h')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h index 54ed82c53235..d078537adece 100644 --- a/arch/powerpc/sysdev/fsl_pci.h +++ b/arch/powerpc/sysdev/fsl_pci.h @@ -98,10 +98,19 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose); extern struct device_node *fsl_pci_primary; -#ifdef CONFIG_FSL_PCI -void fsl_pci_init(void); +#ifdef CONFIG_PCI +void fsl_pci_assign_primary(void); #else -static inline void fsl_pci_init(void) {} +static inline void fsl_pci_assign_primary(void) {} +#endif + +#ifdef CONFIG_EDAC_MPC85XX +int mpc85xx_pci_err_probe(struct platform_device *op); +#else +static inline int mpc85xx_pci_err_probe(struct platform_device *op) +{ + return -ENOTSUPP; +} #endif #endif /* __POWERPC_FSL_PCI_H */ |