From patchwork Mon Jun 17 09:37:00 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: 13700415 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 F0242194AFF; Mon, 17 Jun 2024 09:38: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=1718617106; cv=none; b=A6XD3bXLXOqQ+OznjRXfVN3XRXboVe/UOsyLp2ONcz+xNeoNTW5qfeRX0HlygQGti5OFkmMGYrUEWgOAXF5n1W5Dj6tu589zz9AprJFHX9/2DzXvdb1mB5bLlfr09yUsLTR8iTYfg1xaHXcihaeHA93Y3zu7neLtoLRPesU3W7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718617106; c=relaxed/simple; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AbJt8YVJLGrU//53MUWO0fd1g/UzKLfvNIrF7bTwZfv3z0c2OjY0l0vQsMO+2aFDQQNF4pOVxAZ7k9eqKrDosU6289c/ewnZZfL/b4iYd6HsDSABNvEIesu0EEL2+CX4iMiSdLlqakgYoWwQkST0tPAROTsNwGYWDeiNjlEP/CI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UmIgOZ6D; 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="UmIgOZ6D" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2DA93C4E676; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718617105; bh=xnkrIHWz0C+Ukid8QKlf5IsbUMUDj0jNbjFGkqdX5YE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=UmIgOZ6DMijmu669TZeQdXhwbbcTd1tUjtTixErfIkBd6ZfaO0pV364Z1BlWkU70v cJT0vqEF+6DYq9C9tEJFV6gsOBPGFL6F/FJUxns8/wmoSB2d5g9DbXoogU/G4teIKV 6/WFaHYOgXtitd+TEzX7A5G1iC+VGh48eUBANgl/jT1/aeENb1rq2vbURZ/iLWuFn9 LOV0AmAptNuWn/csBxsbpCk3Prm9fVYhXOLum6bi4AmZzk46vEwe1HQbkL84SVwSmp oVUI02ppuqPKEuLAkkx1QtwWsRYv1eXZJPzbe5LfEifFoajBsir1AQuek8meRjoWdZ VS/TM1qVV6n2A== 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 1B92AC2BA1A; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 17 Jun 2024 12:37:00 +0300 Subject: [PATCH v10 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: <20240617-ep93xx-v10-26-662e640ed811@maquefel.me> References: <20240617-ep93xx-v10-0-662e640ed811@maquefel.me> In-Reply-To: <20240617-ep93xx-v10-0-662e640ed811@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, Arnd Bergmann , Krzysztof Kozlowski X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1718617100; l=1224; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=IYgRqPiUpJda2whx2paj9O35GPXheF0lc1rCPFeTg9o=; b=9q0iZ5LJ0KG4HhEwTMjG/Rcm8wW9MV4d51edKmjpR8IUp9ISWH4xa5lyQeLBmmPjhp3wzo6KAQ+A oWYiUfBJClv9rzk1yQ3D8z8i8gYOK+f14SSRBs2glXhLkoiqSeiJ 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 Jun 17 09:37:01 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: 13700416 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 017D5194C63; Mon, 17 Jun 2024 09:38: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=1718617106; cv=none; b=qY9Dh0iwnrWH4APJOg6JUDPg+TTBB4ggNtvNISMs3qR/BihRW2YnIjR+28fZqSB4oYlX5Drx/pK3z0MES6Fa5XJC4V6wbQxFlDNJP+3xtrhxEz/tKQenw0kCze39Uie2cKQ1CqCBwVzZbe0GOyvGJvhR1BY6d44o3iJGSTK/MWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718617106; c=relaxed/simple; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bO6lJKj0ZMTDUKKbPn5Yps/TTtJjHCsLN2ioV02JjoymyXQ0BMaTS0/otHBZmPDYOQRxdFhKdefw+ulBrSYv8JT/OhjtR2ePDSpXZKhio7+kTRWCvC2DH+Sa8/eHIsx10FzQb9/UWkgGRqbCvyHYKaJoeIzl5VzvesSxuJvA0ec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=alDX5D99; 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="alDX5D99" Received: by smtp.kernel.org (Postfix) with ESMTPS id 39AA2C4DDF7; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718617105; bh=yWJGKp7TUnjWkI+yKdb5oOAuziHvtOUn8hbW128UrP4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=alDX5D997VTsSXo/OeKB41JUrrGY88OjFsth96Ua3DCIfYoOJSAMyBN0FK0bIW19Y hcaWBfezJNSHlarMumTKFPDeGH3DsMLj/AouArRRV0e7H9oYPrd5kY6+ZdGMJYO0nH dI+txLhx+EaTrqzSibSftPfrE+klDinf88fAJX4P8bSH4s/Am7pXZsoj4p4h9NzXmN YTV04CN/Gta68XCw+/UuUMJRvlQfelU7/YWzx417/xvSZjynYhhAFIcZ0PgjnIurP0 m3e8YPnYCrMdNEmj5Fciyb8CvnqfG1Xvd6Eau325LIL86J2FNxNT9Ih968eHDGQSqr +nRsvratlOoVA== 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 28E46C2BB85; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 17 Jun 2024 12:37:01 +0300 Subject: [PATCH v10 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: <20240617-ep93xx-v10-27-662e640ed811@maquefel.me> References: <20240617-ep93xx-v10-0-662e640ed811@maquefel.me> In-Reply-To: <20240617-ep93xx-v10-0-662e640ed811@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, Arnd Bergmann , Krzysztof Kozlowski X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1718617100; l=848; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=2DHMH5gyVKrv/Zk+FD8HvqWkgva1cQdPwzXr84HYqOY=; b=9/Y2zO6prOhde1GRRjeUr2zqZIwD2QS/u79bqPUyRNxLUYFpjbOyJlbZIzNQyvMp6h0ffN6uz/Q9 uTw5eUS6CYw0atVF4hcKVtmIXMJYvqkKrAkT4o3b17GrvF2s2Z+S 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 Jun 17 09:37: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: 13700417 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 10BE2194C68; Mon, 17 Jun 2024 09:38:26 +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=1718617106; cv=none; b=R81mz7U78hEQW8saP/CXhcSFbX1SFTdd9Ny82/EQLszsgZ75/emejSmUm4AOdvuL9FPrymv2OeYdpzMn5+Z7DT09Z+1QpvioVK1UtiaWhiOn7i8rk9j49+YEsDDKEEVfpMUaw+iUz5tzKYYul/zNAiUMQ0GF90tTUS88npHi/Ic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718617106; c=relaxed/simple; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OCaVFQEmNJ1TwE35Npyi6uK5AKxJu0qW3JuF6qxeIAGrQ0cZck3y6h89XBKBHRDAADJELKR70rXxQSzzL8QjnpMDuC0qS9o9OlUoK1n3wI3NGvt1REbrnWVWACapwPZVCwKkS299iitmodivLdmvgD1qUqfVrNWIx3mE4WRWAl8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j19s2FUe; 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="j19s2FUe" Received: by smtp.kernel.org (Postfix) with ESMTPS id 51654C4DDEC; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718617105; bh=tBkZbYGVVOZU5vTFJf/4Hx9sKzgEywOUrQAiC76tePA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=j19s2FUeBaevh5MLK8mJlZdqME6bPg8SdIzuB6HtoN+cJDBLfMp3lz/LGdOnYQPCl MTRPIo6GNHLBZdo/svysA5EjWphMQpz63ORGNnYmZ0ACJPByfvhT0WGkPpEj5sPQWZ DJAUI5kt1GIaP0WOLpddHsx0kvMKgYyqvDvavZcC3aEB6EObxnBnsmxuadcPccQsJX 9Ar2xfENxPP9PUaV5e3/KCYhZuw44CiJkdAjsYgWaHkAt6dk2YuOypjUQpfVgJ1+k1 nuse9D7UTRfZ5WMp0thFhSzM3YyaMNYrshmRMHNlTvEdaUxxvMftK4RmoLrwfh9XZ7 liUffO+tE0YMw== 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 3B162C27C7B; Mon, 17 Jun 2024 09:38:25 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 17 Jun 2024 12:37:02 +0300 Subject: [PATCH v10 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: <20240617-ep93xx-v10-28-662e640ed811@maquefel.me> References: <20240617-ep93xx-v10-0-662e640ed811@maquefel.me> In-Reply-To: <20240617-ep93xx-v10-0-662e640ed811@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, Arnd Bergmann X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1718617100; l=3001; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=SYU0FfCpDAQ8R3Z8Qf0jhP48bWMjlrK6VfAOntLJB4w=; b=TxkeqDnV7gzIyg/9WJu5iEWkQK9UUIKtDdN0Mp8cd1MrF2UkNqVaZ54y/v8gwn7PKMxTFwrcIsDJ 04wJEhdiDSwO5Kw9cA2AJugVcgYN7Sl5/YNTTHZYI22tc+ZTuYOL 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 Jun 17 09:37:11 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: 13700418 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 72A73194C9F; Mon, 17 Jun 2024 09:38:26 +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=1718617106; cv=none; b=ThylovY5m6TNm7tzLNG/1EVUPRO6YotDkyl//3VYyhQgpy6Ibn0UN/1FkpHuEBRsn25iXn7WUhnXFFHNyxOUEq3LezwB5kHHJN3Q6gzj3J7g9m66sypmnPfEEQlJyZU7Wx0ehk39+WMJcBXzD8mbP2p55KWbkpkPgOp897c6Kk4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718617106; c=relaxed/simple; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dbXqR6NO6Xn1ITFQJ7Ooc2ACn+xLKZx/O2XB9sx6iaGrQDnvuva7VhaMK+wH4p4VxIG4MKGTzfmTZBXj0RwET+rujIErqzicGo0VCmlwm4JMp2wspeTnLhJxERAcrphj35+zMIYQ19jk+3ot8xSq6wP+abYVufRs7dwqzWvNDkg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M1hArJ2/; 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="M1hArJ2/" Received: by smtp.kernel.org (Postfix) with ESMTPS id 14258C4DDF3; Mon, 17 Jun 2024 09:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718617106; bh=Dw4qelO4Yw8qqwoja13UuuyY2TUVvElISzCYI/EHfLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=M1hArJ2/eLvUWJ002wIxf0/AVjfSdjwa57kVXRYO+pPm8bDdhcfJM4FqEkXWH4sXv JQOjTA9jBoYSsJDyQFgNqo444vglQ7RH7KLDUnUp3iEnorxzE8MyalKDUdoGcmnux2 Ym/ph2vHOf1imDKt1PPuHWKXyIGINMBF0OpK4Sb+RwvheDXAhyrt92pHHV5jjjAVp0 +8IGXCASw6J5v48+UvfXxxYfvOPQdOaLQO7EETTPHZqNGu4nrujIA2i3NNH/vqz3Gb wPuBIyd4Egh4NgVyeIlvVh1bnzE6zSKhRWCKi17FRKrHt86hT7gulItDL7uXoLrKpq nbSBSTJQZMBoQ== 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 0A48FC2BB85; Mon, 17 Jun 2024 09:38:26 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Mon, 17 Jun 2024 12:37:11 +0300 Subject: [PATCH v10 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: <20240617-ep93xx-v10-37-662e640ed811@maquefel.me> References: <20240617-ep93xx-v10-0-662e640ed811@maquefel.me> In-Reply-To: <20240617-ep93xx-v10-0-662e640ed811@maquefel.me> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Alexander Sverdlin , Nikita Shubin , Linus Walleij , Charles Keepax , Kuninori Morimoto Cc: Takashi Iwai , linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, Arnd Bergmann X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1718617100; l=4982; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=ZGsaIwYTR1JNVHlGFBAmmmELz25300Pi752QNOzmkk0=; b=vXVu7l7YtLrXGjAK1Ti2HSi+g2hmImnnvY9WSH/FZvZsVDsGUDqWxD8NwJSw6Aw/5IW5rmez51YI wgxe3rVAAVE72D8C498mxmXWgTsm7jXVL167pDVSUal8GUKyft1l 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");