From patchwork Thu Jun 2 09:38:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 98361 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6416BB6F9C for ; Thu, 2 Jun 2011 19:40:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933189Ab1FBJkm (ORCPT ); Thu, 2 Jun 2011 05:40:42 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:47618 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933050Ab1FBJkk (ORCPT ); Thu, 2 Jun 2011 05:40:40 -0400 Received: by mail-ey0-f174.google.com with SMTP id 24so218562eyx.19 for ; Thu, 02 Jun 2011 02:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:in-reply-to:references; bh=2Nx5beaaHuVfrAZ3LNvBMpMhMNo6s/7lmIzTXcS1DvY=; b=qxQILrFJxNtvuXqtXuER88cDlLGVIBu4umfrvS2JG9EF766vrQM8Lby4a8EPFh+ClU 33SVmMJC4B8ORmUsRvKFGrNuArc2DclR+9BGbLf5ZL/ryET6q7Rx6H/FXCB/XIt5VUm4 GHvaTQj0bo9ao6MmlCw4d38gAV2m+a5SGSCEY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=b+9bHzmV3j7BM0sNzPnn8D+3Cmo/Rg/uNldd9xPELMii0xP/AWP+F0X0zqn61pS5+i OO+H5/oNBil6U2//okkgx121RuIoefxByaasAFVEsnKRjvPci+oWkMDs8SsLrz2QyHvq nmGQO1+aZBcIyi8Qlgd47WIP/urhX/KNaRtyE= Received: by 10.213.114.1 with SMTP id c1mr2329393ebq.54.1307007640039; Thu, 02 Jun 2011 02:40:40 -0700 (PDT) Received: from acer.healthdatacare.com (a88-115-37-157.elisa-laajakaista.fi [88.115.37.157]) by mx.google.com with ESMTPS id y6sm282499eem.4.2011.06.02.02.40.38 (version=SSLv3 cipher=OTHER); Thu, 02 Jun 2011 02:40:39 -0700 (PDT) From: Mika Westerberg To: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kernel@wantstofly.org, hsweeten@visionengravers.com, ryan@bluewatersys.com, Mika Westerberg Subject: [PATCH 5/5] ep93xx: set DMA masks for the ep93xx_eth Date: Thu, 2 Jun 2011 12:38:17 +0300 Message-Id: <56828d7f2670b3782fea89cbc849d526ca3df8d7.1307006502.git.mika.westerberg@iki.fi> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <89df467f9811b4f869513de3ada90ce7de74c6d1.1307006502.git.mika.westerberg@iki.fi> References: <89df467f9811b4f869513de3ada90ce7de74c6d1.1307006502.git.mika.westerberg@iki.fi> In-Reply-To: <89df467f9811b4f869513de3ada90ce7de74c6d1.1307006502.git.mika.westerberg@iki.fi> References: <89df467f9811b4f869513de3ada90ce7de74c6d1.1307006502.git.mika.westerberg@iki.fi> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As the driver is now passing platform device to the DMA mapping functions, we should give it valid DMA masks. Signed-off-by: Mika Westerberg --- arch/arm/mach-ep93xx/core.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 8207954..1d4b65f 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -402,11 +402,15 @@ static struct resource ep93xx_eth_resource[] = { } }; +static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32); + static struct platform_device ep93xx_eth_device = { .name = "ep93xx-eth", .id = -1, .dev = { - .platform_data = &ep93xx_eth_data, + .platform_data = &ep93xx_eth_data, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &ep93xx_eth_dma_mask, }, .num_resources = ARRAY_SIZE(ep93xx_eth_resource), .resource = ep93xx_eth_resource,