From patchwork Fri Mar 19 04:47:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 86877 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 o2J4l1kv016568 for ; Fri, 19 Mar 2010 04:47:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751176Ab0CSErS (ORCPT ); Fri, 19 Mar 2010 00:47:18 -0400 Received: from mail-yx0-f182.google.com ([209.85.210.182]:36242 "EHLO mail-yx0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171Ab0CSErS (ORCPT ); Fri, 19 Mar 2010 00:47:18 -0400 Received: by yxe12 with SMTP id 12so453899yxe.33 for ; Thu, 18 Mar 2010 21:47:17 -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:date:message-id :in-reply-to:references:subject; bh=HSHL4GXfJJGyC+Vz3/c4JlTbF3cKuU+vsrM8zlAAuwE=; b=l8NkEyJGolbIQf5c7ZiasPL5HTfCg/2nGN1BR69yXhUY1Zwm+2NWUcx7bYbuav0iEB dajLRwHnFD0N0Hcsh02T0iabjpLo9Bvbg/sLq9ZtP44gWZq+aN+mi9agDuKbsOQ7d3L6 ivLHKWcWzLftjhRTPqXtNOhF7eJngpDk+2N08= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=nlfFIeSSfidtPutBGo8HLFi5uTWpwc6AklWBfzh2dRRf5AmFcDLQ3wtmDZDhlpF8fo vn9SRPKarr7/o7308+PsJfhfxMUwvw2hXmov9TjM08CBj0IhiZr+2yoF/vxnH5ZE+YhH DHwXPUouv86mn6eXLaFX/paUmLAo1ffUyuDv0= Received: by 10.100.84.8 with SMTP id h8mr6083823anb.104.1268974037275; Thu, 18 Mar 2010 21:47:17 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 15sm494945gxk.6.2010.03.18.21.47.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 18 Mar 2010 21:47:16 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org, dan.j.williams@intel.com, iwamatsu@nigauri.org, g.liakhovetski@gmx.de Date: Fri, 19 Mar 2010 13:47:19 +0900 Message-Id: <20100319044719.17051.57155.sendpatchset@t400s> In-Reply-To: <20100319044630.17051.16445.sendpatchset@t400s> References: <20100319044630.17051.16445.sendpatchset@t400s> Subject: [PATCH 05/05] dmaengine: shdma: Enable on SH-Mobile ARM Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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]); Fri, 19 Mar 2010 04:47:19 +0000 (UTC) --- 0001/drivers/dma/Kconfig +++ work/drivers/dma/Kconfig 2010-03-18 23:38:59.000000000 +0900 @@ -128,7 +128,7 @@ config TXX9_DMAC config SH_DMAE tristate "Renesas SuperH DMAC support" - depends on SUPERH && SH_DMA + depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE) depends on !SH_DMA_API select DMA_ENGINE help --- 0008/drivers/dma/shdma.c +++ work/drivers/dma/shdma.c 2010-03-19 12:39:33.000000000 +0900 @@ -793,7 +793,7 @@ static irqreturn_t sh_dmae_interrupt(int return ret; } -#if defined(CONFIG_CPU_SH4) +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) static irqreturn_t sh_dmae_err(int irq, void *data) { struct sh_dmae_device *shdev = (struct sh_dmae_device *)data; @@ -1034,7 +1034,7 @@ static int __init sh_dmae_probe(struct p /* Default transfer size of 32 bytes requires 32-byte alignment */ shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE; -#if defined(CONFIG_CPU_SH4) +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1); if (!chanirq_res) @@ -1059,7 +1059,7 @@ static int __init sh_dmae_probe(struct p #else chanirq_res = errirq_res; -#endif /* CONFIG_CPU_SH4 */ +#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */ if (chanirq_res->start == chanirq_res->end && !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) { @@ -1106,7 +1106,7 @@ static int __init sh_dmae_probe(struct p chan_probe_err: sh_dmae_chan_remove(shdev); eirqres: -#if defined(CONFIG_CPU_SH4) +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) free_irq(errirq, shdev); eirq_err: #endif --- 0005/include/linux/serial_sci.h +++ work/include/linux/serial_sci.h 2010-03-18 23:38:59.000000000 +0900 @@ -3,7 +3,7 @@ #include #ifdef CONFIG_SERIAL_SH_SCI_DMA -#include +#include #endif /*