From ad2c6987978d17b58204926e9be776955935f8b1 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Thu, 24 Apr 2008 19:31:40 +1000 Subject: [PATCH] [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 Acked-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/Makefile | 1 - arch/powerpc/platforms/cell/Makefile | 6 ++++-- arch/powerpc/platforms/{celleb => cell}/beat.c | 4 ++-- arch/powerpc/platforms/{celleb => cell}/beat.h | 0 .../platforms/{celleb/interrupt.c => cell/beat_interrupt.c} | 4 ++-- .../platforms/{celleb/interrupt.h => cell/beat_interrupt.h} | 0 arch/powerpc/platforms/{celleb/smp.c => cell/beat_smp.c} | 2 +- .../platforms/{celleb/udbg_beat.c => cell/beat_udbg.c} | 0 arch/powerpc/platforms/cell/celleb_setup.c | 4 ++-- arch/powerpc/platforms/celleb/Makefile | 5 ----- 10 files changed, 11 insertions(+), 15 deletions(-) rename arch/powerpc/platforms/{celleb => cell}/beat.c (98%) rename arch/powerpc/platforms/{celleb => cell}/beat.h (100%) rename arch/powerpc/platforms/{celleb/interrupt.c => cell/beat_interrupt.c} (99%) rename arch/powerpc/platforms/{celleb/interrupt.h => cell/beat_interrupt.h} (100%) rename arch/powerpc/platforms/{celleb/smp.c => cell/beat_smp.c} (99%) rename arch/powerpc/platforms/{celleb/udbg_beat.c => cell/beat_udbg.c} (100%) delete mode 100644 arch/powerpc/platforms/celleb/Makefile diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index a984894466d9..423a0234dc31 100644 --- 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 2f393f8caaed..2701bde28473 100644 --- 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 eb99d0b66470..48c690ea65da 100644 --- a/arch/powerpc/platforms/celleb/beat.c +++ b/arch/powerpc/platforms/cell/beat.c @@ -31,9 +31,9 @@ #include #include -#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 bb7bdad95e4c..192a93509372 100644 --- a/arch/powerpc/platforms/celleb/interrupt.c +++ b/arch/powerpc/platforms/cell/beat_interrupt.c @@ -26,8 +26,8 @@ #include -#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 a7631250aeb4..26efc204c47f 100644 --- a/arch/powerpc/platforms/celleb/smp.c +++ b/arch/powerpc/platforms/cell/beat_smp.c @@ -37,7 +37,7 @@ #include #include -#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 401557cbb6a8..b11cb30decb2 100644 --- a/arch/powerpc/platforms/cell/celleb_setup.c +++ b/arch/powerpc/platforms/cell/celleb_setup.c @@ -56,9 +56,9 @@ #include #include -#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 index fd9531fe5337..000000000000 --- 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 -- 2.34.1