From patchwork Thu Sep 10 08:37:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 7152891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 849E2BEEC1 for ; Thu, 10 Sep 2015 09:05:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 935C020883 for ; Thu, 10 Sep 2015 09:05:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9270820876 for ; Thu, 10 Sep 2015 09:05:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZZxkr-000415-Ga; Thu, 10 Sep 2015 09:02:53 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZZxki-0003v5-JD for linux-arm-kernel@bombadil.infradead.org; Thu, 10 Sep 2015 09:02:44 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZZxNi-0000VY-LV for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2015 08:39:00 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8A8cObb005258; Thu, 10 Sep 2015 03:38:24 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8A8cOaC031843; Thu, 10 Sep 2015 03:38:24 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Thu, 10 Sep 2015 03:38:15 -0500 Received: from dlep32.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8A8bqKw018732; Thu, 10 Sep 2015 03:38:21 -0500 From: Peter Ujfalusi To: , , Subject: [PATCH 09/21] ARM: davinci: Add set dma_mask to eDMA devices Date: Thu, 10 Sep 2015 11:37:38 +0300 Message-ID: <1441874270-2399-10-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441874270-2399-1-git-send-email-peter.ujfalusi@ti.com> References: <1441874270-2399-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150910_093858_927749_0BBBE720 X-CRM114-Status: GOOD ( 12.76 ) X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, olof@lixom.net, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The upcoming change to merge the arch/arm/common/edma.c into drivers/dma/edma.c will need this change when booting daVinci devices in no DT mode. Signed-off-by: Peter Ujfalusi --- arch/arm/mach-davinci/devices-da8xx.c | 8 ++++++++ arch/arm/mach-davinci/dm355.c | 8 +++++++- arch/arm/mach-davinci/dm644x.c | 8 +++++++- arch/arm/mach-davinci/dm646x.c | 8 +++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 9ae049ae816a..495e9293ed2a 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -213,21 +213,29 @@ static struct resource da850_edma1_resources[] = { }, }; +static u64 da8xx_edma0_dmamask = DMA_BIT_MASK(32); + static struct platform_device da8xx_edma0_device = { .name = "edma", .id = 0, .dev = { .platform_data = &da8xx_edma0_pdata, + .dma_mask = &da8xx_edma0_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), }, .num_resources = ARRAY_SIZE(da8xx_edma0_resources), .resource = da8xx_edma0_resources, }; +static u64 da850_edma1_dmamask = DMA_BIT_MASK(32); + static struct platform_device da850_edma1_device = { .name = "edma", .id = 1, .dev = { .platform_data = &da850_edma1_pdata, + .dma_mask = &da850_edma1_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), }, .num_resources = ARRAY_SIZE(da850_edma1_resources), .resource = da850_edma1_resources, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index a50bb9c66952..0f8c0ab48872 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -613,10 +613,16 @@ static struct resource edma_resources[] = { /* not using (or muxing) TC*_ERR */ }; +static u64 dm355_edma_dmamask = DMA_BIT_MASK(32); + static struct platform_device dm355_edma_device = { .name = "edma", .id = 0, - .dev.platform_data = &dm355_edma_pdata, + .dev = { + .platform_data = &dm355_edma_pdata, + .dma_mask = &dm355_edma_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, .num_resources = ARRAY_SIZE(edma_resources), .resource = edma_resources, }; diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index d759ca8e58e8..fc8950e5a9a0 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -542,10 +542,16 @@ static struct resource edma_resources[] = { /* not using TC*_ERR */ }; +static u64 dm644x_edma_dmamask = DMA_BIT_MASK(32); + static struct platform_device dm644x_edma_device = { .name = "edma", .id = 0, - .dev.platform_data = &dm644x_edma_pdata, + .dev = { + .platform_data = &dm644x_edma_pdata, + .dma_mask = &dm644x_edma_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, .num_resources = ARRAY_SIZE(edma_resources), .resource = edma_resources, }; diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 219ebc8f674a..77df905949bc 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -589,10 +589,16 @@ static struct resource edma_resources[] = { /* not using TC*_ERR */ }; +static u64 dm646x_edma_dmamask = DMA_BIT_MASK(32); + static struct platform_device dm646x_edma_device = { .name = "edma", .id = 0, - .dev.platform_data = &dm646x_edma_pdata, + .dev = { + .platform_data = &dm646x_edma_pdata, + .dma_mask = &dm646x_edma_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, .num_resources = ARRAY_SIZE(edma_resources), .resource = edma_resources, };