From patchwork Mon Feb 26 07:30:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin via B4 Relay X-Patchwork-Id: 206314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1920356dyb; Sun, 25 Feb 2024 23:39:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUxkgJoFV5o+SXHf0eS4cSFh7gXz0lcmOJNmv/Dz88+3DlPfrYU5m2Z8EbXInWG1HEdR0J1dbd4lXC3/sVJAAIavUpskw== X-Google-Smtp-Source: AGHT+IFo3FjJUdoNbHzToOsvSuavct9JkkyLmITCueKjAAC0aSWGIalSYpV3eaLi2KihG2QCRuv/ X-Received: by 2002:a05:6a21:3a82:b0:1a0:f3d0:15af with SMTP id zv2-20020a056a213a8200b001a0f3d015afmr3566133pzb.34.1708933190798; Sun, 25 Feb 2024 23:39:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708933190; cv=pass; d=google.com; s=arc-20160816; b=UbupF29P8gqmINJC7IL+sCzOsldTeix3/h2MZ3ETiIE0U/l0nI89cZcPYOmpiHYuet SRm3PHdb9Gsbzt/fNT9JTTdgmrlKEYKY6Y43Sbf8TPNl6VBu1OfMw5l0lS+KfkIYtmm1 TVCVHntkD6Vv+tPUSkQWjiSxdpVp6+sXymsoT8VuGjResCgc/AEi/ZGs1m3Kk0ey2ew9 9iO+8J4+2em5ND4jQ9chjCdD9T04UkHQh7CUXonAvbgt+kEPDpwIPWnaa+UrDwAS/jDA PSxTwVLGMN7eNQBbQPGxxYgO94x3qrTjXrfDRN9r88bzE4mmnvGnCDoDkxxLaK05YgO9 5HcA== 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=S08st/YKHVccmEEGU96WafNZHYZv51g8pk0hhU6nixRBl1zQLzXD0caeNmjvnRYV01 KZOChRKZlUysgASf/HJ17pIPa9qZMC3ibT9TsGTbaxEL93lFaengu/r/2FTCTqPPtEWM fqEbm4TMDaaol9LSfI/M9+x7n7mJK5AodT/iUG49Cn6cjAx17YzhkLMXGGhwrbnWOXCY 672pUY3plo9NymdeSp35D68lb6UUwrpCPGaxT1WZ6u6w1X6iLe+m/vYenqCyekKF6+SZ mYr9mp1xZIBwqcQT6WTBFKh2o9JNZRdGzkrCctYW01iQeSQGJ6ReIXYfZwN2gJLN6nDn Y/xg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NiUCHAG4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80672-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h26-20020a63121a000000b005cf5bf8e7a5si3284153pgl.430.2024.02.25.23.39.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 23:39:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NiUCHAG4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80672-ouuuleilei=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 97ABC288B48 for ; Mon, 26 Feb 2024 07:39:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6DA3A54673; Mon, 26 Feb 2024 07:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NiUCHAG4" 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 2D1A71F604; Mon, 26 Feb 2024 07:31:25 +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=1708932685; cv=none; b=PubHgdt00bAnDGBpsEPefGnX1w1Ksz34c0Y4bVhkMfRTKdkbc6+htIHAOmmCyt1BhDmR8i3f+iFsbBcCrfE1W5vnPu180XyimAJphqIDM4PWy/4ophe8jCzRy8YyrphM1w56157Y2ZGGLnGB+ix+w1VB4y7N3F6vHlEfg8Qj5/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708932685; c=relaxed/simple; bh=+7ucvPTkWBTMtzrrF9C3CNTgvipLkaIOG0J5oK9Kxpg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qB4Zawds1JPaVv3dOo37t/+ufu1lzjn3Z04d1ALXuyuwGS5ujmlsgMQumoR5z75k5SHuZrN+XyeK27fIgPdPLeC1NGjWJN7sjL1ysN/jk9Vb8c9ZpXbv51MS963vDFUTGYd6/Pc23+0oJ/YT4aZ+Vh9j24PmszQXFUJ4jz6uTtw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NiUCHAG4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 2BEDAC4160D; Mon, 26 Feb 2024 07:31:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708932684; bh=+7ucvPTkWBTMtzrrF9C3CNTgvipLkaIOG0J5oK9Kxpg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NiUCHAG4mf+J7PbGdxgnaLPFKrptcMrZKmoviacwqRWCqKz9Gj50vbGJGanvVruVa BKvk3UM4h5Cc4GTklU7zXqC85cSot6F/43ZdzPOkiWxdW4tHTwiqBw7VcWV+fEdou1 fJtV8wMXu+O0lUJmHJ9OIQ6lo+m64Jb/UCww7uhhvQHW/7uhHim46st64mO/j2Kp7a u08mIcbSHWsGn9GoLp7r5faInz/kjbsny99UGNW1s7AKmtpt891LB4wkmpKd3nprEz Bd/PsddmK2xd4+KZ/tiMrhLqxDqska922CInrcL0rIY9TKei3zzJ6u8pVADBgB/Ihy J44cG/lfyj7uQ== 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 182ACC48BF6; Mon, 26 Feb 2024 07:31:24 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 26 Feb 2024 10:30:34 +0300 Subject: [PATCH v8 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 Message-Id: <20240226-ep93xx-v8-38-3136dca7238f@maquefel.me> References: <20240226-ep93xx-v8-0-3136dca7238f@maquefel.me> In-Reply-To: <20240226-ep93xx-v8-0-3136dca7238f@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=1708932678; l=6035; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=LpDpPnQaMVc75NrbIxm1GYnB+EUmm7A6TigIqr6iCtI=; =?utf-8?q?b=3DQslfgVPLnMQh?= =?utf-8?q?ZUIfHms+mNw2s+wHmlmsfFS9dwKfg56h/E36Cm2oF0rt6wwJ84t90cyNWxGuMpBM?= ilrOsv4GDaB1287smgWIBHIRtuSWXtJjwO+yHI/AgANwq7SZUF8g 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: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791946329623190126 X-GMAIL-MSGID: 1791946329623190126 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 */