[POWERPC] celleb: Move files for Beat mmu and iommu
This moves files for mmu and iommu on 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/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index b76d178..c135a33 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -35,7 +35,8 @@
celleb_pci.o celleb_scc_epci.o \
celleb_scc_uhc.o \
io-workarounds.o spider-pci.o \
- beat_hvCall.o
+ beat_htab.o beat_hvCall.o \
+ beat_iommu.o
obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o
endif
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/cell/beat_htab.c
similarity index 99%
rename from arch/powerpc/platforms/celleb/htab.c
rename to arch/powerpc/platforms/cell/beat_htab.c
index 18eaed1..81467ff 100644
--- a/arch/powerpc/platforms/celleb/htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -32,7 +32,7 @@
#include <asm/machdep.h>
#include <asm/udbg.h>
-#include "../cell/beat_wrapper.h"
+#include "beat_wrapper.h"
#ifdef DEBUG_LOW
#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c
similarity index 98%
rename from arch/powerpc/platforms/celleb/iommu.c
rename to arch/powerpc/platforms/cell/beat_iommu.c
index 3eda423..93b0efd 100644
--- a/arch/powerpc/platforms/celleb/iommu.c
+++ b/arch/powerpc/platforms/cell/beat_iommu.c
@@ -26,7 +26,7 @@
#include <asm/machdep.h>
-#include "../cell/beat_wrapper.h"
+#include "beat_wrapper.h"
#define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required,
strongest order */
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index 5f612c1..ad31943 100644
--- 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
+obj-y += interrupt.o \
+ beat.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o
