Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3388230rwb; Mon, 16 Jan 2023 07:24:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsljr4+rDHpRd7H0d8yIXGtvlX3kpBQbYOAufGxZ5aaAV+8BGlVJaEewaJBOHBDLRoEUU6Q X-Received: by 2002:a17:90b:3951:b0:229:55f6:a8a7 with SMTP id oe17-20020a17090b395100b0022955f6a8a7mr7680446pjb.20.1673882654940; Mon, 16 Jan 2023 07:24:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673882654; cv=none; d=google.com; s=arc-20160816; b=oQWY+GvzTno1brQlJ1J6AmHG68mk58yn4juWKyhtpV3FK+DAXxUxle4iBQsjZAYGzd Q9dx5khH/TY4CDFYKiOoDaByPJ/kF0wSOgr2i9y/TVnmh7dXjiU74PEdI+q5TDJRxYeu j8Pra+2TE+9Al0024vFCQREPF73K/2pbYJGNUT7wqHEoOIlUVTZzIFOCASIPZYoZRoVh KqBHINfP5hhcuQJlMcr1l2zK2FbD1yHyGkJ+ZlzZRYn0DabYuF8cC93ms5gvvKyCD7eT N+uUJHcPv7Z8FVMRu6frIdOvhrNYNHTjPHrDZ8vRiUag8WFQq6qUd6XoYALNgOLzUqD6 m73Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GxxxH6D9rUwkRfyYRFdAqVXU/4xtJpJHvcgl8tj+H6A=; b=F4IY14vqIV9+I/IwzP3P2tKAFiB0dgz8yvweLIvrSWpMN8N/blHHsgf6rnVunWMlJb MAhmyOBKTvkw/krIiR5II44Xb9hhDlPYQEds/J5knZuFUknBbzNHdK9xGZtFxM8SNOhn LOkWH4s6IKQYfbVNLI1foFiv12k65FQJUNh3QiRk5XpoEC9xkfWF/PEEGlG1pMADN1Ep jPrLfuT9LPnyjtFjFMff0IFWDRMaXlsgamYjbGb9lpnRvMFigtY2h2mOJYL90PjU33t5 l9dmzxxV7Dd6xf1b9tjGIKI5Zcz5v7v4wElQI0OOUhGNpz+WDUrl+g62Vvj2Di2XYBpa VyIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UgzpANXD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pi12-20020a17090b1e4c00b002296f8a9e41si4228315pjb.138.2023.01.16.07.24.07; Mon, 16 Jan 2023 07:24:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UgzpANXD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232464AbjAPOPW (ORCPT + 50 others); Mon, 16 Jan 2023 09:15:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232008AbjAPONa (ORCPT ); Mon, 16 Jan 2023 09:13:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BD9323848; Mon, 16 Jan 2023 06:05:10 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 21D35B80FA8; Mon, 16 Jan 2023 14:05:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C90DAC4339B; Mon, 16 Jan 2023 14:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877908; bh=cTrglWi26ElH+kTwQbdDMsigaHiKqPI18XV0P8k1iuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UgzpANXDZccccVbpoCWco2x2MjeHAdzV3cQJkFg/aUkrxF9gkYNrPrUWeR8/oXnPU EIVj5KyY3n41Zt+fKA/sH7jHEl3GB3yzK7j1m25SDKKddfm2nww16Sq7GP0buU6GPz 1QbTQNVJfkyndORaO9G5ZjOw9/uDKfdE4VdA1ZHoaBC/HQeaLn9q99fdCcCeniUGL3 Iu36hFe89s+YniLlbQcVe+Dg5JtbR05oUgJCaJ6ESB4L+I0zhbFZSpXiBK6Ex1VGPg xLtHJe5lYTw5xCUiJsWEUcZJLrKhSa4aapVc5M4coYcb0AGK8pKfyNgUT7PBhWQM77 OGzvlUayhS6nA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Shengjiu Wang , Sasha Levin , Xiubo.Lee@gmail.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.10 10/17] ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets Date: Mon, 16 Jan 2023 09:04:41 -0500 Message-Id: <20230116140448.116034-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116140448.116034-1-sashal@kernel.org> References: <20230116140448.116034-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit 242fc66ae6e1e2b8519daacc7590a73cd0e8a6e4 ] The fsl-asoc-card AC'97 support currently tries to route to Playback and Capture widgets provided by the AC'97 CODEC. This doesn't work since the generic AC'97 driver registers with an "AC97" at the front of the stream and hence widget names, update to reflect reality. It's not clear to me if or how this ever worked. Acked-by: Shengjiu Wang Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20230106-asoc-udoo-probe-v1-2-a5d7469d4f67@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl-asoc-card.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 8c976fde44f0..9a756d0a6032 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -117,8 +117,8 @@ 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, "CPU AC97 Playback"}, - {"CPU AC97 Capture", NULL, "Capture"}, + {"AC97 Playback", NULL, "CPU AC97 Playback"}, + {"CPU AC97 Capture", NULL, "AC97 Capture"}, /* 2nd half -- ASRC DAPM routes */ {"CPU AC97 Playback", NULL, "ASRC-Playback"}, {"ASRC-Capture", NULL, "CPU AC97 Capture"}, -- 2.35.1