From patchwork Fri May 24 18:27:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13673526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A67D1C25B7D for ; Fri, 24 May 2024 18:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XEzc1aeyculmh+lsTRSYu/vMUDvnp/TmiXj227wVgNI=; b=Na126rR8Pkl/oW 3wEPOfREfikxyMNvPqaLcTAnKDK6kHdCk7AhZSHEARJ1Q3KEBK86zxVs+LotOngFJYLyZIKeuhH7b 55BDLD1EsmrXV2IeJ7qvc73dDsClNJpqCUvM5PCPKH4mVmbQbj3Gi9TyiFsPHGl37lKYvmtB4bsCW ObC8EA/83lVmIT1q1fzYXN3SClTUHFzDp/JV8rRZ42ulu2XnbG1p1ZXrfjl6d5wEMEiuGOaxwe//2 oqMtdofDS7BVLI1UidAJp/0LFKIbj3GoiYttGn1Rd5vWmWMhcW24jd/xXfaCDhqGBBtxIJkPprdLz R8CbyiWPz8/kCxArN5SA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZfn-00000009aQC-1sVQ; Fri, 24 May 2024 18:29:47 +0000 Received: from mail-lf1-x163.google.com ([2a00:1450:4864:20::163]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe8-00000009ZCr-2zLE for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2024 18:28:09 +0000 Received: by mail-lf1-x163.google.com with SMTP id 2adb3069b0e04-5295dada905so922756e87.1 for ; Fri, 24 May 2024 11:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1716575281; x=1717180081; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ILGqA7+HzXQqr0Ob8oymTx1wN+C0088/4KfGywkxvSc=; b=ByDYPPEid1+i5yrq8x0FRGWIbKuvLa6Hw2fFEtwKW1+UwM+604uFnU7W0Tf0hbHVUM wS9e1m+S2I9kASAQ40TwaBmOzni3uBXxGPipm7Q9bp124BC39RuJGBPlPzzDmSFDAq7O S7T32C9kl2WSyW86jXu56yJrNWjnYrkug22ppz4OU2/FdlPcXtyVQYWBceXxSo3zFoL/ j5d/tk8J70vvYQhWkRqn3VmsDRGYuGiW214f1FK3t0yK/uYtY/D4Z2WqvNnSo/Y2LI1n 3KK3trG19Gw1t+eVzUIiQQK+nDzg+PjawYm2grQ6n/Pw7G/01bptjE6qWz2dTlckOOOx tidg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716575281; x=1717180081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ILGqA7+HzXQqr0Ob8oymTx1wN+C0088/4KfGywkxvSc=; b=h+UD0B5ubqjpWnS2bAxj01M/8fdF8U24WBOEjkbv1mr3A5g1nqp7PyNAziJMQfg/aC uz+0bs2NBwJu+cxlah5Pvb5wkBDPON+6cmXc3a8vf4yifZ1z08IDmNU2aibfXOiQnKGk Y7ulZlFk4teKEgDl1yXcArgVcApZAr5GUnhRai7DBNL7etawUJ6IzXmmkWNo8mbwz427 SdPI4kRRb2TTurA62hyNylnqPQHpV1Jr710kGDmMWW8Ziwyacj6JAJjDXTNWLbe3k34V QR85B8dAtFgcmxVt6G1WDnId0YxVFfYW18ewGUUBVZj7IMM5MUcvwTn92JG5bOL2BH+Q a7gA== X-Forwarded-Encrypted: i=1; AJvYcCUwsvqMGNDNcXsWAjf551SYujBLBZd10qlUlO4CDyDB9gtqcrBsO+B7CW8aFrCQiVlDmWecyroMUCvQtLWjx/pczUs2SvuoYr+Mvg5ADXuHUzXkJR4= X-Gm-Message-State: AOJu0YwF4vL46Ink7wflgPodqaIVriXFejVP8IuRQfyxqTMuKhP++Ztj BhZBR9FmNm7mwmf9FO7AUyL3cdqOH8+GV646Wwd3S+eXxgaEDVxk8hlYSeLsrWyvjkFgU8ogf/+ 52C+88T6FYR9MfbW8beH7SvD1w2pANdZG X-Google-Smtp-Source: AGHT+IF1+0vxRvmRUWINjGzopDgrgXSdoJO/81rJkJR0w/gJjv8782tLukyv6IUMN4Wu5q+/dPS8x/uZhNPk X-Received: by 2002:a05:6512:290:b0:51d:7d4a:517e with SMTP id 2adb3069b0e04-527ef210aa5mr1916182e87.9.1716575281453; Fri, 24 May 2024 11:28:01 -0700 (PDT) Received: from raspberrypi.com ([188.39.149.98]) by smtp-relay.gmail.com with ESMTPS id 38308e7fff4ca-2e95bcd2393sm339921fa.6.2024.05.24.11.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 11:28:01 -0700 (PDT) X-Relaying-Domain: raspberrypi.com From: Dave Stevenson To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Vinod Koul , Maxime Ripard , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Ulf Hansson , Mark Brown , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vladimir Murzin , Phil Elwell , Stefan Wahren , Serge Semin Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org, iommu@lists.linux.dev, linux-sound@vger.kernel.org, Dave Stevenson Subject: [PATCH 17/18] ASoC: bcm2835-i2s: Use phys addresses for DAI DMA Date: Fri, 24 May 2024 19:27:01 +0100 Message-Id: <20240524182702.1317935-18-dave.stevenson@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> References: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240524_112805_032745_669EBBC0 X-CRM114-Status: GOOD ( 15.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Phil Elwell Contrary to what struct snd_dmaengine_dai_dma_data suggests, the configuration of addresses of DMA slave interfaces should be done in CPU physical addresses. Signed-off-by: Phil Elwell Signed-off-by: Dave Stevenson --- sound/soc/bcm/bcm2835-i2s.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 9bda6499e66e..2d0fe53245f0 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -830,8 +829,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) struct bcm2835_i2s_dev *dev; int ret; void __iomem *base; - const __be32 *addr; - dma_addr_t dma_base; + struct resource *res; dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); @@ -846,7 +844,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) "could not get clk\n"); /* Request ioarea */ - base = devm_platform_ioremap_resource(pdev, 0); + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(base)) return PTR_ERR(base); @@ -855,19 +853,11 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) if (IS_ERR(dev->i2s_regmap)) return PTR_ERR(dev->i2s_regmap); - /* Set the DMA address - we have to parse DT ourselves */ - addr = of_get_address(pdev->dev.of_node, 0, NULL, NULL); - if (!addr) { - dev_err(&pdev->dev, "could not get DMA-register address\n"); - return -EINVAL; - } - dma_base = be32_to_cpup(addr); - dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr = - dma_base + BCM2835_I2S_FIFO_A_REG; + res->start + BCM2835_I2S_FIFO_A_REG; dev->dma_data[SNDRV_PCM_STREAM_CAPTURE].addr = - dma_base + BCM2835_I2S_FIFO_A_REG; + res->start + BCM2835_I2S_FIFO_A_REG; /* Set the bus width */ dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr_width =