From patchwork Tue Apr 23 15:03:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16358 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ADEE12391B for ; Tue, 23 Apr 2013 15:04:42 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id 11sf1304439vbf.9 for ; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=Iv7kwB8UYt9VF3TBVKpypuGingb7zCMIosmoMP8dWEM=; b=MH1vMJWfmSPvINif1EXUhHCzBVHShoUmleO4ox+50jNvvtlnDzd57Sy84hUCKtB8SC 3RWbNXC2oepn6jyA91a461VnE18lN7z9Ncpyfl/FzDmr6w+RpT19I5zGCNPrwUIsmMM7 jYR5iyceVbIJ5jbNN3GJC2XQ8kQvA/9pQxIcEwUivrhHiXqOKHiK7GCrKZddaUAB3Tz2 3rI2H6FkJdmwIhKGfmF2zcjrIg33Flm734HLjXFbIY4ddeIBmZ7FH1HN//ffpjw9jcW7 HVHgIXkFRCIyrEmHDPxcj20qpJYXkDS0ce4PRGGkisNknJHRXofPKBeN+DKwSW1m7r+B sBqA== X-Received: by 10.224.217.195 with SMTP id hn3mr22737422qab.5.1366729433456; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.142 with SMTP id a14ls380680qey.63.gmail; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) X-Received: by 10.220.109.145 with SMTP id j17mr22545161vcp.34.1366729433191; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ex4si18694989vdb.79.2013.04.23.08.03.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id m17so706813vca.39 for ; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) X-Received: by 10.52.34.168 with SMTP id a8mr19319177vdj.75.1366729433011; Tue, 23 Apr 2013 08:03:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp129528veb; Tue, 23 Apr 2013 08:03:49 -0700 (PDT) X-Received: by 10.194.81.71 with SMTP id y7mr61784408wjx.19.1366729424338; Tue, 23 Apr 2013 08:03:44 -0700 (PDT) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [2a00:1450:400c:c05::232]) by mx.google.com with ESMTPS id ex2si6363796wib.38.2013.04.23.08.03.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:44 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::232 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::232; Received: by mail-wi0-f178.google.com with SMTP id hm14so895795wib.17 for ; Tue, 23 Apr 2013 08:03:44 -0700 (PDT) X-Received: by 10.194.109.136 with SMTP id hs8mr62199208wjb.8.1366729421901; Tue, 23 Apr 2013 08:03:41 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id q20sm16491081wiv.7.2013.04.23.08.03.39 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:40 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, mian.yousaf.kaukab@stericsson.com, Lee Jones , Felipe Balbi , linux-usb@vger.kernel.org Subject: [PATCH 03/10] usb: musb: ux500: take the dma_mask from coherent_dma_mask Date: Tue, 23 Apr 2013 16:03:07 +0100 Message-Id: <1366729394-11406-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> References: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlWT3xwj9pkLroL5Zptd+4XEM2+PsQiXtuzEqAO3bDhtpFIQ3t7u5vGf7+26inJ3TtG2HAT X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The dma_mask will always be the same as the coherent_dma_mask, so let's cut down on the platform_data burden and set it as such in the driver. This also saves us from supporting it separately when we come to enable this driver for Device Tree. Cc: Felipe Balbi Cc: linux-usb@vger.kernel.org Signed-off-by: Lee Jones --- arch/arm/mach-ux500/usb.c | 3 --- drivers/usb/musb/ux500.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index 4f68a9c..e6c4a05 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -74,8 +74,6 @@ static struct ux500_musb_board_data musb_board_data = { .dma_filter = stedma40_filter, }; -static u64 ux500_musb_dmamask = DMA_BIT_MASK(32); - static struct musb_hdrc_platform_data musb_platform_data = { .mode = MUSB_OTG, .board_data = &musb_board_data, @@ -98,7 +96,6 @@ struct platform_device ux500_musb_device = { .id = 0, .dev = { .platform_data = &musb_platform_data, - .dma_mask = &ux500_musb_dmamask, .coherent_dma_mask = DMA_BIT_MASK(32), }, .num_resources = ARRAY_SIZE(usb_resources), diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 4a8f5c9..7ddb132 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -122,7 +122,7 @@ static int ux500_probe(struct platform_device *pdev) } musb->dev.parent = &pdev->dev; - musb->dev.dma_mask = pdev->dev.dma_mask; + musb->dev.dma_mask = &pdev->dev.coherent_dma_mask; musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; glue->dev = &pdev->dev;