[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: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index a984894466d91c23dcafe92e97932e31c9d43bf3..423a0234dc31289d8b76cd69fb0828eb944349ce 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -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/

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 2f393f8caaedaeda2ea217271067103a47785f0f..2701bde284734c078195bf94241aeed5651f353c 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -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

diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/cell/beat.c
similarity index 98%
rename from arch/powerpc/platforms/celleb/beat.c
rename to arch/powerpc/platforms/cell/beat.c
index eb99d0b66470ec51d676a94a3127679f9f34dd98..48c690ea65da36844de63f177e6d4982d4ec7fa4 100644 (file)
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/cell/beat.c
@@ -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;
 

diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/cell/beat.h
similarity index 100%
rename from arch/powerpc/platforms/celleb/beat.h
rename to arch/powerpc/platforms/cell/beat.h

diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
similarity index 99%
rename from arch/powerpc/platforms/celleb/interrupt.c
rename to arch/powerpc/platforms/cell/beat_interrupt.c
index bb7bdad95e4c364c161a2df7a851412efa62c526..192a93509372ec8e949bcc91943c86127d3e3803 100644 (file)
--- a/arch/powerpc/platforms/celleb/interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -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);

diff --git a/arch/powerpc/platforms/celleb/interrupt.h b/arch/powerpc/platforms/cell/beat_interrupt.h
similarity index 100%
rename from arch/powerpc/platforms/celleb/interrupt.h
rename to arch/powerpc/platforms/cell/beat_interrupt.h

diff --git a/arch/powerpc/platforms/celleb/smp.c b/arch/powerpc/platforms/cell/beat_smp.c
similarity index 99%
rename from arch/powerpc/platforms/celleb/smp.c
rename to arch/powerpc/platforms/cell/beat_smp.c
index a7631250aeb4658fcf176d9bee3029eac52675ba..26efc204c47f2271a4e4fe29622850a0ceea3d47 100644 (file)
--- a/arch/powerpc/platforms/celleb/smp.c
+++ b/arch/powerpc/platforms/cell/beat_smp.c
@@ -37,7 +37,7 @@
 #include <asm/machdep.h>
 #include <asm/udbg.h>
 
-#include "interrupt.h"
+#include "beat_interrupt.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)

diff --git a/arch/powerpc/platforms/celleb/udbg_beat.c b/arch/powerpc/platforms/cell/beat_udbg.c
similarity index 100%
rename from arch/powerpc/platforms/celleb/udbg_beat.c
rename to arch/powerpc/platforms/cell/beat_udbg.c

diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index 401557cbb6a8ebc59bbd1194bc48c7a84e3d55d3..b11cb30decb2ded24fa63160c7b84f31c683ac05 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -56,9 +56,9 @@
 #include <asm/rtas.h>
 #include <asm/cell-regs.h>
 
-#include "../celleb/interrupt.h"
+#include "beat_interrupt.h"
 #include "beat_wrapper.h"
-#include "../celleb/beat.h"
+#include "beat.h"
 #include "celleb_pci.h"
 #include "interrupt.h"
 #include "pervasive.h"

diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
deleted file mode 100644 (file)
index fd9531f..0000000
--- a/arch/powerpc/platforms/celleb/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y                          += interrupt.o \
-                                  beat.o
-
-obj-$(CONFIG_SMP)              += smp.o
-obj-$(CONFIG_PPC_UDBG_BEAT)    += udbg_beat.o