[POWERPC] celleb: Move files for Beat hvcall interfaces

This moves files for Beat hvcall interfaces 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/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 3b6ee08..b76d178 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -34,7 +34,8 @@ ifeq ($(CONFIG_PPC_CELLEB),y)
 obj-y                                  += celleb_setup.o \
                                           celleb_pci.o celleb_scc_epci.o \
                                           celleb_scc_uhc.o \
-                                          io-workarounds.o spider-pci.o
+                                          io-workarounds.o spider-pci.o \
+                                          beat_hvCall.o
 
 obj-$(CONFIG_SERIAL_TXX9)              += celleb_scc_sio.o
 endif

diff --git a/arch/powerpc/platforms/celleb/hvCall.S b/arch/powerpc/platforms/cell/beat_hvCall.S
similarity index 100%
rename from arch/powerpc/platforms/celleb/hvCall.S
rename to arch/powerpc/platforms/cell/beat_hvCall.S

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

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

diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index d0dad24..401557c 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -57,7 +57,7 @@
 #include <asm/cell-regs.h>
 
 #include "../celleb/interrupt.h"
-#include "../celleb/beat_wrapper.h"
+#include "beat_wrapper.h"
 #include "../celleb/beat.h"
 #include "celleb_pci.h"
 #include "interrupt.h"

diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index edb6d5e..5f612c1 100644 (file)
--- a/arch/powerpc/platforms/celleb/Makefile
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -1,5 +1,5 @@
 obj-y                          += interrupt.o iommu.o \
-                                  htab.o beat.o hvCall.o
+                                  htab.o beat.o
 
 obj-$(CONFIG_SMP)              += smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)    += udbg_beat.o

diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
index b64b171..eb99d0b 100644 (file)
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -31,7 +31,7 @@
 #include <asm/machdep.h>
 #include <asm/firmware.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 #include "beat.h"
 #include "interrupt.h"
 

diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c
index 81467ff..18eaed1 100644 (file)
--- a/arch/powerpc/platforms/celleb/htab.c
+++ b/arch/powerpc/platforms/celleb/htab.c
@@ -32,7 +32,7 @@
 #include <asm/machdep.h>
 #include <asm/udbg.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #ifdef DEBUG_LOW
 #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)

diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c
index 69562a8..bb7bdad 100644 (file)
--- a/arch/powerpc/platforms/celleb/interrupt.c
+++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -27,7 +27,7 @@
 #include <asm/machdep.h>
 
 #include "interrupt.h"
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #define        MAX_IRQS        NR_IRQS
 static DEFINE_SPINLOCK(beatic_irq_mask_lock);

diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
index 93b0efd..3eda423 100644 (file)
--- a/arch/powerpc/platforms/celleb/iommu.c
+++ b/arch/powerpc/platforms/celleb/iommu.c
@@ -26,7 +26,7 @@
 
 #include <asm/machdep.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required,
                                           strongest order */

diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/celleb/spu_priv1.c
index bcc17f7..ad22a14 100644 (file)
--- a/arch/powerpc/platforms/celleb/spu_priv1.c
+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -24,7 +24,7 @@
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 static inline void _int_mask_set(struct spu *spu, int class, u64 mask)
 {