From patchwork Mon Jul 15 08:38:30 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: 13733082 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 E06241862A1; Mon, 15 Jul 2024 08:40:04 +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=1721032805; cv=none; b=Vx2YRo6z7Z3pjoVLXLfF7tFmLOYfXVX0Xn2j7IuqZYbytnhhzXjX6LvaQTQ1rSPy1VGFX5QDL/lD2EYMcFYjL93ijTh0Eh5RDK7YVc2S5TtAxQbr61buevXu8KhS4QLoSx9UoqL5YqWE3dIADnDIpzOrEQuR6dGOk8F5dEjVcdI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721032805; c=relaxed/simple; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KUBBMnf67oHw6oeaemVgbEE30FhvcrQIS0AD1D72FDOMA/jP3xogCnsuXgjImQq4KvrL2Ljj63i0fy2+XrSFf7h16q+BTnmrLI9Fzldym+6A3hOAUu1/7YgHJRuFlSP7wxjL41eDCpQqXsJAqrVxb5dp2LjuhpwYnpjq7+SyGMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rgXHsAQd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rgXHsAQd" Received: by smtp.kernel.org (Postfix) with ESMTPS id 7E1BEC4AF16; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721032804; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=rgXHsAQdUAcqldQWyqQr18rju4XO2zKGawfWbLZeejzZFrrGwrFmpbkvpV7g28Xcw CP54jJ8j2zsrlf57dtb2We8XzQNBTH9orHIzT+VM6hOqB9kyavqnnhmKQ/bJVutAxp AxVupCozP0ZNx9qczRZ/JwS1jsF/BSpUbVqxlRMMT8l8HhLLqCSRfd/Z5fvHI1gb+w qUbJcqf5voLjwCub3UBhNeLmrhTOXtDht/S3BAhryWip4gdWVzYyMyvPvnc1h4PZEt KtX6gux+7OnDC2f/Pwa+/CJiYdUNAlQdl7fAc/bSVvAH6rj1duTcQSuYMAohc0xoD2 r6HgaZ/jL+KOQ== 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 7517FC3DA59; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 15 Jul 2024 11:38:30 +0300 Subject: [PATCH v11 26/38] ASoC: dt-bindings: ep93xx: Document DMA support Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240715-ep93xx-v11-26-4e924efda795@maquefel.me> References: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> In-Reply-To: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> To: Hartley Sweeten , Alexander Sverdlin , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1721032799; l=1224; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=IYgRqPiUpJda2whx2paj9O35GPXheF0lc1rCPFeTg9o=; b=sg8u1hWMo9O0MlNoZBTN8U0p95VkegyQUzMza/YXfLuxZJ2bHcLjAeX93obhGl9sFDKXUzCcttwQ UCYGU2DNDrO1VJ/W6/bBstBRAipPe7ceLiOMC3F1dyeguHiWIzeq 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 Document DMA support in binding document. Signed-off-by: Nikita Shubin Reviewed-by: Krzysztof Kozlowski Reviewed-by: Mark Brown --- .../devicetree/bindings/sound/cirrus,ep9301-i2s.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml b/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml index 453d493c941f..36a320ddf534 100644 --- a/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml @@ -40,6 +40,16 @@ properties: - const: sclk - const: lrclk + dmas: + items: + - description: out DMA channel + - description: in DMA channel + + dma-names: + items: + - const: tx + - const: rx + required: - compatible - '#sound-dai-cells' @@ -61,6 +71,8 @@ examples: <&syscon 30>, <&syscon 31>; clock-names = "mclk", "sclk", "lrclk"; + dmas = <&dma0 0 1>, <&dma0 0 2>; + dma-names = "tx", "rx"; }; ... From patchwork Mon Jul 15 08:38:31 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: 13733083 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 EF9371862A6; Mon, 15 Jul 2024 08:40:04 +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=1721032805; cv=none; b=VURdM64WLSOcH2D5PPBL5GCcMag6YrI0o5WSnEUC79RAw+PnDgS2MMef86UFJtO5voSx4smcP5XyMf/L4b4BcmoahQAfQk3Xx6XR4isDD5y2qEwOoX0WStPGr/fgVdpUr7drqkq5X/k287bSYLBcQ9VIBppwaO0gLZNhYdUzDMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721032805; c=relaxed/simple; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b7Jxe5FkaxvDdZ/cHRS2RVoPpoAN7BxDmbRSG3gArma5odLh6Kg95zolNCsP8Hvc5Dx6Rt+2DJ1O4uxtdIDgMZTafAq+1XZeFWz6bKnxeh1+1UUr0cwPoULO2eYiUA+fEwZdffB9mMkmZx7OVTrFrwDD8EMizv6VwHucMi984OM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gS7dP7yC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gS7dP7yC" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8954AC4AF18; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721032804; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=gS7dP7yCAu1qt8k0UxxyT6U6nBYZcO95GwKeMOmUNaylTzQlnSZfmOPIBsjVUF+V8 ERSeCwTgFIWjbWI8IXC7pjBn3f6gzQRD8JEWlnn1n3oacEPseoyAO//a4nj/DeinJo 2yr6+ShEWuAwXVvo4QPl+x9m2K1fyOpMtZpYzTLqf6gzXtWGOqS1zRnaiKp2yMSOXX yvxCbO5Cm4aQ19x37tuWXWRj/U1R5JFqgFmSHWbaWiGWwoxq1QKVV5szlA1uYohy/u vAi6/5FEd6lG9B/gnC3KIizVWyOo9ylH/asAD9FFMAMITAE0x6nAljYMkQ0httiaR6 tsJo8g+qx+qyw== 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 80427C3DA5A; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 15 Jul 2024 11:38:31 +0300 Subject: [PATCH v11 27/38] ASoC: dt-bindings: ep93xx: Document Audio Port support Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240715-ep93xx-v11-27-4e924efda795@maquefel.me> References: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> In-Reply-To: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> To: Hartley Sweeten , Alexander Sverdlin , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1721032799; l=848; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=2DHMH5gyVKrv/Zk+FD8HvqWkgva1cQdPwzXr84HYqOY=; b=30JTnlO2w3TIQrNaFZO3fJQCOsuvpaovwzhYnMarApTP3eJpFy91fhzjTgRON5R/PIFB8EaTubZw JsdVLxP2DMTrFw4VI1uWxw11ptZQgrwHb0CO+bw7KR8xoKUXR4aG 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 Document Audio Graph Port support in binding document. Signed-off-by: Nikita Shubin Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml b/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml index 36a320ddf534..4693e85aed37 100644 --- a/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml @@ -50,6 +50,10 @@ properties: - const: tx - const: rx + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + required: - compatible - '#sound-dai-cells' From patchwork Mon Jul 15 08:38:32 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: 13733084 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 5E172186E4F; Mon, 15 Jul 2024 08:40:04 +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=1721032805; cv=none; b=itCHPj5McSPdMp8nV/eJEQ8PZFb731QKy6odKG12Jz2soZNgPmTbxfZRjp6XMGfWEEz7kqV6RVgAMUh2d94QfMjLcaHY7M2uoFVRJXTTd7Vxpb2JBX290ZQKfcUmTkVgGyNOqAMvlz46eWZhnWINgXvKQ/vqs/zacX/pHRHLVN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721032805; c=relaxed/simple; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BPxZXsF1oSKndPnRtJIcxXZzCaJDqVmHRqkkP7ip0s8MdjAQoDmDlEBFtSxCt8EcQx09oKmaahRO7viImtertVltIe4DfugFRCHD53Hvmb0PL5KLowZr5a5WfpKb9fbpPKbvvQRb8c0Guc5q8155naVPom2q0mgLuczYRDqk76A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WDggX+Tt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WDggX+Tt" Received: by smtp.kernel.org (Postfix) with ESMTPS id 982B3C4AF1C; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721032804; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=WDggX+TtBwPmhUk1hFUDpRfiqtd766mIn/3ywGz3gzs9+Q/kAg8zDU0/Rne1H6zAd SdeAqk111QGQbwjZgZNh6xauDqiK6syPmwYXpBLhzSCaTswfP5GfC7Txs6M2ujPIJE PF9bQA290ljJHL5hoSg20KKSPawrUijA5KwpS9tJEgYhcucWmCe3Fd4sJlBIpEssz+ wnbFQ1TQ+ayfsCCKW3XH1rKBkegy0x20lPVnDcjB5M5J0Z08DNhJAMhaJ3rpgQ+iCs 2d5Ef5wsH/2KsfWCzwTlPtON21R3zMT/E8YsknTdCzpl8GpGfPz/wdIFhJP8P/u4+d 3uoKk50TtOREg== 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 8FFA5C3DA5B; Mon, 15 Jul 2024 08:40:04 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 15 Jul 2024 11:38:32 +0300 Subject: [PATCH v11 28/38] ASoC: ep93xx: Drop legacy DMA support Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240715-ep93xx-v11-28-4e924efda795@maquefel.me> References: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> In-Reply-To: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Alexander Sverdlin , Kuninori Morimoto , Nikita Shubin Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1721032799; l=3001; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=SYU0FfCpDAQ8R3Z8Qf0jhP48bWMjlrK6VfAOntLJB4w=; b=LcOcjqItH0H/4lcxXM39N8SahQf4nAfn5o6ncX4TJE69n3SZW4wTsqQc5mpY3Zol55cdxybCTwB3 VbdRGaYqDC++Vj+vU+UoTnnEB+dqwu/Yj4B1xg9DB7ZEfgd8DJAd 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: Alexander Sverdlin And rely on OF DMA. Signed-off-by: Alexander Sverdlin Signed-off-by: Nikita Shubin --- sound/soc/cirrus/ep93xx-i2s.c | 19 ------------------- sound/soc/cirrus/ep93xx-pcm.c | 19 +------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 522de4b80293..9e83cdf8a943 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -24,7 +24,6 @@ #include #include -#include #include #include "ep93xx-pcm.h" @@ -80,19 +79,6 @@ struct ep93xx_i2s_info { struct snd_dmaengine_dai_dma_data dma_params_tx; }; -static struct ep93xx_dma_data ep93xx_i2s_dma_data[] = { - [SNDRV_PCM_STREAM_PLAYBACK] = { - .name = "i2s-pcm-out", - .port = EP93XX_DMA_I2S1, - .direction = DMA_MEM_TO_DEV, - }, - [SNDRV_PCM_STREAM_CAPTURE] = { - .name = "i2s-pcm-in", - .port = EP93XX_DMA_I2S1, - .direction = DMA_DEV_TO_MEM, - }, -}; - static inline void ep93xx_i2s_write_reg(struct ep93xx_i2s_info *info, unsigned reg, unsigned val) { @@ -198,11 +184,6 @@ static int ep93xx_i2s_dai_probe(struct snd_soc_dai *dai) { struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai); - info->dma_params_tx.filter_data = - &ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_PLAYBACK]; - info->dma_params_rx.filter_data = - &ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_CAPTURE]; - snd_soc_dai_init_dma_data(dai, &info->dma_params_tx, &info->dma_params_rx); diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c index fa72acd8d334..5ecb4671cbba 100644 --- a/sound/soc/cirrus/ep93xx-pcm.c +++ b/sound/soc/cirrus/ep93xx-pcm.c @@ -18,8 +18,6 @@ #include #include -#include - #include "ep93xx-pcm.h" static const struct snd_pcm_hardware ep93xx_pcm_hardware = { @@ -35,30 +33,15 @@ static const struct snd_pcm_hardware ep93xx_pcm_hardware = { .fifo_size = 32, }; -static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) -{ - struct ep93xx_dma_data *data = filter_param; - - if (data->direction == ep93xx_dma_chan_direction(chan)) { - chan->private = data; - return true; - } - - return false; -} - static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = { .pcm_hardware = &ep93xx_pcm_hardware, - .compat_filter_fn = ep93xx_pcm_dma_filter, .prealloc_buffer_size = 131072, }; int devm_ep93xx_pcm_platform_register(struct device *dev) { return devm_snd_dmaengine_pcm_register(dev, - &ep93xx_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_DT | - SND_DMAENGINE_PCM_FLAG_COMPAT); + &ep93xx_dmaengine_pcm_config, 0); } EXPORT_SYMBOL_GPL(devm_ep93xx_pcm_platform_register); From patchwork Mon Jul 15 08:38:41 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: 13733085 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 90C60187324; Mon, 15 Jul 2024 08:40:05 +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=1721032805; cv=none; b=hYVZHESoWSyPShOINzX0RmmxNPyXrUZg9Za6NKyxUEksEpnqq+tqJlA2DhI3u6ivOlsT/XMX4Sifns4wjBIjTYJIiiTuj10kYti1s1KHzoYlz9ZAQU5G3svknMByRC0fgI+2dOPMU9PnERn3u2/lJ3DtC1+ybidb/8x/+GpA9fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721032805; c=relaxed/simple; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kIm9cHBarVfMXLO6uE2cRDHeuAxnLqJrUn6PjArHOxeOtUrl8xdErjLwee7zfGWsUp0ctkdUt5rnFlFhLYJmQCm1NBy4R7/qsB2GGabywxiii8tl4pdJ4v7SsEGrmn/O/6VTApvf/g6ADMAUcOpBkTf/OQRGdVUBUPLaM2lnP2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BrF9YIfH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BrF9YIfH" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6F6FDC4AF53; Mon, 15 Jul 2024 08:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721032805; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=BrF9YIfHhHq2nlNUJGmzhQhxd6GqeVimz8Y9HY3+Sv15ms1LCep29AD9xC46cntrU k9Tvmx7kJ61H7i9vA4xu1LNTn0OdIEio8Eop79OzU+dCoZcNzmDvOTBUz+l5oL12+R FQYk4+BUgBg/bNCRbp5Y1Dlir8Twhan7SxfhrXemx19ZgIEwWZ+K+eeIRpXCgMgGHr 5Txhc+jd4nX7U7lysHRYWtc2S7y1cSDdZRk00aajwTRyAtjMdI5HTUrTrd3qDEyp9r b0Syyv7WlULsM4era+bmk6lpRbWXJV59mQbg7EggDjmpe7KOP39BmldS1mCTGYB0iM AoqCLLggLKAcQ== 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 6174CC3DA5D; Mon, 15 Jul 2024 08:40:05 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 15 Jul 2024 11:38:41 +0300 Subject: [PATCH v11 37/38] ASoC: cirrus: edb93xx: Delete driver Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240715-ep93xx-v11-37-4e924efda795@maquefel.me> References: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> In-Reply-To: <20240715-ep93xx-v11-0-4e924efda795@maquefel.me> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Nikita Shubin , Alexander Sverdlin , Linus Walleij , Charles Keepax , Kuninori Morimoto Cc: Takashi Iwai , linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1721032800; l=4982; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=ZGsaIwYTR1JNVHlGFBAmmmELz25300Pi752QNOzmkk0=; b=9O+F+17wxRLJz2yWUJ08D8BQgW2oaPsPcOcr2seEKHtGgzECvpK/2w4CQHfmtWdkimrzrvmVNhYe dh/psCZWCM6xZspB68g9mW8H2vIh2NuyCghRDLQinO8a+qo4olf5 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: Alexander Sverdlin Can be replaced with "simple-audio-card" for the rates up to 50kHz, refer to commit "ARM: dts: ep93xx: Add EDB9302 DT". Signed-off-by: Alexander Sverdlin Signed-off-by: Nikita Shubin Acked-by: Mark Brown --- sound/soc/cirrus/Kconfig | 9 ---- sound/soc/cirrus/Makefile | 4 -- sound/soc/cirrus/edb93xx.c | 116 --------------------------------------------- 3 files changed, 129 deletions(-) diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig index 38a83c4dcc2d..97def4e53fbc 100644 --- a/sound/soc/cirrus/Kconfig +++ b/sound/soc/cirrus/Kconfig @@ -31,12 +31,3 @@ config SND_EP93XX_SOC_I2S_WATCHDOG endif # if SND_EP93XX_SOC_I2S -config SND_EP93XX_SOC_EDB93XX - tristate "SoC Audio support for Cirrus Logic EDB93xx boards" - depends on SND_EP93XX_SOC && (MACH_EDB9301 || MACH_EDB9302 || MACH_EDB9302A || MACH_EDB9307A || MACH_EDB9315A) - select SND_EP93XX_SOC_I2S - select SND_SOC_CS4271_I2C if I2C - select SND_SOC_CS4271_SPI if SPI_MASTER - help - Say Y or M here if you want to add support for I2S audio on the - Cirrus Logic EDB93xx boards. diff --git a/sound/soc/cirrus/Makefile b/sound/soc/cirrus/Makefile index ad606b293715..61d8cf64e859 100644 --- a/sound/soc/cirrus/Makefile +++ b/sound/soc/cirrus/Makefile @@ -6,7 +6,3 @@ snd-soc-ep93xx-i2s-y := ep93xx-i2s.o obj-$(CONFIG_SND_EP93XX_SOC) += snd-soc-ep93xx.o obj-$(CONFIG_SND_EP93XX_SOC_I2S) += snd-soc-ep93xx-i2s.o -# EP93XX Machine Support -snd-soc-edb93xx-y := edb93xx.o - -obj-$(CONFIG_SND_EP93XX_SOC_EDB93XX) += snd-soc-edb93xx.o diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c deleted file mode 100644 index 8bb67d7d2b4b..000000000000 --- a/sound/soc/cirrus/edb93xx.c +++ /dev/null @@ -1,116 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * SoC audio for EDB93xx - * - * Copyright (c) 2010 Alexander Sverdlin - * - * This driver support CS4271 codec being master or slave, working - * in control port mode, connected either via SPI or I2C. - * The data format accepted is I2S or left-justified. - * DAPM support not implemented. - */ - -#include -#include -#include -#include -#include -#include -#include - -static int edb93xx_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); - int err; - unsigned int mclk_rate; - unsigned int rate = params_rate(params); - - /* - * According to CS4271 datasheet we use MCLK/LRCK=256 for - * rates below 50kHz and 128 for higher sample rates - */ - if (rate < 50000) - mclk_rate = rate * 64 * 4; - else - mclk_rate = rate * 64 * 2; - - err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate, - SND_SOC_CLOCK_IN); - if (err) - return err; - - return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_rate, - SND_SOC_CLOCK_OUT); -} - -static const struct snd_soc_ops edb93xx_ops = { - .hw_params = edb93xx_hw_params, -}; - -SND_SOC_DAILINK_DEFS(hifi, - DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")), - DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "cs4271-hifi")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s"))); - -static struct snd_soc_dai_link edb93xx_dai = { - .name = "CS4271", - .stream_name = "CS4271 HiFi", - .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBC_CFC, - .ops = &edb93xx_ops, - SND_SOC_DAILINK_REG(hifi), -}; - -static struct snd_soc_card snd_soc_edb93xx = { - .name = "EDB93XX", - .owner = THIS_MODULE, - .dai_link = &edb93xx_dai, - .num_links = 1, -}; - -static int edb93xx_probe(struct platform_device *pdev) -{ - struct snd_soc_card *card = &snd_soc_edb93xx; - int ret; - - ret = ep93xx_i2s_acquire(); - if (ret) - return ret; - - card->dev = &pdev->dev; - - ret = snd_soc_register_card(card); - if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", - ret); - ep93xx_i2s_release(); - } - - return ret; -} - -static void edb93xx_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - ep93xx_i2s_release(); -} - -static struct platform_driver edb93xx_driver = { - .driver = { - .name = "edb93xx-audio", - }, - .probe = edb93xx_probe, - .remove_new = edb93xx_remove, -}; - -module_platform_driver(edb93xx_driver); - -MODULE_AUTHOR("Alexander Sverdlin "); -MODULE_DESCRIPTION("ALSA SoC EDB93xx"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:edb93xx-audio");