DSP: Move dspgateway to drivers/dsp/dspgateway

Move dspgateway to drivers/dsp/dspgateway

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d589397fdfc4957b005a5ba699e91e485091da2d..f468fee4bb0f66bf023e1856d0434aa255b2e31b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1081,6 +1081,7 @@ source "drivers/dma/Kconfig"
 
 if ARCH_OMAP
 source "drivers/cbus/Kconfig"
+source "drivers/dsp/dspgateway/Kconfig"
 endif
 
 endmenu

diff --git a/arch/arm/mach-omap1/mmu.c b/arch/arm/mach-omap1/mmu.c
index a254410587bdcb80ea99055545b9f282958eec5e..c7cb4ff15e357737974d5f59954ccb680d14c14b 100644 (file)
--- a/arch/arm/mach-omap1/mmu.c
+++ b/arch/arm/mach-omap1/mmu.c
@@ -81,6 +81,12 @@ void dsp_mem_usecount_clear(void)
 }
 EXPORT_SYMBOL_GPL(dsp_mem_usecount_clear);
 
+void omap_mmu_itack(struct omap_mmu *mmu)
+{
+       omap_mmu_write_reg(mmu, OMAP_MMU_IT_ACK_IT_ACK, OMAP_MMU_IT_ACK);
+}
+EXPORT_SYMBOL(omap_mmu_itack);
+
 static int omap1_mmu_mem_enable(struct omap_mmu *mmu, void *addr)
 {
        int ret = 0;

diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h
index 9ab2d99783f44a436f49c33705de9b9aa12aedca..521c3bf287b5c17c44e724d2e59770b65163c673 100644 (file)
--- a/arch/arm/mach-omap1/mmu.h
+++ b/arch/arm/mach-omap1/mmu.h
@@ -95,8 +95,6 @@ do {                                                  \
        (ent)->ap       = OMAP_MMU_RAM_L_AP_FA;         \
 } while (0)
 
-extern struct omap_mmu_ops omap1_mmu_ops;
-
 struct omap_mmu_tlb_entry {
        unsigned long va;
        unsigned long pa;
@@ -118,9 +116,4 @@ static inline void omap_mmu_write_reg(struct omap_mmu *mmu,
        __raw_writew(val, mmu->base + reg);
 }
 
-static inline void omap_mmu_itack(struct omap_mmu *mmu)
-{
-       omap_mmu_write_reg(mmu, OMAP_MMU_IT_ACK_IT_ACK, OMAP_MMU_IT_ACK);
-}
-
 #endif /* __MACH_OMAP1_MMU_H */

diff --git a/arch/arm/mach-omap2/mmu.h b/arch/arm/mach-omap2/mmu.h
index 736932e55939dc09230cf6d2a72fb070dc98dd2c..818ea8c14e818821cd677e3a1297e4ab35afda0a 100644 (file)
--- a/arch/arm/mach-omap2/mmu.h
+++ b/arch/arm/mach-omap2/mmu.h
@@ -93,8 +93,6 @@ do {                                                          \
        (ent)->mixed    = 0;                                    \
 } while (0)
 
-extern struct omap_mmu_ops omap2_mmu_ops;
-
 struct omap_mmu_tlb_entry {
        unsigned long va;
        unsigned long pa;
@@ -115,7 +113,5 @@ static inline void omap_mmu_write_reg(struct omap_mmu *mmu,
 {
        __raw_writel(val, mmu->base + reg);
 }
-static inline void omap_mmu_itack(struct omap_mmu *mmu)
-{
-}
+
 #endif /* __MACH_OMAP2_MMU_H */

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index d1558dfcc0cdb27ab1c522884c59d403fb5b8ce9..3cb9545dc7854f16bfd8e3f1e32d093edabaaed0 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -211,8 +211,6 @@ config OMAP_SERIAL_WAKE
          to data on the serial RX line. This allows you to wake the
          system from serial console.
 
-source "arch/arm/plat-omap/dsp/Kconfig"
-
 endmenu
 
 endif

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 4eaef7e38e9912cdf0269f0982e021e6f341ee11..c1ada8f1ecd482f5840a44c88c5fb0722e011324 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -32,6 +32,3 @@ obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
 # OMAP mailbox framework
 obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
 
-# DSP subsystem
-obj-y += dsp/
-obj-$(CONFIG_OMAP_DSP) += mailbox.o

diff --git a/drivers/Makefile b/drivers/Makefile
index 94b44427e80e498e41358ecc242c8c8963a8a724..b10394e70c2da71d330c0fcb41cb1d612b2c69b2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_PARPORT)         += parport/
 obj-y                          += base/ block/ misc/ mfd/ net/ media/ cbus/
 obj-$(CONFIG_I2C)              += i2c/
 obj-y                          += cbus/
+obj-y                          += dsp/dspgateway/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-$(CONFIG_ATM)              += atm/
 obj-y                          += macintosh/

diff --git a/arch/arm/plat-omap/dsp/Kconfig b/drivers/dsp/dspgateway/Kconfig
similarity index 100%
rename from arch/arm/plat-omap/dsp/Kconfig
rename to drivers/dsp/dspgateway/Kconfig

diff --git a/arch/arm/plat-omap/dsp/Makefile b/drivers/dsp/dspgateway/Makefile
similarity index 100%
rename from arch/arm/plat-omap/dsp/Makefile
rename to drivers/dsp/dspgateway/Makefile

diff --git a/arch/arm/plat-omap/dsp/dsp.h b/drivers/dsp/dspgateway/dsp.h
similarity index 98%
rename from arch/arm/plat-omap/dsp/dsp.h
rename to drivers/dsp/dspgateway/dsp.h
index a7eee1dc463ac1c59e4b909f703a85b9d1959029..23321bee716445a47e6bf8ef17be35f977126d1c 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp.h
+++ b/drivers/dsp/dspgateway/dsp.h
@@ -30,10 +30,10 @@
 
 
 #ifdef CONFIG_ARCH_OMAP2
-#include "../../mach-omap2/prm.h"
-#include "../../mach-omap2/prm_regbits_24xx.h"
-#include "../../mach-omap2/cm.h"
-#include "../../mach-omap2/cm_regbits_24xx.h"
+#include "../../../arch/arm/mach-omap2/prm.h"
+#include "../../../arch/arm/mach-omap2/prm_regbits_24xx.h"
+#include "../../../arch/arm/mach-omap2/cm.h"
+#include "../../../arch/arm/mach-omap2/cm_regbits_24xx.h"
 #endif
 
 /*

diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/drivers/dsp/dspgateway/dsp_common.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/dsp_common.c
rename to drivers/dsp/dspgateway/dsp_common.c

diff --git a/arch/arm/plat-omap/dsp/dsp_core.c b/drivers/dsp/dspgateway/dsp_core.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/dsp_core.c
rename to drivers/dsp/dspgateway/dsp_core.c

diff --git a/arch/arm/plat-omap/dsp/dsp_ctl.c b/drivers/dsp/dspgateway/dsp_ctl.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/dsp_ctl.c
rename to drivers/dsp/dspgateway/dsp_ctl.c

diff --git a/arch/arm/plat-omap/dsp/dsp_ctl_core.c b/drivers/dsp/dspgateway/dsp_ctl_core.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/dsp_ctl_core.c
rename to drivers/dsp/dspgateway/dsp_ctl_core.c

diff --git a/arch/arm/plat-omap/dsp/dsp_mbcmd.h b/drivers/dsp/dspgateway/dsp_mbcmd.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/dsp_mbcmd.h
rename to drivers/dsp/dspgateway/dsp_mbcmd.h

diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/drivers/dsp/dspgateway/dsp_mem.c
similarity index 99%
rename from arch/arm/plat-omap/dsp/dsp_mem.c
rename to drivers/dsp/dspgateway/dsp_mem.c
index ca87a3abb6648117935a3a3d15397c218f596042..6d3148ff142f85bc75b6a653dcbb6b81ba5dec6f 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/drivers/dsp/dspgateway/dsp_mem.c
@@ -46,11 +46,13 @@
 #include "dsp.h"
 #include "ipbuf.h"
 
+#if 0
 #if defined(CONFIG_ARCH_OMAP1)
 #include "../../mach-omap1/mmu.h"
 #elif defined(CONFIG_ARCH_OMAP2)
 #include "../../mach-omap2/mmu.h"
 #endif
+#endif
 
 #include "mmu.h"
 

diff --git a/arch/arm/plat-omap/dsp/error.c b/drivers/dsp/dspgateway/error.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/error.c
rename to drivers/dsp/dspgateway/error.c

diff --git a/arch/arm/plat-omap/dsp/hardware_dsp.h b/drivers/dsp/dspgateway/hardware_dsp.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/hardware_dsp.h
rename to drivers/dsp/dspgateway/hardware_dsp.h

diff --git a/arch/arm/plat-omap/dsp/ipbuf.c b/drivers/dsp/dspgateway/ipbuf.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/ipbuf.c
rename to drivers/dsp/dspgateway/ipbuf.c

diff --git a/arch/arm/plat-omap/dsp/ipbuf.h b/drivers/dsp/dspgateway/ipbuf.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/ipbuf.h
rename to drivers/dsp/dspgateway/ipbuf.h

diff --git a/arch/arm/plat-omap/dsp/mblog.c b/drivers/dsp/dspgateway/mblog.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/mblog.c
rename to drivers/dsp/dspgateway/mblog.c

diff --git a/arch/arm/plat-omap/dsp/mmu.h b/drivers/dsp/dspgateway/mmu.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/mmu.h
rename to drivers/dsp/dspgateway/mmu.h

diff --git a/arch/arm/plat-omap/dsp/omap1_dsp.h b/drivers/dsp/dspgateway/omap1_dsp.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/omap1_dsp.h
rename to drivers/dsp/dspgateway/omap1_dsp.h

diff --git a/arch/arm/plat-omap/dsp/omap2_dsp.h b/drivers/dsp/dspgateway/omap2_dsp.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/omap2_dsp.h
rename to drivers/dsp/dspgateway/omap2_dsp.h

diff --git a/arch/arm/plat-omap/dsp/proclist.h b/drivers/dsp/dspgateway/proclist.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/proclist.h
rename to drivers/dsp/dspgateway/proclist.h

diff --git a/arch/arm/plat-omap/dsp/task.c b/drivers/dsp/dspgateway/task.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/task.c
rename to drivers/dsp/dspgateway/task.c

diff --git a/arch/arm/plat-omap/dsp/taskwatch.c b/drivers/dsp/dspgateway/taskwatch.c
similarity index 100%
rename from arch/arm/plat-omap/dsp/taskwatch.c
rename to drivers/dsp/dspgateway/taskwatch.c

diff --git a/arch/arm/plat-omap/dsp/uaccess_dsp.S b/drivers/dsp/dspgateway/uaccess_dsp.S
similarity index 100%
rename from arch/arm/plat-omap/dsp/uaccess_dsp.S
rename to drivers/dsp/dspgateway/uaccess_dsp.S

diff --git a/arch/arm/plat-omap/dsp/uaccess_dsp.h b/drivers/dsp/dspgateway/uaccess_dsp.h
similarity index 100%
rename from arch/arm/plat-omap/dsp/uaccess_dsp.h
rename to drivers/dsp/dspgateway/uaccess_dsp.h

diff --git a/include/asm-arm/arch-omap/mmu.h b/include/asm-arm/arch-omap/mmu.h
index 6c5869c10de2dba2bcb9599585808effb281a7e8..714ee1d2eea9449d5947e1234d67f07cf95599d8 100644 (file)
--- a/include/asm-arm/arch-omap/mmu.h
+++ b/include/asm-arm/arch-omap/mmu.h
@@ -59,6 +59,16 @@ struct omap_mmu_tlb_lock {
 struct omap_mmu;
 struct omap_mmu_tlb_entry;
 
+#ifdef CONFIG_ARCH_OMAP1
+extern struct omap_mmu_ops omap1_mmu_ops;
+extern void omap_mmu_itack(struct omap_mmu *mmu);
+#elif defined(CONFIG_ARCH_OMAP2)
+extern struct omap_mmu_ops omap2_mmu_ops;
+static inline void omap_mmu_itack(struct omap_mmu *mmu)
+{
+}
+#endif
+
 struct omap_mmu_ops {
        int (*startup)(struct omap_mmu *mmu);
        void (*shutdown)(struct omap_mmu *mmu);