From 23ed8b5cf043a9cd40b5d415645b3543357d9a1a Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 27 Nov 2007 21:13:02 -0800 Subject: [PATCH] DSP: Move dspgateway to drivers/dsp/dspgateway Move dspgateway to drivers/dsp/dspgateway Signed-off-by: Tony Lindgren --- arch/arm/Kconfig | 1 + arch/arm/mach-omap1/mmu.c | 6 ++++++ arch/arm/mach-omap1/mmu.h | 7 ------- arch/arm/mach-omap2/mmu.h | 6 +----- arch/arm/plat-omap/Kconfig | 2 -- arch/arm/plat-omap/Makefile | 3 --- drivers/Makefile | 1 + .../plat-omap/dsp => drivers/dsp/dspgateway}/Kconfig | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/Makefile | 0 .../arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp.h | 8 ++++---- .../dsp => drivers/dsp/dspgateway}/dsp_common.c | 0 .../dsp => drivers/dsp/dspgateway}/dsp_core.c | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/dsp_ctl.c | 0 .../dsp => drivers/dsp/dspgateway}/dsp_ctl_core.c | 0 .../dsp => drivers/dsp/dspgateway}/dsp_mbcmd.h | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/dsp_mem.c | 2 ++ .../plat-omap/dsp => drivers/dsp/dspgateway}/error.c | 0 .../dsp => drivers/dsp/dspgateway}/hardware_dsp.h | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/ipbuf.c | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/ipbuf.h | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/mblog.c | 0 .../arm/plat-omap/dsp => drivers/dsp/dspgateway}/mmu.h | 0 .../dsp => drivers/dsp/dspgateway}/omap1_dsp.h | 0 .../dsp => drivers/dsp/dspgateway}/omap2_dsp.h | 0 .../dsp => drivers/dsp/dspgateway}/proclist.h | 0 .../plat-omap/dsp => drivers/dsp/dspgateway}/task.c | 0 .../dsp => drivers/dsp/dspgateway}/taskwatch.c | 0 .../dsp => drivers/dsp/dspgateway}/uaccess_dsp.S | 0 .../dsp => drivers/dsp/dspgateway}/uaccess_dsp.h | 0 include/asm-arm/arch-omap/mmu.h | 10 ++++++++++ 30 files changed, 25 insertions(+), 21 deletions(-) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/Kconfig (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/Makefile (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp.h (98%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_common.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_core.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_ctl.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_ctl_core.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_mbcmd.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/dsp_mem.c (99%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/error.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/hardware_dsp.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/ipbuf.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/ipbuf.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/mblog.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/mmu.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/omap1_dsp.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/omap2_dsp.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/proclist.h (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/task.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/taskwatch.c (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/uaccess_dsp.S (100%) rename {arch/arm/plat-omap/dsp => drivers/dsp/dspgateway}/uaccess_dsp.h (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d589397fdfc..f468fee4bb0 100644 --- 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 a254410587b..c7cb4ff15e3 100644 --- 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 9ab2d99783f..521c3bf287b 100644 --- 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 736932e5593..818ea8c14e8 100644 --- 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 d1558dfcc0c..3cb9545dc78 100644 --- 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 4eaef7e38e9..c1ada8f1ecd 100644 --- 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 94b44427e80..b10394e70c2 100644 --- 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 a7eee1dc463..23321bee716 100644 --- 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 ca87a3abb66..6d3148ff142 100644 --- 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 6c5869c10de..714ee1d2eea 100644 --- 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); -- 2.41.1