diff options
| author | Roy Zang <tie-fei.zang@freescale.com> | 2007-07-10 18:44:34 +0800 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-23 10:27:07 -0500 |
| commit | 55c44991e2910519bab274c857d95a08100ff5f7 (patch) | |
| tree | 6da0c59c1c45181d8321c7498f63ccb6ef32b1c6 | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
| download | talos-obmc-linux-55c44991e2910519bab274c857d95a08100ff5f7.tar.gz talos-obmc-linux-55c44991e2910519bab274c857d95a08100ff5f7.zip | |
[POWERPC] Create common fsl pci/e files based on 86xx platforms
Move
arch/powerpc/platforms/86xx/pci.c -> arch/powerpc/sysdev/fsl_pci.c
arch/powerpc/sysdev/fsl_pcie.h -> arch/powerpc/sysdev/fsl_pci.h
as the base to unify 83xx/85xx/86xx pci and pcie.
Add CONFIG_FSL_PCI to build fsl_pci.c for Freescale pci and pcie option.
The code still works for 86xx platforms.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/86xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c (renamed from arch/powerpc/platforms/86xx/pci.c) | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.h (renamed from arch/powerpc/sysdev/fsl_pcie.h) | 0 |
6 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 853c282da22e..3ff90f096bff 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -425,6 +425,10 @@ config SBUS config FSL_SOC bool +config FSL_PCI + bool + select PPC_INDIRECT_PCI + # Yes MCA RS/6000s exist but Linux-PPC does not currently support any config MCA bool diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 0faebfdc1596..d1c8115200bc 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig @@ -14,8 +14,8 @@ endchoice config MPC8641 bool - select PPC_INDIRECT_PCI - select PPC_INDIRECT_PCI_BE + select PPC_INDIRECT_PCI_BE if PCI + select FSL_PCI if PCI select PPC_UDBG_16550 select MPIC default y if MPC8641_HPCN diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile index 418fd8f4d268..3376c7767f2d 100644 --- a/arch/powerpc/platforms/86xx/Makefile +++ b/arch/powerpc/platforms/86xx/Makefile @@ -4,4 +4,3 @@ obj-$(CONFIG_SMP) += mpc86xx_smp.o obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o -obj-$(CONFIG_PCI) += pci.o diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 484eb4e0e9db..08ce31e612c2 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_PPC_PMI) += pmi.o obj-$(CONFIG_U3_DART) += dart_iommu.o obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_FSL_SOC) += fsl_soc.o +obj-$(CONFIG_FSL_PCI) += fsl_pci.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ mv64x60-$(CONFIG_PCI) += mv64x60_pci.o diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/sysdev/fsl_pci.c index 73cd5b05a84e..24ba1b6b31fb 100644 --- a/arch/powerpc/platforms/86xx/pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -24,9 +24,9 @@ #include <asm/prom.h> #include <asm/pci-bridge.h> #include <sysdev/fsl_soc.h> -#include <sysdev/fsl_pcie.h> +#include <sysdev/fsl_pci.h> -#include "mpc86xx.h" +#include "../platforms/86xx/mpc86xx.h" #undef DEBUG diff --git a/arch/powerpc/sysdev/fsl_pcie.h b/arch/powerpc/sysdev/fsl_pci.h index 8d9779c84bea..8d9779c84bea 100644 --- a/arch/powerpc/sysdev/fsl_pcie.h +++ b/arch/powerpc/sysdev/fsl_pci.h |
