From patchwork Fri Jan 6 23:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13091887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C58FC54EBD for ; Fri, 6 Jan 2023 23:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=62sVxPSx4J7L/kazZ8is+McmTrPp96VWSEXb0Zsd/QQ=; b=22tfycMPw1AHOG mWEzjKrQIUKAxTVAt+upxROyGBpIAw0P1ewVHA3Tt6CTvOr+BWIKDfgZMe/2v/xzWq/YORSZqi5po AMdXPIzR3fYygIQuZBhOLpxuP33sT/bX46+BY7sKCfMlAHb8w4Fzc3aOnu4H6Pf6Gv5uaZyYqBjLQ 94hLz0DOtg3BEPapgJhJx1cHZvBz6YW5rSO1gsOiSmKkv2Kt3h37dywR5ME9SNtwnBQBtEfMcaOcq yKt5biIBA9y86dXWo9vCrVYBlc9DHdbNWH+gS3k2XhAg7kmFLZCTc4gwVUvbn85iu7sDt37zTF5c1 T9MWjftxmGnWvLZW7lOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDvws-00FWfY-Hv; Fri, 06 Jan 2023 23:16:30 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDvwd-00FWVx-Ax for linux-arm-kernel@lists.infradead.org; Fri, 06 Jan 2023 23:16:17 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id A354CCE1E89; Fri, 6 Jan 2023 23:16:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F43EC433F0; Fri, 6 Jan 2023 23:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673046969; bh=JgASkVc5I3/yBQcN0l7OgrF+H1szN210UEEK8rEOvQ4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=b3xVfxnDWkTlRtsHY1A99l4mmA/t2WC5mLsi2482SyJ6WIdJkoGvLY0+umrYo0e+7 fJ9BXwxDzyCc624RrjZh/6EqJWj+t2057+3eZs3oSQvfLke515lb8usSwpnD8hpVor 9A4wTmxkmjI+2kQO+w8TftuO1fFfT6C4p3mf1JQkBS/hwMKl1y+SOMYfHRQ1whJ/Wr DyMG6v2YW5wkyoZikRI7pCBqtD5bl9Xmvzcy3l3zhsc4GirAiXYU1es69PuK0539T1 d3x0+QvqB7LV/CylmyGb0em3FwqpKyisw+1WRCl2iwVyvWxPWKC9UWEkD0bd5217FY TkOxOIvF/Y8rg== From: Mark Brown Date: Fri, 06 Jan 2023 23:15:06 +0000 Subject: [PATCH 1/2] ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC MIME-Version: 1.0 Message-Id: <20230106-asoc-udoo-probe-v1-1-a5d7469d4f67@kernel.org> References: <20230106-asoc-udoo-probe-v1-0-a5d7469d4f67@kernel.org> In-Reply-To: <20230106-asoc-udoo-probe-v1-0-a5d7469d4f67@kernel.org> To: Shengjiu Wang , Xiubo Li , Fabio Estevam , Nicolin Chen , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, Mark Brown X-Mailer: b4 0.12-dev-8b3d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2136; i=broonie@kernel.org; h=from:subject:message-id; bh=JgASkVc5I3/yBQcN0l7OgrF+H1szN210UEEK8rEOvQ4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBjuKu0iBwz+1yeKm+mH85AdLfgQaLAEalxsxvX8I7W 5UVhe7+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY7irtAAKCRAk1otyXVSH0H29B/ wIzLXOL3FvIr6Wb+Nazwj/H6jNKK/VYjcGX8KC1O74Xic+WLO/xobMGTRtcvfEEvx+IwcuC/w1OXWf pFyCeB3wk4Nrkz+HrWikWIjpiyJskbfpki6Ff6/WK4j5tUmtjqXinn2Oq5yG70Tu+DwI96Lbn8DHgY wADU4Sn0NG6t/UZQTAQsDhwOQGvquULM9hA/xyySajq0dWACWjLC2aIhYXU9jTU5R2158lvdqVQvWB FYAc7xufjyJ6tyr9HhaPyiGh5AIGlX/2ixK/Ksuqch0bEAXot+QIpBIZuqkxR2QDYtHgrFjha25x93 vtA0QOxkB33Q4Ks2zjONfb00VQy+4P X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230106_151615_745645_62331F5D X-CRM114-Status: GOOD ( 16.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The SSI driver calls the AC'97 playback and transmit streams "AC97 Playback" and "AC97 Capture" respectively. This is the same name used by the generic AC'97 CODEC driver in ASoC, creating confusion for the Freescale ASoC card when it attempts to use these widgets in routing. Add a "CPU" in the name like the regular DAIs registered by the driver to disambiguate. Signed-off-by: Mark Brown --- sound/soc/fsl/fsl-asoc-card.c | 8 ++++---- sound/soc/fsl/fsl_ssi.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index c836848ef0a6..1dfd0341e487 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -121,11 +121,11 @@ static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map_ac97[] = { /* 1st half -- Normal DAPM routes */ - {"Playback", NULL, "AC97 Playback"}, - {"AC97 Capture", NULL, "Capture"}, + {"Playback", NULL, "CPU AC97 Playback"}, + {"CPU AC97 Capture", NULL, "Capture"}, /* 2nd half -- ASRC DAPM routes */ - {"AC97 Playback", NULL, "ASRC-Playback"}, - {"ASRC-Capture", NULL, "AC97 Capture"}, + {"CPU AC97 Playback", NULL, "ASRC-Playback"}, + {"ASRC-Capture", NULL, "CPU AC97 Capture"}, }; static const struct snd_soc_dapm_route audio_map_tx[] = { diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c9e0e31d5b34..46a53551b955 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1189,14 +1189,14 @@ static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { .symmetric_channels = 1, .probe = fsl_ssi_dai_probe, .playback = { - .stream_name = "AC97 Playback", + .stream_name = "CPU AC97 Playback", .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_S20, }, .capture = { - .stream_name = "AC97 Capture", + .stream_name = "CPU AC97 Capture", .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_48000,