Removing dead OMAP_DSP

OMAP_DSP doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> [tony@atomide.com: updated to apply on top of already queued patches] Signed-off-by: Tony Lindgren <tony@atomide.com>
author: Christoph Egger <siccegge@cs.fau.de> 2010-07-05 09:31:54 -0400
committer: Tony Lindgren <tony@atomide.com> 2010-07-05 09:31:54 -0400
commit: ab6f7751905e5cf713d081dbb3b97b8f6909ab34 (patch)
tree: cdd361fa5b1ee831374052ddd068edfbc46f0b5c /arch/arm/plat-omap
parent: 4705c1ca8b7c7cca23d7e534c830e5d6ac914535 (diff)
2 files changed, 0 insertions, 103 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index ca5b2290f5a3..d1920be7833b 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -27,70 +27,8 @@
 #include <mach/gpio.h>
 #include <plat/menelaus.h>
 #include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
 #include <plat/omap44xx.h>
-#if     defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-static struct dsp_platform_data dsp_pdata = {
-        .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
-};
-static struct resource omap_dsp_resources[] = {
-        {
-                .name   = "dsp_mmu",
-                .start  = -1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct platform_device omap_dsp_device = {
-        .name           = "dsp",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(omap_dsp_resources),
-        .resource       = omap_dsp_resources,
-        .dev = {
-                .platform_data = &dsp_pdata,
-        },
-};
-static inline void omap_init_dsp(void)
-{
-        struct resource *res;
-        int irq;
-        if (cpu_is_omap15xx())
-                irq = INT_1510_DSP_MMU;
-        else if (cpu_is_omap16xx())
-                irq = INT_1610_DSP_MMU;
-        else if (cpu_is_omap24xx())
-                irq = INT_24XX_DSP_MMU;
-        res = platform_get_resource_byname(&omap_dsp_device,
-                                           IORESOURCE_IRQ, "dsp_mmu");
-        res->start = irq;
-        platform_device_register(&omap_dsp_device);
-}
-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
-{
-        static DEFINE_MUTEX(dsp_pdata_lock);
-        spin_lock_init(&kdev->lock);
-        mutex_lock(&dsp_pdata_lock);
-        list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
-        mutex_unlock(&dsp_pdata_lock);
-        return 0;
-}
-EXPORT_SYMBOL(dsp_kfunc_device_register);
-#else
-static inline void omap_init_dsp(void) { }
-#endif  /* CONFIG_OMAP_DSP */
 /*-------------------------------------------------------------------------*/
 #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
@@ -359,7 +297,6 @@ static int __init omap_init_devices(void)
        /* please keep these calls, and their implementations above,
         * in alphabetical order so they're easier to sort through.
         */
-        omap_init_dsp();
        omap_init_rng();
        omap_init_mcpdm();
        omap_init_uwire();
diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h
deleted file mode 100644
index da97736f3efa..000000000000
--- a/arch/arm/plat-omap/include/plat/dsp_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
- *
- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
- *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-#ifndef ASM_ARCH_DSP_COMMON_H
-#define ASM_ARCH_DSP_COMMON_H
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
-extern void omap_dsp_request_mpui(void);
-extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
-#else
-static inline int omap_dsp_request_mem(void)
-{
-        return 0;
-}
-#define omap_dsp_release_mem()  do {} while (0)
-#endif
-#endif /* ASM_ARCH_DSP_COMMON_H */
author	Christoph Egger <siccegge@cs.fau.de>	2010-07-05 09:31:54 -0400
committer	Tony Lindgren <tony@atomide.com>	2010-07-05 09:31:54 -0400
commit	ab6f7751905e5cf713d081dbb3b97b8f6909ab34 (patch)
tree	cdd361fa5b1ee831374052ddd068edfbc46f0b5c /arch/arm/plat-omap
parent	4705c1ca8b7c7cca23d7e534c830e5d6ac914535 (diff)

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index ca5b2290f5a3..d1920be7833b 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c
@@ -27,70 +27,8 @@
27	#include <mach/gpio.h>	27	#include <mach/gpio.h>
28	#include <plat/menelaus.h>	28	#include <plat/menelaus.h>
29	#include <plat/mcbsp.h>	29	#include <plat/mcbsp.h>
30	#include <plat/dsp_common.h>
31	#include <plat/omap44xx.h>	30	#include <plat/omap44xx.h>
32		31
33	#if defined(CONFIG_OMAP_DSP) \|\| defined(CONFIG_OMAP_DSP_MODULE)
34
35	static struct dsp_platform_data dsp_pdata = {
36	.kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
37	};
38
39	static struct resource omap_dsp_resources[] = {
40	{
41	.name = "dsp_mmu",
42	.start = -1,
43	.flags = IORESOURCE_IRQ,
44	},
45	};
46
47	static struct platform_device omap_dsp_device = {
48	.name = "dsp",
49	.id = -1,
50	.num_resources = ARRAY_SIZE(omap_dsp_resources),
51	.resource = omap_dsp_resources,
52	.dev = {
53	.platform_data = &dsp_pdata,
54	},
55	};
56
57	static inline void omap_init_dsp(void)
58	{
59	struct resource *res;
60	int irq;
61
62	if (cpu_is_omap15xx())
63	irq = INT_1510_DSP_MMU;
64	else if (cpu_is_omap16xx())
65	irq = INT_1610_DSP_MMU;
66	else if (cpu_is_omap24xx())
67	irq = INT_24XX_DSP_MMU;
68
69	res = platform_get_resource_byname(&omap_dsp_device,
70	IORESOURCE_IRQ, "dsp_mmu");
71	res->start = irq;
72
73	platform_device_register(&omap_dsp_device);
74	}
75
76	int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
77	{
78	static DEFINE_MUTEX(dsp_pdata_lock);
79
80	spin_lock_init(&kdev->lock);
81
82	mutex_lock(&dsp_pdata_lock);
83	list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
84	mutex_unlock(&dsp_pdata_lock);
85
86	return 0;
87	}
88	EXPORT_SYMBOL(dsp_kfunc_device_register);
89
90	#else
91	static inline void omap_init_dsp(void) { }
92	#endif /* CONFIG_OMAP_DSP */
93
94	/-------------------------------------------------------------------------/	32	/-------------------------------------------------------------------------/
95		33
96	#if defined(CONFIG_OMAP_MCBSP) \|\| defined(CONFIG_OMAP_MCBSP_MODULE)	34	#if defined(CONFIG_OMAP_MCBSP) \|\| defined(CONFIG_OMAP_MCBSP_MODULE)
@@ -359,7 +297,6 @@ static int __init omap_init_devices(void)
359	/* please keep these calls, and their implementations above,	297	/* please keep these calls, and their implementations above,
360	* in alphabetical order so they're easier to sort through.	298	* in alphabetical order so they're easier to sort through.
361	*/	299	*/
362	omap_init_dsp();
363	omap_init_rng();	300	omap_init_rng();
364	omap_init_mcpdm();	301	omap_init_mcpdm();
365	omap_init_uwire();	302	omap_init_uwire();


diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h deleted file mode 100644 index da97736f3efa..000000000000 --- a/arch/arm/plat-omap/include/plat/dsp_common.h +++ /dev/null
@@ -1,40 +0,0 @@
1	/*
2	* This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
3	*
4	* Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
5	*
6	* Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
7	*
8	* This program is free software; you can redistribute it and/or
9	* modify it under the terms of the GNU General Public License
10	* version 2 as published by the Free Software Foundation.
11	*
12	* This program is distributed in the hope that it will be useful, but
13	* WITHOUT ANY WARRANTY; without even the implied warranty of
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15	* General Public License for more details.
16	*
17	* You should have received a copy of the GNU General Public License
18	* along with this program; if not, write to the Free Software
19	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
20	* 02110-1301 USA
21	*
22	*/
23
24	#ifndef ASM_ARCH_DSP_COMMON_H
25	#define ASM_ARCH_DSP_COMMON_H
26
27	#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
28	extern void omap_dsp_request_mpui(void);
29	extern void omap_dsp_release_mpui(void);
30	extern int omap_dsp_request_mem(void);
31	extern int omap_dsp_release_mem(void);
32	#else
33	static inline int omap_dsp_request_mem(void)
34	{
35	return 0;
36	}
37	#define omap_dsp_release_mem() do {} while (0)
38	#endif
39
40	#endif /* ASM_ARCH_DSP_COMMON_H */