From patchwork Sun May 16 15:46:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99979 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4GFlCUf025454 for ; Sun, 16 May 2010 15:47:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753763Ab0EPPrK (ORCPT ); Sun, 16 May 2010 11:47:10 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:52160 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753899Ab0EPPrJ (ORCPT ); Sun, 16 May 2010 11:47:09 -0400 Received: by fxm6 with SMTP id 6so2978236fxm.19 for ; Sun, 16 May 2010 08:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=NytazGsk45Kc1UNQfPmHtVd5BLk4yu6WCuDEoBFp80s=; b=Gz2YCEcpkGqYRSw2dszGYL+XNQrh+lWGfTd2ERYCrKHjD0KZZaVgh764fI82xmo9QS MyGMPdasXeN344fO8omPVmahLd2n4xtLFW0/cS+N0axlnta+W6jcJ9GFD77Gf4TkYrEO XO+8cf7T2+1jhR6dMG5VpmJCjZy2+y2fdNNaw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=urzvztn9akbWyflYv1rmRprpn1tFYj54YINR4yaQFV7vZi4qclpYMKHqtHlKhTyfE9 6pNf3VKlKFo1igaXSU7ToKaUGun9FFv5BDDM68a8E1pMGWWXxx+AfvGo+LFh68NF6hFN 7asjin1P4mt8deKB89R8WrS3thgbeD6lHDcbY= Received: by 10.87.35.9 with SMTP id n9mr6781000fgj.45.1274024828352; Sun, 16 May 2010 08:47:08 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d8sm11668313fga.21.2010.05.16.08.47.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 May 2010 08:47:07 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Fernando Guzman Lugo , Felipe Contreras , Tony Lindgren Subject: [PATCH 1/5] omap: OMAP_DSP is not in mainline, remove it Date: Sun, 16 May 2010 18:46:57 +0300 Message-Id: <1274024821-21178-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274024821-21178-1-git-send-email-felipe.contreras@gmail.com> References: <1274024821-21178-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 16 May 2010 15:47:12 +0000 (UTC) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index dc2e631..b552976 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -30,67 +30,6 @@ #include #include -#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_MPU_BRIDGE) || defined(CONFIG_MPU_BRIDGE_MODULE) static unsigned long dspbridge_phys_mempool_base; @@ -410,7 +349,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_kp(); omap_init_rng(); omap_init_uwire();