From patchwork Sun Jul 4 13:36:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 110142 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o64DaXVm004716 for ; Sun, 4 Jul 2010 13:36:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757844Ab0GDNgc (ORCPT ); Sun, 4 Jul 2010 09:36:32 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:65451 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757840Ab0GDNgb (ORCPT ); Sun, 4 Jul 2010 09:36:31 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so2295721bwz.19 for ; Sun, 04 Jul 2010 06:36:31 -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=1hm2fx+QUJjGvv5zw5pVTn78DMNG+yRXXph8eVFSt+Q=; b=fqXEnIeJYwDzPfxZ8Bd2KiFFuH8zzs53hZT0lFHlWrcqy7FhH9Q1XLDZeVbd8k6S2q 6rqZ6F3EhCfmLWjlWv7hUkvF/7ocFBXU+Mn9QdBB2okWqckk+Vpyh0hQGQFQWlQYpHWO 8tBI+0Ez6F6xHYVAKtxxDhmm7XF3m38iJRWYY= 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=sHrR4X9QIWFZOZxXfcE1r9xFWY3MOC5SlmSfFfECmKPhDujTdkPVJ2G+1FoWDbIZsv fF0DXzG0GRZWoMXpyiD7Pe+zth2hCzdUI1tZGT+IMffaj/yEhjOPI5EBGN6ChziGlrSK dKIle9o0ER9qiQOaO4ego1NiiOlmkRNEOBBUg= Received: by 10.204.47.38 with SMTP id l38mr913995bkf.154.1278250590911; Sun, 04 Jul 2010 06:36:30 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id s34sm12867240bkk.1.2010.07.04.06.36.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 04 Jul 2010 06:36:30 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Ohad Ben-Cohen , Omar Ramirez Luna , Greg KH , Felipe Contreras , Tony Lindgren Subject: [PATCH 1/5] omap: OMAP_DSP is not in mainline, remove it Date: Sun, 4 Jul 2010 16:36:22 +0300 Message-Id: <1278250586-17062-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278250586-17062-1-git-send-email-felipe.contreras@gmail.com> References: <1278250586-17062-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, 04 Jul 2010 13:36:33 +0000 (UTC) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 95677d1..a3997ec 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -31,67 +31,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_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE) @@ -419,7 +358,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_mcpdm();