Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp3201732lqp; Tue, 26 Mar 2024 02:34:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUV1FUB5kKVe8lOz0ZpLjuclKkfu4S5/UWhrTvjj6w4MDfMO4xCVF3ByEyTyEbVvBywzNPhQNP6C3MaECgSBjCewYgqyaOEUnGCwsNWqg== X-Google-Smtp-Source: AGHT+IFeNMTL++8wndWShanz/I1rdJnNVeNpKEuBSW3sIVp68ROLXBdGgsJnG3J9IEgZv0a+VnVa X-Received: by 2002:ac8:57d0:0:b0:431:4775:3960 with SMTP id w16-20020ac857d0000000b0043147753960mr9226757qta.55.1711445646145; Tue, 26 Mar 2024 02:34:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711445646; cv=pass; d=google.com; s=arc-20160816; b=w75PmXWerUPiCnzFPPy7a4R5fIvDSFJQvYKsHtTSRVdakqT3PiwU0mXe3QPoXUBrht PrNM3SpfhGbeqWYZ/tRLf2T7F/2QnHXIJnZcrOuzt3DMsyV/Rgt+m9sFdv8LcPfI3siP OS0ztHZreynX0h2YfB0Ae7c7qkm9r2DdizeBPw6NLA9Y4B3HB5+RlwcaiEvp/vPRLDtP U+xYTLc+qLiCj4dY68KPjwCs6tqlwpsvnelUWW0EPO9TLfKCVOUKtShBWyr3dvmwFJVo og3vbESgv8E6MoTHEEL2NOL2OHUJUP/WDY9DuiPMEpZ4T+7qC3Ega6kmkv+23vxXYgKU m4aA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=thaliYDlfuSz6f1bPVNqWuFljqsrU8N5PVPMOsZ1ugk=; fh=I0lxK3117/0bsp+51+RRASc0o9ufhENThH/35q65hzU=; b=J5g8W0XFWoC1iRoztp/oMhCItj4mdjQ6D4l73Z2n7i7s/fVYFMAFOyi335YWGaDjm1 eCEX/3qpWbNaOUbUGsyJKc0Wv6rYhcH53vMtdWIu+cXFy0XDzLQ84mCOcecXmpCW/9jw sGkvJNHyMIkhcy0xRnzralWuDXRaE5kncj8qyydWVTBrDLn4iKagJRaVX3TUFgKDj4DE RHVGS7qDbY1/bbq6hUF4zhGrpZ/DnbRpBne5kZS0Om9HMUgt4B6Am1eYxauicnmKjGc9 ul8xMuAoXIP6ystULHBwzYd3B6qxEarqSNVaJzK39VvdvMW40l4OvmBHknl59aYDBsvK wUzA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R2Pn6GZJ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-118676-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-118676-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id jd27-20020a05622a719b00b004313020fbd3si7790650qtb.708.2024.03.26.02.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 02:34:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-118676-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R2Pn6GZJ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-118676-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-118676-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CE3991C3A9CD for ; Tue, 26 Mar 2024 09:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E671B12F386; Tue, 26 Mar 2024 09:20:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R2Pn6GZJ" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D73E07441F; Tue, 26 Mar 2024 09:20:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711444843; cv=none; b=b95mWnw9/kIpjxfiGB1iQnlftnzXJScgxvvYS8hGoxDg8r9tMBiPSq7HIaInRFGVC9fWJxdfksOrNKM4VDpsXeMK5j4lGQvy/wNpkKnmcOW7rLudeTkepn4w5vRNU+sF8RS1YIggTofhkjQxe6AUVuJr6tgksSuicAPxRe/bT4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711444843; c=relaxed/simple; bh=+7ucvPTkWBTMtzrrF9C3CNTgvipLkaIOG0J5oK9Kxpg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vb0Z83Z0N/0cELD2LF9lUuGc6g/CZwHT7XAORrIQMcp4qXD99CQvPFXCdETVqcoFt5CblnJNXxeMUq3oUCOO9V7agYJcgLnzZ/4/y2qPusxhjx7bOzBaErbbKN+MQJvOKEc3xIO/FuQDazFNrzcQ8unjYu2KGJtktNyQgzP3g10= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R2Pn6GZJ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 14AF4C4163C; Tue, 26 Mar 2024 09:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711444843; bh=+7ucvPTkWBTMtzrrF9C3CNTgvipLkaIOG0J5oK9Kxpg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=R2Pn6GZJ1aKalILTteaA2ep1KXYwt8Bhz6yTCdtc6ZVqC+2bqK+a4uFzPPKLen2jK 848/97+5eCMOZRhpM7se1SJQO0N6QfA1vBhZZA3duD14m9ajg3IFyhR91KxGs6b37K rd0kaXEv2qr0ot01FWkRz8dDj8h+HZVpaJFwhZoOiS1cB/gbACF/viosavPkNtjsiG MEC37z3PMR4X8/frcugnbOz6tk6h1a5fGBo8hb63Zf/WXsnIyJf7xkjy4Z+yP+Hsau veAtjEwkOgx6qnjB6OgA3qU0WiIIQUhhGMX0Eb4BP+slpl7o1yLdTz2uXO1b4sv0fO QHQJQtFt7EF2Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DB64C6FD1F; Tue, 26 Mar 2024 09:20:43 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Tue, 26 Mar 2024 12:19:05 +0300 Subject: [PATCH v9 38/38] dma: cirrus: remove platform code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240326-ep93xx-v9-38-156e2ae5dfc8@maquefel.me> References: <20240326-ep93xx-v9-0-156e2ae5dfc8@maquefel.me> In-Reply-To: <20240326-ep93xx-v9-0-156e2ae5dfc8@maquefel.me> To: Vinod Koul , Nikita Shubin , Alexander Sverdlin Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Arnd Bergmann X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711444837; l=6035; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=LpDpPnQaMVc75NrbIxm1GYnB+EUmm7A6TigIqr6iCtI=; b=546mvn5m7ddd1NnrKWRqRKP0GSuk9+lLTC4mZp3+R5owyRjRrloS3gjre0ICf1Ag6S+ZPmIf/xPz /EJbUmDJAdBDYepemiy+4iNQT0gRvcZjsMhFTP2d74yevjsHh4eU X-Developer-Key: i=nikita.shubin@maquefel.me; a=ed25519; pk=vqf5YIUJ7BJv3EJFaNNxWZgGuMgDH6rwufTLflwU9ac= X-Endpoint-Received: by B4 Relay for nikita.shubin@maquefel.me/20230718 with auth_id=65 X-Original-From: Nikita Shubin Reply-To: nikita.shubin@maquefel.me From: Nikita Shubin Remove DMA platform header, from now on we use device tree for DMA clients. Signed-off-by: Nikita Shubin --- drivers/dma/ep93xx_dma.c | 48 ++++++++++++++- include/linux/platform_data/dma-ep93xx.h | 100 ------------------------------- 2 files changed, 46 insertions(+), 102 deletions(-) diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index 17c8e2badee2..43c4241af7f5 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -25,8 +26,6 @@ #include #include -#include - #include "dmaengine.h" /* M2P registers */ @@ -106,6 +105,26 @@ #define DMA_MAX_CHAN_BYTES 0xffff #define DMA_MAX_CHAN_DESCRIPTORS 32 +/* + * M2P channels. + * + * Note that these values are also directly used for setting the PPALLOC + * register. + */ +#define EP93XX_DMA_I2S1 0 +#define EP93XX_DMA_I2S2 1 +#define EP93XX_DMA_AAC1 2 +#define EP93XX_DMA_AAC2 3 +#define EP93XX_DMA_AAC3 4 +#define EP93XX_DMA_I2S3 5 +#define EP93XX_DMA_UART1 6 +#define EP93XX_DMA_UART2 7 +#define EP93XX_DMA_UART3 8 +#define EP93XX_DMA_IRDA 9 +/* M2M channels */ +#define EP93XX_DMA_SSP 10 +#define EP93XX_DMA_IDE 11 + enum ep93xx_dma_type { M2P_DMA, M2M_DMA, @@ -242,6 +261,31 @@ static struct ep93xx_dma_chan *to_ep93xx_dma_chan(struct dma_chan *chan) return container_of(chan, struct ep93xx_dma_chan, chan); } +static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan) +{ + if (device_is_compatible(chan->device->dev, "cirrus,ep9301-dma-m2p")) + return true; + + return !strcmp(dev_name(chan->device->dev), "ep93xx-dma-m2p"); +} + +/* + * ep93xx_dma_chan_direction - returns direction the channel can be used + * + * This function can be used in filter functions to find out whether the + * channel supports given DMA direction. Only M2P channels have such + * limitation, for M2M channels the direction is configurable. + */ +static inline enum dma_transfer_direction +ep93xx_dma_chan_direction(struct dma_chan *chan) +{ + if (!ep93xx_dma_chan_is_m2p(chan)) + return DMA_TRANS_NONE; + + /* even channels are for TX, odd for RX */ + return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; +} + /** * ep93xx_dma_set_active - set new active descriptor chain * @edmac: channel diff --git a/include/linux/platform_data/dma-ep93xx.h b/include/linux/platform_data/dma-ep93xx.h deleted file mode 100644 index 9ec5cdd5a1eb..000000000000 --- a/include/linux/platform_data/dma-ep93xx.h +++ /dev/null @@ -1,100 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#include -#include -#include -#include -#include -#include - -/* - * M2P channels. - * - * Note that these values are also directly used for setting the PPALLOC - * register. - */ -#define EP93XX_DMA_I2S1 0 -#define EP93XX_DMA_I2S2 1 -#define EP93XX_DMA_AAC1 2 -#define EP93XX_DMA_AAC2 3 -#define EP93XX_DMA_AAC3 4 -#define EP93XX_DMA_I2S3 5 -#define EP93XX_DMA_UART1 6 -#define EP93XX_DMA_UART2 7 -#define EP93XX_DMA_UART3 8 -#define EP93XX_DMA_IRDA 9 -/* M2M channels */ -#define EP93XX_DMA_SSP 10 -#define EP93XX_DMA_IDE 11 - -/** - * struct ep93xx_dma_data - configuration data for the EP93xx dmaengine - * @port: peripheral which is requesting the channel - * @direction: TX/RX channel - * @name: optional name for the channel, this is displayed in /proc/interrupts - * - * This information is passed as private channel parameter in a filter - * function. Note that this is only needed for slave/cyclic channels. For - * memcpy channels %NULL data should be passed. - */ -struct ep93xx_dma_data { - int port; - enum dma_transfer_direction direction; - const char *name; -}; - -/** - * struct ep93xx_dma_chan_data - platform specific data for a DMA channel - * @name: name of the channel, used for getting the right clock for the channel - * @base: mapped registers - * @irq: interrupt number used by this channel - */ -struct ep93xx_dma_chan_data { - const char *name; - void __iomem *base; - int irq; -}; - -/** - * struct ep93xx_dma_platform_data - platform data for the dmaengine driver - * @channels: array of channels which are passed to the driver - * @num_channels: number of channels in the array - * - * This structure is passed to the DMA engine driver via platform data. For - * M2P channels, contract is that even channels are for TX and odd for RX. - * There is no requirement for the M2M channels. - */ -struct ep93xx_dma_platform_data { - struct ep93xx_dma_chan_data *channels; - size_t num_channels; -}; - -static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan) -{ - if (device_is_compatible(chan->device->dev, "cirrus,ep9301-dma-m2p")) - return true; - - return !strcmp(dev_name(chan->device->dev), "ep93xx-dma-m2p"); -} - -/** - * ep93xx_dma_chan_direction - returns direction the channel can be used - * @chan: channel - * - * This function can be used in filter functions to find out whether the - * channel supports given DMA direction. Only M2P channels have such - * limitation, for M2M channels the direction is configurable. - */ -static inline enum dma_transfer_direction -ep93xx_dma_chan_direction(struct dma_chan *chan) -{ - if (!ep93xx_dma_chan_is_m2p(chan)) - return DMA_TRANS_NONE; - - /* even channels are for TX, odd for RX */ - return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; -} - -#endif /* __ASM_ARCH_DMA_H */ -- 2.41.0