Commit 116bdc42 authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[POWERPC] celleb: Move the files for celleb base support 



This moves the base code for celleb support into platforms/cell/.
All files in this patch are used by celleb-beat and celleb-native
commonly.

Signed-off-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6ec859e1

arch/powerpc/platforms/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ source "arch/powerpc/platforms/powermac/Kconfig" 
source "arch/powerpc/platforms/prep/Kconfig"

source "arch/powerpc/platforms/maple/Kconfig"

source "arch/powerpc/platforms/pasemi/Kconfig"

source "arch/powerpc/platforms/celleb/Kconfig"

source "arch/powerpc/platforms/ps3/Kconfig"

source "arch/powerpc/platforms/cell/Kconfig"

source "arch/powerpc/platforms/8xx/Kconfig"

arch/powerpc/platforms/cell/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ config PPC_IBM_CELL_BLADE 
	select PPC_UDBG_16550

	select UDBG_RTAS_CONSOLE



config PPC_CELLEB

	bool "Toshiba's Cell Reference Set 'Celleb' Architecture"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_CELL

	select PPC_CELL_NATIVE

	select PPC_RTAS

	select PPC_INDIRECT_IO

	select PPC_OF_PLATFORM_PCI

	select HAS_TXX9_SERIAL

	select PPC_UDBG_BEAT

	select USB_OHCI_BIG_ENDIAN_MMIO

	select USB_EHCI_BIG_ENDIAN_MMIO



menu "Cell Broadband Engine options"

	depends on PPC_CELL

arch/powerpc/platforms/cell/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -31,5 +31,7 @@ obj-$(CONFIG_PCI_MSI) += axon_msi.o 


# celleb stuff

ifeq ($(CONFIG_PPC_CELLEB),y)

obj-y					+= io-workarounds.o spider-pci.o

obj-y					+= celleb_setup.o \

					   celleb_pci.o \

					   io-workarounds.o spider-pci.o

endif

arch/powerpc/platforms/celleb/pci.c→arch/powerpc/platforms/cell/celleb_pci.c

+3 −5
Original line number Diff line number Diff line
@@ -37,13 +37,11 @@ 
#include <asm/io.h>

#include <asm/irq.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#include <asm/pci-bridge.h>

#include <asm/ppc-pci.h>



#include "../cell/io-workarounds.h"

#include "pci.h"

#include "interrupt.h"

#include "io-workarounds.h"

#include "celleb_pci.h"



#define MAX_PCI_DEVICES    32

#define MAX_PCI_FUNCTIONS   8

arch/powerpc/platforms/celleb/pci.h→arch/powerpc/platforms/cell/celleb_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/prom.h>

#include <asm/ppc-pci.h>



#include "../cell/io-workarounds.h"

#include "io-workarounds.h"



struct celleb_phb_spec {

	int (*setup)(struct device_node *, struct pci_controller *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE