Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c44991 authored by Roy Zang's avatar Roy Zang Committed by Kumar Gala
Browse files

[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: default avatarRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent f695baf2

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/86xx/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/86xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,4 +4,3 @@ 


obj-$(CONFIG_SMP)		+= mpc86xx_smp.o

obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o
 
obj-$(CONFIG_PCI)		+= pci.o

arch/powerpc/sysdev/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/86xx/pci.c→arch/powerpc/sysdev/fsl_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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