From patchwork Fri May 3 14:32:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16677 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f200.google.com (mail-gg0-f200.google.com [209.85.161.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4210223905 for ; Fri, 3 May 2013 14:35:18 +0000 (UTC) Received: by mail-gg0-f200.google.com with SMTP id h13sf2447249ggd.3 for ; Fri, 03 May 2013 07:35:08 -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=FTOXhmj+OCzcAgPo2CYq7zunnkY1YmrnZCi4kVQYC7E=; b=OQ7TORz+VpwMi165n2hSH+T/z5ysQ8URNGITX0Ut88wlPB9gzvLcYS+qifipdjlVRU QiqJ/UCrGK29lFqDfcG62NzcvSUebJ0PR3Mzbxxk0tMRxNw7gIdy5FBtEpXaL1P9krM0 ILxqwQGsoYml7E+Row67XgdTX3EIyK5WQqN94qaA8qzRjdx+QNBwcam65I1F91rXksq5 VbHxXJKChRol0UBX+mx3GhHPybUeDkvZTAXBqCSW4FiHC3Qt/emejKweY6Avz9glv8UD MpT77WGP4hsvZN1MUrWW1rjQEQI80hgE0HQ+0HeZajDl7ErZ8LUn1X+7lAyOFJZV9ylH sEoQ== X-Received: by 10.236.117.178 with SMTP id j38mr8409600yhh.45.1367591708130; Fri, 03 May 2013 07:35:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.239 with SMTP id 15ls1847375qeh.60.gmail; Fri, 03 May 2013 07:35:07 -0700 (PDT) X-Received: by 10.220.188.70 with SMTP id cz6mr3733748vcb.20.1367591707828; Fri, 03 May 2013 07:35:07 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id zp6si5169104vdb.67.2013.05.03.07.35.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id ib11so1448561vcb.7 for ; Fri, 03 May 2013 07:35:07 -0700 (PDT) X-Received: by 10.58.144.170 with SMTP id sn10mr3716724veb.7.1367591707731; Fri, 03 May 2013 07:35:07 -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 nf2csp25257veb; Fri, 3 May 2013 07:35:07 -0700 (PDT) X-Received: by 10.194.92.197 with SMTP id co5mr14315253wjb.41.1367591706728; Fri, 03 May 2013 07:35:06 -0700 (PDT) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [2a00:1450:400c:c00::22a]) by mx.google.com with ESMTPS id cb15si3608421wib.58.2013.05.03.07.35.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:06 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::22a; Received: by mail-wg0-f42.google.com with SMTP id j13so772366wgh.5 for ; Fri, 03 May 2013 07:35:06 -0700 (PDT) X-Received: by 10.180.205.135 with SMTP id lg7mr13597284wic.11.1367591706314; Fri, 03 May 2013 07:35:06 -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 ESMTPSA id o3sm17516019wia.2.2013.05.03.07.35.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:05 -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, srinidhi.kasagar@stericsson.com, Lee Jones , Felipe Balbi , linux-usb@vger.kernel.org Subject: [PATCH 46/63] usb: musb: ux500: take the dma_mask from coherent_dma_mask Date: Fri, 3 May 2013 15:32:32 +0100 Message-Id: <1367591569-32197-47-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> References: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlugJzlHqHTe5fdYteneeQ05TNd/K8kX9InFjqWIB68LqVFFHXLFOZFlWrhc8InMT7fSC1j X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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 Acked-by: Linus Walleij Acked-by: Fabio Baltieri 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;