diff for duplicates of <20100705082046.GE15951@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 3e2216a..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="dead-dsp.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index a3f7698..0000000 --- a/a/2.txt +++ /dev/null @@ -1,358 +0,0 @@ ->From 2a65e8217bc6686b409ae19ec79e89421b5e73c1 Mon Sep 17 00:00:00 2001 -From: Christoph Egger <siccegge@cs.fau.de> -Date: Wed, 30 Jun 2010 15:57:26 +0000 -Subject: [PATCH] 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> - -diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c -index c9e9e37..5a7b638 100644 ---- a/arch/arm/mach-omap1/board-nokia770.c -+++ b/arch/arm/mach-omap1/board-nokia770.c -@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void) - } - #endif - --#if defined(CONFIG_OMAP_DSP) --/* -- * audio power control -- */ --#define HEADPHONE_GPIO 14 --#define AMPLIFIER_CTRL_GPIO 58 -- --static struct clk *dspxor_ck; --static DEFINE_MUTEX(audio_pwr_lock); --/* -- * audio_pwr_state -- * +--+-------------------------+---------------------------------------+ -- * |-1|down |power-up request -> 0 | -- * +--+-------------------------+---------------------------------------+ -- * | 0|up |power-down(1) request -> 1 | -- * | | |power-down(2) request -> (ignore) | -- * +--+-------------------------+---------------------------------------+ -- * | 1|up, |power-up request -> 0 | -- * | |received down(1) request |power-down(2) request -> -1 | -- * +--+-------------------------+---------------------------------------+ -- */ --static int audio_pwr_state = -1; -- --static inline void aic23_power_up(void) --{ --} --static inline void aic23_power_down(void) --{ --} -- --/* -- * audio_pwr_up / down should be called under audio_pwr_lock -- */ --static void nokia770_audio_pwr_up(void) --{ -- clk_enable(dspxor_ck); -- -- /* Turn on codec */ -- aic23_power_up(); -- -- if (gpio_get_value(HEADPHONE_GPIO)) -- /* HP not connected, turn on amplifier */ -- gpio_set_value(AMPLIFIER_CTRL_GPIO, 1); -- else -- /* HP connected, do not turn on amplifier */ -- printk("HP connected\n"); --} -- --static void codec_delayed_power_down(struct work_struct *work) --{ -- mutex_lock(&audio_pwr_lock); -- if (audio_pwr_state == -1) -- aic23_power_down(); -- clk_disable(dspxor_ck); -- mutex_unlock(&audio_pwr_lock); --} -- --static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down); -- --static void nokia770_audio_pwr_down(void) --{ -- /* Turn off amplifier */ -- gpio_set_value(AMPLIFIER_CTRL_GPIO, 0); -- -- /* Turn off codec: schedule delayed work */ -- schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */ --} -- --static int --nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage) --{ -- mutex_lock(&audio_pwr_lock); -- if (audio_pwr_state == -1) -- nokia770_audio_pwr_up(); -- /* force audio_pwr_state = 0, even if it was 1. */ -- audio_pwr_state = 0; -- mutex_unlock(&audio_pwr_lock); -- return 0; --} -- --static int --nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) --{ -- mutex_lock(&audio_pwr_lock); -- switch (stage) { -- case 1: -- if (audio_pwr_state == 0) -- audio_pwr_state = 1; -- break; -- case 2: -- if (audio_pwr_state == 1) { -- nokia770_audio_pwr_down(); -- audio_pwr_state = -1; -- } -- break; -- } -- mutex_unlock(&audio_pwr_lock); -- return 0; --} -- --static struct dsp_kfunc_device nokia770_audio_device = { -- .name = "audio", -- .type = DSP_KFUNC_DEV_TYPE_AUDIO, -- .enable = nokia770_audio_pwr_up_request, -- .disable = nokia770_audio_pwr_down_request, --}; -- --static __init int omap_dsp_init(void) --{ -- int ret; -- -- dspxor_ck = clk_get(0, "dspxor_ck"); -- if (IS_ERR(dspxor_ck)) { -- printk(KERN_ERR "couldn't acquire dspxor_ck\n"); -- return PTR_ERR(dspxor_ck); -- } -- -- ret = dsp_kfunc_device_register(&nokia770_audio_device); -- if (ret) { -- printk(KERN_ERR -- "KFUNC device registration faild: %s\n", -- nokia770_audio_device.name); -- goto out; -- } -- return 0; -- out: -- return ret; --} --#else --#define omap_dsp_init() do {} while (0) --#endif /* CONFIG_OMAP_DSP */ -- - static void __init omap_nokia770_init(void) - { - platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices)); -diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c -index 379100c..c00d602 100644 ---- a/arch/arm/mach-omap1/devices.c -+++ b/arch/arm/mach-omap1/devices.c -@@ -63,44 +63,7 @@ static void omap_init_rtc(void) - static inline void omap_init_rtc(void) {} - #endif - --#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) -- --#if defined(CONFIG_ARCH_OMAP15XX) --# define OMAP1_MBOX_SIZE 0x23 --# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1 --#elif defined(CONFIG_ARCH_OMAP16XX) --# define OMAP1_MBOX_SIZE 0x2f --# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 --#endif -- --#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE -- --static struct resource mbox_resources[] = { -- { -- .start = OMAP1_MBOX_BASE, -- .end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE, -- .flags = IORESOURCE_MEM, -- }, -- { -- .start = INT_DSP_MAILBOX1, -- .flags = IORESOURCE_IRQ, -- }, --}; -- --static struct platform_device mbox_device = { -- .name = "omap1-mailbox", -- .id = -1, -- .num_resources = ARRAY_SIZE(mbox_resources), -- .resource = mbox_resources, --}; -- --static inline void omap_init_mbox(void) --{ -- platform_device_register(&mbox_device); --} --#else - static inline void omap_init_mbox(void) { } --#endif - - /*-------------------------------------------------------------------------*/ - -diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c -index e9bdff1..b3a796a 100644 ---- a/arch/arm/mach-omap1/mcbsp.c -+++ b/arch/arm/mach-omap1/mcbsp.c -@@ -23,7 +23,6 @@ - #include <plat/mux.h> - #include <plat/cpu.h> - #include <plat/mcbsp.h> --#include <plat/dsp_common.h> - - #define DPS_RSTCT2_PER_EN (1 << 0) - #define DSP_RSTCT2_WD_PER_EN (1 << 1) -@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id) - clk_enable(api_clk); - clk_enable(dsp_clk); - -- omap_dsp_request_mem(); - /* - * DSP external peripheral reset - * FIXME: This should be moved to dsp code -@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id) - { - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { - if (--dsp_use == 0) { -- omap_dsp_release_mem(); - if (!IS_ERR(api_clk)) { - clk_disable(api_clk); - clk_put(api_clk); -diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c -index ca5b229..9d5466d 100644 ---- a/arch/arm/plat-omap/devices.c -+++ b/arch/arm/plat-omap/devices.c -@@ -30,67 +30,6 @@ - #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 +298,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 da97736..0000000 ---- 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 */ diff --git a/a/content_digest b/N1/content_digest index 6d78833..a2bfd14 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,10 @@ "ref\0cover.1277911345.git.siccegge@cs.fau.de\0" "ref\0fc9feac62dc4eb90e8c3b7039729fa102ad0ac98.1277911346.git.siccegge@cs.fau.de\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 11/33] Removing dead OMAP_DSP\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 11/33] Removing dead OMAP_DSP\0" "Date\0Mon, 5 Jul 2010 11:20:51 +0300\0" - "To\0Christoph Egger <siccegge@cs.fau.de>\0" - "Cc\0Russell King <linux@arm.linux.org.uk>" - Tomi Valkeinen <tomi.valkeinen@nokia.com> - Cory Maccarrone <darkstar6262@gmail.com> - Felipe Balbi <felipe.balbi@nokia.com> - Zebediah C. McClure <zmc@lurian.net> - Alistair Buxton <a.j.buxton@gmail.com> - Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> - Jorge Eduardo Candelaria <x0107209@ti.com> - Santosh Shilimkar <santosh.shilimkar@ti.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " vamos@i4.informatik.uni-erlangen.de\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:\n" "> OMAP_DSP doesn't exist in Kconfig, therefore removing all\n" @@ -26,366 +13,5 @@ "I've updated and queued this one. Updated patch below.\n" "\n" Tony - "\01:2\0" - "fn\0dead-dsp.patch\0" - "b\0" - ">From 2a65e8217bc6686b409ae19ec79e89421b5e73c1 Mon Sep 17 00:00:00 2001\n" - "From: Christoph Egger <siccegge@cs.fau.de>\n" - "Date: Wed, 30 Jun 2010 15:57:26 +0000\n" - "Subject: [PATCH] Removing dead OMAP_DSP\n" - "\n" - "OMAP_DSP doesn't exist in Kconfig, therefore removing all\n" - "references for it from the source code.\n" - "\n" - "Signed-off-by: Christoph Egger <siccegge@cs.fau.de>\n" - "[tony@atomide.com: updated to apply on top of already queued patches]\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c\n" - "index c9e9e37..5a7b638 100644\n" - "--- a/arch/arm/mach-omap1/board-nokia770.c\n" - "+++ b/arch/arm/mach-omap1/board-nokia770.c\n" - "@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void)\n" - " }\n" - " #endif\n" - " \n" - "-#if\tdefined(CONFIG_OMAP_DSP)\n" - "-/*\n" - "- * audio power control\n" - "- */\n" - "-#define\tHEADPHONE_GPIO\t\t14\n" - "-#define\tAMPLIFIER_CTRL_GPIO\t58\n" - "-\n" - "-static struct clk *dspxor_ck;\n" - "-static DEFINE_MUTEX(audio_pwr_lock);\n" - "-/*\n" - "- * audio_pwr_state\n" - "- * +--+-------------------------+---------------------------------------+\n" - "- * |-1|down\t\t\t|power-up request -> 0\t\t\t|\n" - "- * +--+-------------------------+---------------------------------------+\n" - "- * | 0|up\t\t\t|power-down(1) request -> 1\t\t|\n" - "- * | |\t\t\t\t|power-down(2) request -> (ignore)\t|\n" - "- * +--+-------------------------+---------------------------------------+\n" - "- * | 1|up,\t\t\t|power-up request -> 0\t\t\t|\n" - "- * | |received down(1) request\t|power-down(2) request -> -1\t\t|\n" - "- * +--+-------------------------+---------------------------------------+\n" - "- */\n" - "-static int audio_pwr_state = -1;\n" - "-\n" - "-static inline void aic23_power_up(void)\n" - "-{\n" - "-}\n" - "-static inline void aic23_power_down(void)\n" - "-{\n" - "-}\n" - "-\n" - "-/*\n" - "- * audio_pwr_up / down should be called under audio_pwr_lock\n" - "- */\n" - "-static void nokia770_audio_pwr_up(void)\n" - "-{\n" - "-\tclk_enable(dspxor_ck);\n" - "-\n" - "-\t/* Turn on codec */\n" - "-\taic23_power_up();\n" - "-\n" - "-\tif (gpio_get_value(HEADPHONE_GPIO))\n" - "-\t\t/* HP not connected, turn on amplifier */\n" - "-\t\tgpio_set_value(AMPLIFIER_CTRL_GPIO, 1);\n" - "-\telse\n" - "-\t\t/* HP connected, do not turn on amplifier */\n" - "-\t\tprintk(\"HP connected\\n\");\n" - "-}\n" - "-\n" - "-static void codec_delayed_power_down(struct work_struct *work)\n" - "-{\n" - "-\tmutex_lock(&audio_pwr_lock);\n" - "-\tif (audio_pwr_state == -1)\n" - "-\t\taic23_power_down();\n" - "-\tclk_disable(dspxor_ck);\n" - "-\tmutex_unlock(&audio_pwr_lock);\n" - "-}\n" - "-\n" - "-static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);\n" - "-\n" - "-static void nokia770_audio_pwr_down(void)\n" - "-{\n" - "-\t/* Turn off amplifier */\n" - "-\tgpio_set_value(AMPLIFIER_CTRL_GPIO, 0);\n" - "-\n" - "-\t/* Turn off codec: schedule delayed work */\n" - "-\tschedule_delayed_work(&codec_power_down_work, HZ / 20);\t/* 50ms */\n" - "-}\n" - "-\n" - "-static int\n" - "-nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)\n" - "-{\n" - "-\tmutex_lock(&audio_pwr_lock);\n" - "-\tif (audio_pwr_state == -1)\n" - "-\t\tnokia770_audio_pwr_up();\n" - "-\t/* force audio_pwr_state = 0, even if it was 1. */\n" - "-\taudio_pwr_state = 0;\n" - "-\tmutex_unlock(&audio_pwr_lock);\n" - "-\treturn 0;\n" - "-}\n" - "-\n" - "-static int\n" - "-nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)\n" - "-{\n" - "-\tmutex_lock(&audio_pwr_lock);\n" - "-\tswitch (stage) {\n" - "-\tcase 1:\n" - "-\t\tif (audio_pwr_state == 0)\n" - "-\t\t\taudio_pwr_state = 1;\n" - "-\t\tbreak;\n" - "-\tcase 2:\n" - "-\t\tif (audio_pwr_state == 1) {\n" - "-\t\t\tnokia770_audio_pwr_down();\n" - "-\t\t\taudio_pwr_state = -1;\n" - "-\t\t}\n" - "-\t\tbreak;\n" - "-\t}\n" - "-\tmutex_unlock(&audio_pwr_lock);\n" - "-\treturn 0;\n" - "-}\n" - "-\n" - "-static struct dsp_kfunc_device nokia770_audio_device = {\n" - "-\t.name\t = \"audio\",\n" - "-\t.type\t = DSP_KFUNC_DEV_TYPE_AUDIO,\n" - "-\t.enable = nokia770_audio_pwr_up_request,\n" - "-\t.disable = nokia770_audio_pwr_down_request,\n" - "-};\n" - "-\n" - "-static __init int omap_dsp_init(void)\n" - "-{\n" - "-\tint ret;\n" - "-\n" - "-\tdspxor_ck = clk_get(0, \"dspxor_ck\");\n" - "-\tif (IS_ERR(dspxor_ck)) {\n" - "-\t\tprintk(KERN_ERR \"couldn't acquire dspxor_ck\\n\");\n" - "-\t\treturn PTR_ERR(dspxor_ck);\n" - "-\t}\n" - "-\n" - "-\tret = dsp_kfunc_device_register(&nokia770_audio_device);\n" - "-\tif (ret) {\n" - "-\t\tprintk(KERN_ERR\n" - "-\t\t \"KFUNC device registration faild: %s\\n\",\n" - "-\t\t nokia770_audio_device.name);\n" - "-\t\tgoto out;\n" - "-\t}\n" - "-\treturn 0;\n" - "- out:\n" - "-\treturn ret;\n" - "-}\n" - "-#else\n" - "-#define omap_dsp_init()\t\tdo {} while (0)\n" - "-#endif\t/* CONFIG_OMAP_DSP */\n" - "-\n" - " static void __init omap_nokia770_init(void)\n" - " {\n" - " \tplatform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));\n" - "diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c\n" - "index 379100c..c00d602 100644\n" - "--- a/arch/arm/mach-omap1/devices.c\n" - "+++ b/arch/arm/mach-omap1/devices.c\n" - "@@ -63,44 +63,7 @@ static void omap_init_rtc(void)\n" - " static inline void omap_init_rtc(void) {}\n" - " #endif\n" - " \n" - "-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)\n" - "-\n" - "-#if defined(CONFIG_ARCH_OMAP15XX)\n" - "-# define OMAP1_MBOX_SIZE\t0x23\n" - "-# define INT_DSP_MAILBOX1\tINT_1510_DSP_MAILBOX1\n" - "-#elif defined(CONFIG_ARCH_OMAP16XX)\n" - "-# define OMAP1_MBOX_SIZE\t0x2f\n" - "-# define INT_DSP_MAILBOX1\tINT_1610_DSP_MAILBOX1\n" - "-#endif\n" - "-\n" - "-#define OMAP1_MBOX_BASE\t\tOMAP16XX_MAILBOX_BASE\n" - "-\n" - "-static struct resource mbox_resources[] = {\n" - "-\t{\n" - "-\t\t.start\t\t= OMAP1_MBOX_BASE,\n" - "-\t\t.end\t\t= OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,\n" - "-\t\t.flags\t\t= IORESOURCE_MEM,\n" - "-\t},\n" - "-\t{\n" - "-\t\t.start\t\t= INT_DSP_MAILBOX1,\n" - "-\t\t.flags\t\t= IORESOURCE_IRQ,\n" - "-\t},\n" - "-};\n" - "-\n" - "-static struct platform_device mbox_device = {\n" - "-\t.name\t\t= \"omap1-mailbox\",\n" - "-\t.id\t\t= -1,\n" - "-\t.num_resources\t= ARRAY_SIZE(mbox_resources),\n" - "-\t.resource\t= mbox_resources,\n" - "-};\n" - "-\n" - "-static inline void omap_init_mbox(void)\n" - "-{\n" - "-\tplatform_device_register(&mbox_device);\n" - "-}\n" - "-#else\n" - " static inline void omap_init_mbox(void) { }\n" - "-#endif\n" - " \n" - " /*-------------------------------------------------------------------------*/\n" - " \n" - "diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c\n" - "index e9bdff1..b3a796a 100644\n" - "--- a/arch/arm/mach-omap1/mcbsp.c\n" - "+++ b/arch/arm/mach-omap1/mcbsp.c\n" - "@@ -23,7 +23,6 @@\n" - " #include <plat/mux.h>\n" - " #include <plat/cpu.h>\n" - " #include <plat/mcbsp.h>\n" - "-#include <plat/dsp_common.h>\n" - " \n" - " #define DPS_RSTCT2_PER_EN\t(1 << 0)\n" - " #define DSP_RSTCT2_WD_PER_EN\t(1 << 1)\n" - "@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id)\n" - " \t\t\t\tclk_enable(api_clk);\n" - " \t\t\t\tclk_enable(dsp_clk);\n" - " \n" - "-\t\t\t\tomap_dsp_request_mem();\n" - " \t\t\t\t/*\n" - " \t\t\t\t * DSP external peripheral reset\n" - " \t\t\t\t * FIXME: This should be moved to dsp code\n" - "@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id)\n" - " {\n" - " \tif (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {\n" - " \t\tif (--dsp_use == 0) {\n" - "-\t\t\tomap_dsp_release_mem();\n" - " \t\t\tif (!IS_ERR(api_clk)) {\n" - " \t\t\t\tclk_disable(api_clk);\n" - " \t\t\t\tclk_put(api_clk);\n" - "diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c\n" - "index ca5b229..9d5466d 100644\n" - "--- a/arch/arm/plat-omap/devices.c\n" - "+++ b/arch/arm/plat-omap/devices.c\n" - "@@ -30,67 +30,6 @@\n" - " #include <plat/dsp_common.h>\n" - " #include <plat/omap44xx.h>\n" - " \n" - "-#if\tdefined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)\n" - "-\n" - "-static struct dsp_platform_data dsp_pdata = {\n" - "-\t.kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),\n" - "-};\n" - "-\n" - "-static struct resource omap_dsp_resources[] = {\n" - "-\t{\n" - "-\t\t.name\t= \"dsp_mmu\",\n" - "-\t\t.start\t= -1,\n" - "-\t\t.flags\t= IORESOURCE_IRQ,\n" - "-\t},\n" - "-};\n" - "-\n" - "-static struct platform_device omap_dsp_device = {\n" - "-\t.name\t\t= \"dsp\",\n" - "-\t.id\t\t= -1,\n" - "-\t.num_resources\t= ARRAY_SIZE(omap_dsp_resources),\n" - "-\t.resource\t= omap_dsp_resources,\n" - "-\t.dev = {\n" - "-\t\t.platform_data = &dsp_pdata,\n" - "-\t},\n" - "-};\n" - "-\n" - "-static inline void omap_init_dsp(void)\n" - "-{\n" - "-\tstruct resource *res;\n" - "-\tint irq;\n" - "-\n" - "-\tif (cpu_is_omap15xx())\n" - "-\t\tirq = INT_1510_DSP_MMU;\n" - "-\telse if (cpu_is_omap16xx())\n" - "-\t\tirq = INT_1610_DSP_MMU;\n" - "-\telse if (cpu_is_omap24xx())\n" - "-\t\tirq = INT_24XX_DSP_MMU;\n" - "-\n" - "-\tres = platform_get_resource_byname(&omap_dsp_device,\n" - "-\t\t\t\t\t IORESOURCE_IRQ, \"dsp_mmu\");\n" - "-\tres->start = irq;\n" - "-\n" - "-\tplatform_device_register(&omap_dsp_device);\n" - "-}\n" - "-\n" - "-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)\n" - "-{\n" - "-\tstatic DEFINE_MUTEX(dsp_pdata_lock);\n" - "-\n" - "-\tspin_lock_init(&kdev->lock);\n" - "-\n" - "-\tmutex_lock(&dsp_pdata_lock);\n" - "-\tlist_add_tail(&kdev->entry, &dsp_pdata.kdev_list);\n" - "-\tmutex_unlock(&dsp_pdata_lock);\n" - "-\n" - "-\treturn 0;\n" - "-}\n" - "-EXPORT_SYMBOL(dsp_kfunc_device_register);\n" - "-\n" - "-#else\n" - "-static inline void omap_init_dsp(void) { }\n" - "-#endif\t/* CONFIG_OMAP_DSP */\n" - "-\n" - " /*-------------------------------------------------------------------------*/\n" - " \n" - " #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)\n" - "@@ -359,7 +298,6 @@ static int __init omap_init_devices(void)\n" - " \t/* please keep these calls, and their implementations above,\n" - " \t * in alphabetical order so they're easier to sort through.\n" - " \t */\n" - "-\tomap_init_dsp();\n" - " \tomap_init_rng();\n" - " \tomap_init_mcpdm();\n" - " \tomap_init_uwire();\n" - "diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h\n" - "deleted file mode 100644\n" - "index da97736..0000000\n" - "--- a/arch/arm/plat-omap/include/plat/dsp_common.h\n" - "+++ /dev/null\n" - "@@ -1,40 +0,0 @@\n" - "-/*\n" - "- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)\n" - "- *\n" - "- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.\n" - "- *\n" - "- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>\n" - "- *\n" - "- * This program is free software; you can redistribute it and/or\n" - "- * modify it under the terms of the GNU General Public License\n" - "- * version 2 as published by the Free Software Foundation.\n" - "- *\n" - "- * This program is distributed in the hope that it will be useful, but\n" - "- * WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "- * General Public License for more details.\n" - "- *\n" - "- * You should have received a copy of the GNU General Public License\n" - "- * along with this program; if not, write to the Free Software\n" - "- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" - "- * 02110-1301 USA\n" - "- *\n" - "- */\n" - "-\n" - "-#ifndef ASM_ARCH_DSP_COMMON_H\n" - "-#define ASM_ARCH_DSP_COMMON_H\n" - "-\n" - "-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)\n" - "-extern void omap_dsp_request_mpui(void);\n" - "-extern void omap_dsp_release_mpui(void);\n" - "-extern int omap_dsp_request_mem(void);\n" - "-extern int omap_dsp_release_mem(void);\n" - "-#else\n" - "-static inline int omap_dsp_request_mem(void)\n" - "-{\n" - "-\treturn 0;\n" - "-}\n" - "-#define omap_dsp_release_mem()\tdo {} while (0)\n" - "-#endif\n" - "-\n" - -#endif /* ASM_ARCH_DSP_COMMON_H */ -e6ef3295b1807953f22ba19382f1b9458ea283548f4bcf8641363a61f92ccba6 +1b5aabc73f31ca5ccad68e269408ead82baf6a98f4425abb232f290cc3a4fdaa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.