summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/qemu_e500.c
diff options
context:
space:
mode:
authorJia Hongtao <B38951@freescale.com>2012-08-28 15:44:08 +0800
committerKumar Gala <galak@kernel.crashing.org>2012-09-12 14:57:12 -0500
commit905e75c46dba5f3061049277e4eb7110beedba43 (patch)
tree3a83c25efa8f93360772520c23f3d8b8b9d9aef1 /arch/powerpc/platforms/85xx/qemu_e500.c
parent9e67886becd7fab36c97ef43bb81515c18a66be1 (diff)
downloadop-kernel-dev-905e75c46dba5f3061049277e4eb7110beedba43.zip
op-kernel-dev-905e75c46dba5f3061049277e4eb7110beedba43.tar.gz
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/platforms/85xx/qemu_e500.c')
-rw-r--r--arch/powerpc/platforms/85xx/qemu_e500.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
index 3c5490c..f6ea561 100644
--- a/arch/powerpc/platforms/85xx/qemu_e500.c
+++ b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -41,7 +41,7 @@ static void __init qemu_e500_setup_arch(void)
{
ppc_md.progress("qemu_e500_setup_arch()", 0);
- fsl_pci_init();
+ fsl_pci_assign_primary();
swiotlb_detect_4g();
mpc85xx_smp_init();
}
@@ -56,7 +56,7 @@ static int __init qemu_e500_probe(void)
return !!of_flat_dt_is_compatible(root, "fsl,qemu-e500");
}
-machine_device_initcall(qemu_e500, mpc85xx_common_publish_devices);
+machine_arch_initcall(qemu_e500, mpc85xx_common_publish_devices);
define_machine(qemu_e500) {
.name = "QEMU e500",
OpenPOWER on IntegriCloud