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

Commit 3e4e97f4 authored by Jon Loeliger's avatar Jon Loeliger Committed by Kumar Gala
Browse files

[POWERPC] 86xx/85xx: Move 8641 PCI-Express to arch/powerpc/sysdev/fsl_pcie.c. 



This move sets the stage for the use of generic PCI Express
code in 85xx and 86xx parts from FSL.  Subsequent patches
for 8548 and 8544 will be able to use this shared code.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent e0e3c8d4

arch/powerpc/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ config PPC_86xx 
	bool "Freescale 86xx"

	bool "Freescale 86xx"

	select 6xx

	select 6xx

	select FSL_SOC

	select FSL_SOC

	select FSL_PCIE

	select PPC_FPU

	select PPC_FPU

	select ALTIVEC

	select ALTIVEC

	help

	help
@@ -645,6 +646,10 @@ config SBUS 
config FSL_SOC

config FSL_SOC

	bool

	bool





config FSL_PCIE

	bool

	depends on PPC_86xx



# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

config MCA

config MCA

	bool

	bool

arch/powerpc/platforms/86xx/Makefile

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




obj-$(CONFIG_SMP)		+= mpc86xx_smp.o

obj-$(CONFIG_SMP)		+= mpc86xx_smp.o

obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o

obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o

obj-$(CONFIG_PCI)		+= pci.o mpc86xx_pcie.o
 
obj-$(CONFIG_PCI)		+= pci.o

arch/powerpc/sysdev/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_PPC_PMI) += pmi.o 
obj-$(CONFIG_U3_DART)		+= dart_iommu.o

obj-$(CONFIG_U3_DART)		+= dart_iommu.o

obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o

obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o

obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o

obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o

obj-$(CONFIG_FSL_PCIE)		+= fsl_pcie.o

obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o

obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o

obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/

obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/

arch/powerpc/platforms/86xx/mpc86xx_pcie.c→arch/powerpc/sysdev/fsl_pcie.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <asm/pci-bridge.h>

#include <asm/pci-bridge.h>

#include <asm/machdep.h>

#include <asm/machdep.h>





#include "mpc86xx.h"



#define PCI_CFG_OUT out_be32

#define PCI_CFG_OUT out_be32





/* ERRATA PCI-Ex 14 PCIE Controller timeout */

/* ERRATA PCI-Ex 14 PCIE Controller timeout */