From patchwork Mon Sep 9 08:10:51 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: 13796392 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 004461B29B8; Mon, 9 Sep 2024 08:12:16 +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=1725869537; cv=none; b=QLxHzSM5uF15oTlnq3TRSBGOr4BWYTp9A1rlRSkF+Rvs293bSIVeyOqUXdTmpMt8AF4ALWVigLBc4hHqpJG9Lh7mbxiEUY/aKQd+211Gh9mTpij8OU2pGA6rQoO876MT4sm3yPEXMJegqTFdrNRuCTNGFWuSqHEAjgwTQTW7F28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725869537; c=relaxed/simple; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OwOPipdm7Q0Ze2e1hsPT8C+rLRpoATciEnL+tX3zdqYMNkYomj81fDGmUxkcgtD4fTEDYM8wiSDDn+ryjZFvd2V2rwQbczZBNHNIwb6RVuu7/MZ5tXx9VmWkOxFs8gdNgGdqvcdiUlYAipBNqsMtcmqrCtvNWeAkGWyMQSNRuPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NmzOXc3r; 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="NmzOXc3r" Received: by smtp.kernel.org (Postfix) with ESMTPS id CE7E9C4DE0B; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725869536; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NmzOXc3rNOBmPQ28EIOsd9LCK3m7eI+hxvr9odr+JHcUd7p/4ujs3n544ze2C2xc6 CJcv2NSM1SnNaTH3nSc8sD7KOT2/XV9oiwyDCyKusjwwRkb7F6HS2t09jLxHqQVVmQ jNxZZL+Z7Dx2DH05QXaRvJbM1UtQ2coLa5f8EIv2J52IE54saCoK++SqLhaVawnG9p jjXcMqRtbdFBnMBNxTsnI1hd5ju87WrI1fPDY7TUN18H5W/nITlx7V82+zmL4iYvDY dW3e2vJmg55UCypCKGllJKg6tZm96/WUlAm1BQsFQ3tEUiv8eQv6Ig91N1ZrRGUgtR VeUyf0a9uWxqQ== 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 C7708ECE57B; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 09 Sep 2024 11:10:51 +0300 Subject: [PATCH v12 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: <20240909-ep93xx-v12-26-e86ab2423d4b@maquefel.me> References: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> In-Reply-To: <20240909-ep93xx-v12-0-e86ab2423d4b@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=1725869532; l=1224; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=IYgRqPiUpJda2whx2paj9O35GPXheF0lc1rCPFeTg9o=; b=hiOE3FKypH7rjUviLJZys8O3EV8AT1xBVVJkdnIkIKXMnzS/gemZ5cS3wS05uVJAkhfPSW8TvOlk aDXgYEQ5B529koRy1gR8p1/U+cgptIk8auXz+xgaqXwhL9ehjllZ 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 Sep 9 08:10:52 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: 13796393 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 7DDCE1B2EC8; Mon, 9 Sep 2024 08:12:17 +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=1725869537; cv=none; b=WsmAfEBo8vHXkOcpiyWcSBINpXhUSZHNnXSsFSp4gMkvi3mpQIWGXbvH0GFZOBNf/vDHNCcIbcjczyyCbK5X03pwrumsU9dsm9S/WIacT61Bo3Bi/MzF/1YTFNAqmKY/k8YmK29H+LHqQ2WmhUQNdUVjqwz0WAjwpkwR0Sri4V4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725869537; c=relaxed/simple; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=un08AixKVUGzWbxXJN4rpIOkxtxc9kPrLRQ12dvhhWNi35uwtq2paQolsXbAhIBOb2lN33QMj7gGrihkrAHt9yP1vksj8Kd/1hDG6PbVw6Wnb4XlHoHSviU+uer2wIhA4rV3hLtE5+8OKZjhHSQtOQdIiAmgoemUwboiC6J+cq8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iaDlVS93; 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="iaDlVS93" Received: by smtp.kernel.org (Postfix) with ESMTPS id DC03EC4AF0E; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725869536; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=iaDlVS93boozLlk3kzAe6s2mEVynOOEeCHmAmpqRXR+4Wk17ZHczq59m/v2dCTOjB Y1NoManmkkDWt1EMjz4/dZlUYZ6qPzIf3odlg+BE2zx5DHB0bUm6eur+gJwvEsRouT 2ONFj/IWXVRbK+Zhu/FB4CHB2Xh/qQUgLeV8CmQ+Iq5jYAjUupoRdtSDnUwdtiVNw3 ivoIc1z5qxooy262Ej+nyB7gyy9rd3MAsTeYtgDYw7t8o5xUK24SgNd0IMykgoCpRN gz4iwux2+J3ETAcrXEr1+6GH4X2EKgx6A8RWShJzmfZTh9Ybfm5DTSj9A8hr6OBmVh e4tjGSQQaRqVw== 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 D5729ECE582; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 09 Sep 2024 11:10:52 +0300 Subject: [PATCH v12 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: <20240909-ep93xx-v12-27-e86ab2423d4b@maquefel.me> References: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> In-Reply-To: <20240909-ep93xx-v12-0-e86ab2423d4b@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=1725869532; l=848; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=2DHMH5gyVKrv/Zk+FD8HvqWkgva1cQdPwzXr84HYqOY=; b=8MyybBK4d9fIFMpthcZ3b0164irPRX2xnqBW5iudWL6bK+VKaGynnkfxZpMvIUsXChYCBjyouEdT TB3jnh75AyrnRDGhADVEUqsUMpf4y39wqGkG4TUEoKeZBAoYGcYG 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 Sep 9 08:10:53 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: 13796394 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 8D8591B2ECB; Mon, 9 Sep 2024 08:12:17 +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=1725869537; cv=none; b=n2T0wtd8L4Ug35YL46TC3EriFrm9p1yeItSDSxUM+pmWXn8JPSfecPhh4bBQqeyDSb2SYS2xDpcLCaJ+MEIVKUjwIT5c+/p71vutQ3JzRfY1+pVhm7SMSto4EXmrq3kcQ4goi1/ptLIZHRCxO5SF7jkRpnplrQU/Y/VTwb6nwGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725869537; c=relaxed/simple; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FVGvfHWYTBqqtQlnuZh+vy23cDvPPCfHIgDjNqM+xZSv3Quqb8rdNu+1wxfrFpQCwv4OjZLlLdhu53bAGSz9j3FaC8KNSosSogdtfUBhTv82yt+4cplnUTX+D8AI4tMzh4xx4w4Yc8ABOPE2O0EO4nqbpLC4tQ+atIKe+aZdsxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qdAygY9v; 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="qdAygY9v" Received: by smtp.kernel.org (Postfix) with ESMTPS id E685CC4CED9; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725869536; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=qdAygY9vRxmqfmjqktR5YQjctYw8QcH6DLC3rh8OhpdEl92MWcLwIJwszJg9+Qy29 BfY9sqAv1Ox+3GO1aCpO7KM8Jp44sMLHhhxw3lEBDFJzsyHADlMDhVbJK+k2ONRha6 45QC9k3MpI4J5FiDorcVIalPcBOk9ESHfVWWhwqAeaqAkK/NTEkyXtH4cRm/fH9LEc gagevg5BzGnyW4ElBiO0OFgQX7tjIuaa9EP9QvwXDHbOf+iNH07Fa3n+7ZLE+B29dV prWcaTpOvYo+1vwdOAHGMqXd8OARcsSS/CQtMKxbox6aiiphpl7Lv2nael6qcrrCgx qGIL8LsL5/ocQ== 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 E11C1ECE581; Mon, 9 Sep 2024 08:12:16 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 09 Sep 2024 11:10:53 +0300 Subject: [PATCH v12 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: <20240909-ep93xx-v12-28-e86ab2423d4b@maquefel.me> References: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> In-Reply-To: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Nikita Shubin , Alexander Sverdlin 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=1725869532; l=3001; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=SYU0FfCpDAQ8R3Z8Qf0jhP48bWMjlrK6VfAOntLJB4w=; b=k9YI3GtfdKBqw94BWhW5xJoJvg4phs99a1pZ31SabZgGcAE0Blo/AY5b6lYYutcamYKJJqt8GLlA LXsk4uMNAW66pLiDJm2PgIrdnCAWY+4Q0xOl8GEVOiRUopfqbkND 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 Sep 9 08:11:02 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: 13796395 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 AA0171B373D; Mon, 9 Sep 2024 08:12:18 +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=1725869538; cv=none; b=FC5Ykzh2qj8zZwJ0WTDI2SF4nKWfxH/PzFLISOJefDWbrxXiPPe6hn5+rFj+MIj+V8ww2WYo5gka6SDGUv6RqYCyeBvnryHyhNJL6wz6Wufud8Nr0kP+uv+zYlNa7kWovEl0t1NXDe048eaeDiz3Irs9HEfcdMTrVfBJWpkZs20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725869538; c=relaxed/simple; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a3OMRvInaNMtNuYDAPVY4olaeObepPuHgllT4uKVq7WErBgAl6NEVvNqOIA+eJKFJq9T2ID1lX7zpAZzPrBRQtdgo8Id1oYUiD8NnzsLALNVJC8EZnC8oQ/8wK//rzxsy8mKD50GRUO0mDvxJt5ooGHZ74GRpPQ8ZEmRK4X3liw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UXGsmOqR; 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="UXGsmOqR" Received: by smtp.kernel.org (Postfix) with ESMTPS id 75974C4E698; Mon, 9 Sep 2024 08:12:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725869537; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=UXGsmOqRAkXt4IkE5ac7KOrOGkVUe2HBG5r4i+RbuyzdWpKMRKktlIYzZFvM/+da3 kNXDL3Z1AUDL3qQzUgay1m0HHFdmJmPb/Wyit1XQtR3zdnnaVmQ/hyNqI/8PVwi2+U fanCS++h1mpZazsaNYWcCg1RvuwYJnPzE2kS8AW3Z4Wjq51tX43NEUowVmSHvpkyDH frYkZ03SV+wFc+wng5lNFhwuS/jSPqxTpR7NIydJa5DCsapAQ6kDp4nmtXvHrG3Z+X xYD7rUSQtR8nb7nW2e8GHvmrULOixLetdnxC+l5zHFZFA7EKIjWdIHDn9+EwyCwpxK G92G1cW/DdhRA== 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 6DA2BECE581; Mon, 9 Sep 2024 08:12:17 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 09 Sep 2024 11:11:02 +0300 Subject: [PATCH v12 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: <20240909-ep93xx-v12-37-e86ab2423d4b@maquefel.me> References: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> In-Reply-To: <20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Nikita Shubin , Alexander Sverdlin , Charles Keepax , Kuninori Morimoto , Linus Walleij 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=1725869532; l=4982; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=ZGsaIwYTR1JNVHlGFBAmmmELz25300Pi752QNOzmkk0=; b=hVFwEKlIhwdkzQ/KvKlK9jopGQUFqUjr+NoNgmCNgdXWhHUVSmUwVFOu2LEN2h3XZLFxJ/zdpr0T KFCiLTSXDCPKtvOX056lVDhuPBT9CBLltUl55DKA5x2rZwGUO2Bg 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");