From patchwork Thu Mar 17 09:20:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102555 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp345683lbc; Thu, 17 Mar 2016 02:21:19 -0700 (PDT) X-Received: by 10.66.120.202 with SMTP id le10mr13152030pab.155.1458206478986; Thu, 17 Mar 2016 02:21:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c8si11320756pat.62.2016.03.17.02.21.18; Thu, 17 Mar 2016 02:21:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935294AbcCQJVL (ORCPT + 31 others); Thu, 17 Mar 2016 05:21:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52526 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932757AbcCQJUy (ORCPT ); Thu, 17 Mar 2016 05:20:54 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MU9x3-1aGG6q2W3t-00QneZ; Thu, 17 Mar 2016 10:20:41 +0100 From: Arnd Bergmann To: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Cc: Arnd Bergmann , Kalle Valo , Hauke Mehrtens , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] bcma: use of_dma_configure() to set initial dma mask Date: Thu, 17 Mar 2016 10:20:21 +0100 Message-Id: <1458206432-3039552-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1458206432-3039552-1-git-send-email-arnd@arndb.de> References: <1458206432-3039552-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Q7E1RqDPUOVbk1fxUJkvlPvhwKUDW1k57iON8PY/HOrYjAWeCLg zZtKVn8iM/Axy0PJ6G325a+0AeaCad4abVW3T0miItyV5D9r1nc/Z9sz2d8kCBGe6drbLAX GrxhTPgP2WcX0WeZ0/Cx1z6KWurEIm7kFfJFhwqf0r+jj2n0qTqZZAkHXOLZGU4tOFhLe+w z0NSmgqCcgOe6uBSE1sbQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:LxXqH/SyXTw=:eqd0zph5Osy7SvehsuRh92 qHa6MJreSFm7ohZ9onYGw3dDGKFmgEhZnnp2oOIt3pjaceAZ2zyfLRxZbBArt+on5eqOkizTZ LbGbz/E9mpHVrcPZ0gT47ki7ldxyXe7e4e94TM7hmYT9+JlFlUMJ4YRQupk+UHtC2RFLLWKyM GpIhHlhbgsPn9zwLoBcY+zbcu7Gg94Oc7il/M7uZiiryGwB5nsf1ucO0ze1qBoR/7L/cN6vjM AROigZjOPKlhBnlYYK4wKj2D5V2Aa2VgoaBudvNSScqJ4DwoNp0Dylg8P3Mq1ShXwHtaUrhAj qHDJK34Qndj/blkKZFhURKrUWgAmqTDL9RbPvXYaGv/LUrWrxuNSQo0xzoJuILITsY0e1odT7 NfFsMzxxYFnejCRH9zGQaDZHv2LYIuDBIaTVFvNQvMA1xebnitDdFil8nxGv4A/EjSiplRcth 9FyWaK4ayjDcWQyIbycl6v7fTri8cxLW9Qh2KX3Rv76LcXVtvgZxiDpiQQSA5TNVglAMNbYqe +nCIGTVIxb8O9BUyrA8wYYZkkXz2EohcYbdyoBCJV2DDO8/Es1/FkaMbVbSaucknYbcdI7otu LU2PqV87jf4O+Yt6hJXVS7cYvBdlvKgCdBfZ6iLsdKUhccoeCNZ1nHjbPXH5ShAXoTeMPeQeS 3q/A7gywltzt+hAtmr9gNvtlpTLyn+uo40MewQfoiBPboAC5aa3FUoGS6wIV2k6HPnr8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While fixing another bug, I noticed that bcma manually sets up a dma_mask pointer for its child devices. We have a generic helper for that now, which should be able to cope better with any variations that might be needed to deal with cache coherency, unusual DMA address offsets, iommus, or limited DMA masks, none of which are currently handled here. This changes the core to use the of_dma_configure(), like we do for platform devices that are probed directly from DT. Signed-off-by: Arnd Bergmann --- This patch needs to be tested to ensure we don't introduce regressions, and should probably go into 4.7 as a cleanup. --- drivers/bcma/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 1f635471f318..57d223a7a720 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -209,6 +209,8 @@ static void bcma_of_fill_device(struct platform_device *parent, core->dev.of_node = node; core->irq = bcma_of_get_irq(parent, core, 0); + + of_dma_configure(core->dev, node); } unsigned int bcma_core_irq(struct bcma_device *core, int num) @@ -248,12 +250,12 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) core->irq = bus->host_pci->irq; break; case BCMA_HOSTTYPE_SOC: - core->dev.dma_mask = &core->dev.coherent_dma_mask; - if (bus->host_pdev) { + if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) { core->dma_dev = &bus->host_pdev->dev; core->dev.parent = &bus->host_pdev->dev; bcma_of_fill_device(bus->host_pdev, core); } else { + core->dev.dma_mask = &core->dev.coherent_dma_mask; core->dma_dev = &core->dev; } break;