Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5465524pxu; Tue, 22 Dec 2020 18:58:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7zxsHYLc4lMIKBgjzL+Elxh6NV3QrpL+/NpmVBnMidBFkIwF6g/qFlMN7PzXHzxHaf5Y8 X-Received: by 2002:aa7:c358:: with SMTP id j24mr23066419edr.265.1608692307279; Tue, 22 Dec 2020 18:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692307; cv=none; d=google.com; s=arc-20160816; b=CRQCQ6TcxXBwy7XnB6zARit2xy7ZanNTKomWd8VwgVaZgwt7eOG+hCRlQqQ2SX1CVF XXyOJb+S/b+PGv0OtXIefYnsIRWMVBt6Mr4pq9OnKkBMJLRT8tj1MkV1b/GYcWXyXpGl irQrjKouAf2UuOzBzSSbP0vKuv6F+YFuJaOd1MIO9j6KkuTno87rDLO0s1vvvU/kDaqE pzJPobEIH1xEk9yBF4TjsHV7+XUlTiWRDRV+s7dnvUnWMqyZWHuqlZ6glytQxK+zUc3h 1gGt7W/NKtfjmTfHlz/DZ6+FKzPldVxyaD6EzoAcrQ5q0lD0oPlAc+svt/17kq1tRVxB hHmw== 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=uChQHPcOfTd+4r037cAX2+okC6FlYIBXZuMRQ94xGFs=; b=sgzE8VRFmP17cMeN7s1tshm4Z/fTKXEhMPyf7ISKqIJjz1Prw6eu99lNdVueeac2Cz 5TtBKt+95MVk3RBBwI69c+X/vthwkwQUIoAL8mMkv4UF+U8gsycgoT3hVkMp3QxT5zq3 LtGvA6E2dun2uqI69GEP9+t2Cf4LlcRWs8k6o7GVx5xU/XwUlsRsFg1sGY50V8NzNtYN n39COmgGcf3VBCfo4NIad120S4c2Xa9yCNxkFforJEn3QE394Afwm+uf7aoFHN9GEweX TnwMGrVLuQ7rQDunY41dxuqgaxLCQLOtzz27IFJQ5x+dFn1A13UVmZI5iSSGfTV6KJJO k6Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r4zNmavU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n15si15171372edy.394.2020.12.22.18.58.05; Tue, 22 Dec 2020 18:58:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r4zNmavU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1729220AbgLWC4S (ORCPT + 99 others); Tue, 22 Dec 2020 21:56:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:49690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729143AbgLWCU5 (ORCPT ); Tue, 22 Dec 2020 21:20:57 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1D01D2222D; Wed, 23 Dec 2020 02:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690016; bh=KuOG9RquJ7QFLzwKgzbgeMWHTrQstCtDKvaba1UF2F0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r4zNmavUNxKGJ/637KEW/wFZB6L9C0QCFgJ5u76mLzg4XjrYxLLbOWSGe+P85U5gW dxG4biRO5nVJAfvsnHN0pJptD+OfungOfHiifVtXd9EXyTmnoEC8WZTEcIuiVX93V+ 6iXrAFyF/p5CD3TWW0DUFURt/q4HjMMEUgPW60Gt4rxBSMhbKbgv5one+pQy8DGmsc hnSdJto7inHS/5mwjAcurd1q2fxaHjqEki56z5Ua0xPXFggQqXQP4hoKmAui0NlVXl 9UY2zceeEhUmLHmk69H9mLwPGcMrhEwJ7dQzyPutIiz8JTLrk4x4pSePzIryF+Avh1 +67D/H8eHOM9w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Pierre-Louis Bossart , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 095/130] ASoC: Intel: cht_bsw_nau8824: Change SSP2-Codec DAI id to 0 Date: Tue, 22 Dec 2020 21:17:38 -0500 Message-Id: <20201223021813.2791612-95-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit 748e72e869718db8d735d773040bce95158c98c6 ] The snd-soc-sst-acpi driver does not care about the id specified for the SSP2-Codec DAI, but it does matter for the snd-sof-acpi driver; and when it is not 0 then the snd-sof-acpi driver does not work. Set the SSP2-Codec DAI id to 0, fixing the snd-sof-acpi driver not working on devices using the cht_bsw_nau8824 machine-driver. Signed-off-by: Hans de Goede Acked-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20201206122436.13553-3-hdegoede@redhat.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 501bad3976fbf..bea1372b416e2 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -218,7 +218,7 @@ static struct snd_soc_dai_link cht_dailink[] = { { /* SSP2 - Codec */ .name = "SSP2-Codec", - .id = 1, + .id = 0, .no_pcm = 1, .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS, -- 2.27.0