From patchwork Fri May 19 20:17:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 683918 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 EB71BC77B7F for ; Fri, 19 May 2023 12:18:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A6C6E827; Fri, 19 May 2023 14:17:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A6C6E827 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684498694; bh=dKM8/qjifAr/pAHw/mTEzaJ2EgQi1hYiS+/J/CVx7xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=RyVNm99Zh5q+E7ADA1BHvITeHoDiAF26r9ZR5Y1SOwBE+GFq7w5u9nQFwzO0Nlho6 CqrNwUCyVKvR8aDrtNRHtv7DJy0AmNfiJ3WaKmDXZPk/RRXmdftAwkaHM2N6ZJssLg Oz2UgW9Q3ruxgAXC1k1oGrL228b0F+XJu0/OUtZo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C7FA6F80579; Fri, 19 May 2023 14:16:12 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 63050F80579; Fri, 19 May 2023 14:16:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 95AA5F80558; Fri, 19 May 2023 14:16:05 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 297B7F80087 for ; Fri, 19 May 2023 14:16:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 297B7F80087 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=eucra285 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684498562; x=1716034562; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dKM8/qjifAr/pAHw/mTEzaJ2EgQi1hYiS+/J/CVx7xs=; b=eucra285IlK0q15+NyFqP/PETPqK+BFloncHPhnF3RuDwkCml8MvWNZD u+DnmnMKqgv78UOfha9bE8RUtm7wuMnl23UAVFsCompPYgTeT3HcaYrtl dYf/WTxpORqzg+Mmuk6tEWqFvF1rqDnI1HGoURRbFb0LQc0Xvzpmm1yYU Af5IPEUU69i+52H1rHz2wucFqZh9NQnvTyeJkyl+vsNKEWnrgVJWYOPQ+ YBat8AKsoL9dQTylorsU9JwHWPeikjZOkJ1kemawmrH2GNSbFNjTTbnkS Ho7fg4hlQEirtencKzheeBQCzAF5ElEBvbJSjJzzp53sjTxvJsywNFfKT g==; X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="355584427" X-IronPort-AV: E=Sophos;i="6.00,176,1681196400"; d="scan'208";a="355584427" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2023 05:15:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="733283671" X-IronPort-AV: E=Sophos;i="6.00,176,1681196400"; d="scan'208";a="733283671" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga008.jf.intel.com with ESMTP; 19 May 2023 05:15:57 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Mark Brown Cc: Cezary Rojewski , Takashi Iwai , Jaroslav Kysela , alsa-devel@alsa-project.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 3/7] ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg Date: Fri, 19 May 2023 22:17:07 +0200 Message-Id: <20230519201711.4073845-4-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230519201711.4073845-1-amadeuszx.slawinski@linux.intel.com> References: <20230519201711.4073845-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: 26DMUJ7QJASAA2AXAT33YIUQQTGQXZVZ X-Message-ID-Hash: 26DMUJ7QJASAA2AXAT33YIUQQTGQXZVZ X-MailFrom: amadeuszx.slawinski@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Cezary Rojewski Constant 'C4_CHANNEL' does not exist on the firmware side. Value 0xC is reserved for 'C7_1' instead. Fixes: 04afbbbb1cba ("ASoC: Intel: Skylake: Update the topology interface structure") Signed-off-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński --- include/uapi/sound/skl-tplg-interface.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f29899b179a6..4bf9c4f9add8 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -66,7 +66,8 @@ enum skl_ch_cfg { SKL_CH_CFG_DUAL_MONO = 9, SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10, SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11, - SKL_CH_CFG_4_CHANNEL = 12, + SKL_CH_CFG_7_1 = 12, + SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1, SKL_CH_CFG_INVALID };