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

[POWERPC] celleb: Move miscellaneous files for Beat 



This moves miscellaneous files for Beat into platforms/cell/.
All files in this patch are used by celleb-beat only.

Signed-off-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c11dde85

arch/powerpc/platforms/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -24,5 +24,4 @@ obj-$(CONFIG_PPC_MAPLE) += maple/ 
obj-$(CONFIG_PPC_PASEMI)	+= pasemi/

obj-$(CONFIG_PPC_CELL)		+= cell/

obj-$(CONFIG_PPC_PS3)		+= ps3/

obj-$(CONFIG_PPC_CELLEB)	+= celleb/

obj-$(CONFIG_EMBEDDED6xx)	+= embedded6xx/

arch/powerpc/platforms/cell/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -35,9 +35,11 @@ obj-y += celleb_setup.o \ 
					   celleb_pci.o celleb_scc_epci.o \

					   celleb_scc_uhc.o \

					   io-workarounds.o spider-pci.o \

					   beat_htab.o beat_hvCall.o \

					   beat_iommu.o

					   beat.o beat_htab.o beat_hvCall.o \

					   beat_interrupt.o beat_iommu.o



obj-$(CONFIG_SMP)			+= beat_smp.o

obj-$(CONFIG_PPC_UDBG_BEAT)		+= beat_udbg.o

obj-$(CONFIG_SERIAL_TXX9)		+= celleb_scc_sio.o

obj-$(CONFIG_SPU_BASE)			+= beat_spu_priv1.o

endif

arch/powerpc/platforms/celleb/beat.c→arch/powerpc/platforms/cell/beat.c

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
#include <asm/machdep.h>

#include <asm/firmware.h>



#include "../cell/beat_wrapper.h"

#include "beat_wrapper.h"

#include "beat.h"

#include "interrupt.h"

#include "beat_interrupt.h"



static int beat_pm_poweroff_flag;

arch/powerpc/platforms/celleb/interrupt.c→arch/powerpc/platforms/cell/beat_interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


#include <asm/machdep.h>



#include "interrupt.h"

#include "../cell/beat_wrapper.h"

#include "beat_interrupt.h"

#include "beat_wrapper.h"



#define	MAX_IRQS	NR_IRQS

static DEFINE_SPINLOCK(beatic_irq_mask_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE