From patchwork Thu Oct 19 17:34:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 735650 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 0772ECDB465 for ; Thu, 19 Oct 2023 17:37:04 +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 D022D852; Thu, 19 Oct 2023 19:36:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D022D852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1697737021; bh=RdD+F+x24vXfLV6mR5hwiNCO9FTu9ZbSLJaLVxMYXBI=; 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=vdCGxJ1rlGjQxgwQ13beeGcqA3L66EfjnIyz9KZqT/wStWF7tHfGvyIVizKSzrZZa +HQL7R9PcV0V37VBhX8VXMLOG9bRPW/rhQkOv96ZXY153pgHBmaGruerNh4cgUos6j 6jGp/j9dtbZp46EVfDCo6986lPMFm8+rGSMhuu18= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7483AF805B0; Thu, 19 Oct 2023 19:34:51 +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 E154EF80536; Thu, 19 Oct 2023 19:34:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9A2FAF8057D; Thu, 19 Oct 2023 19:34:42 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 B2AA5F8032D for ; Thu, 19 Oct 2023 19:34:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B2AA5F8032D 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=ecAjkfeS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697736873; x=1729272873; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RdD+F+x24vXfLV6mR5hwiNCO9FTu9ZbSLJaLVxMYXBI=; b=ecAjkfeSf3j8mNhRDcSeGPWjB+/dIny6f1+lNuhkL+EVHQ5NKD4ZwfFB zgrsxvmm//Z28wKJ724dOzz8o95D3dnD1n4PiqeVqPmlO7awmmxnOOEPX vObUsuju9f8SdtxgtgdR+9kzjqJnfQfV51Qxp4OKzov902wxDPT0+99Ny DvpXyAaqm2hH5qucrDKArgt9jyQzOpCNtsWG0QnbnhoLuNiCEqVDHofGJ rpDs4HTDyxyBaQ03pI8YLpz+9CkFSKr8OOKUOEnzi6g9QKG8oT51xfrYk YaC+VnGtUDzascpJ8Eysop/HQqMzMOPacq+yN9FyAG/+4kgFIUPgOYPnB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="7884336" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="7884336" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 10:34:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="792090646" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="792090646" Received: from jihao1-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.213.163.144]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 10:34:25 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Charles Keepax , Bard Liao , Pierre-Louis Bossart Subject: [PATCH 04/10] ASoC: intel: sof_sdw: Move the builtin microphones to dataport 1 Date: Thu, 19 Oct 2023 12:34:05 -0500 Message-Id: <20231019173411.166759-5-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231019173411.166759-1-pierre-louis.bossart@linux.intel.com> References: <20231019173411.166759-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: VJKLME332VR6ZGTXP7NZCHIXC44Q3NRA X-Message-ID-Hash: VJKLME332VR6ZGTXP7NZCHIXC44Q3NRA X-MailFrom: pierre-louis.bossart@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: Charles Keepax cs42l43 supports 4 hardwired microphones, but only supports up to 2 microphone headsets. Only dataport 1 can support 4 channel capture, but that is currently used for the headset microphone. Switch things around such that DP1 is used for the builtin mics and DP2 is used for the headset microphones. Reviewed-by: Bard Liao Signed-off-by: Charles Keepax Signed-off-by: Pierre-Louis Bossart --- sound/soc/intel/boards/sof_sdw.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index ad1d01ebbcd9..3312ad8a563b 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -939,16 +939,16 @@ static struct sof_sdw_codec_info codec_info_list[] = { { .direction = {false, true}, .dai_name = "cs42l43-dp1", - .dai_type = SOF_SDW_DAI_TYPE_JACK, - .dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID}, - }, - { - .direction = {false, true}, - .dai_name = "cs42l43-dp2", .dai_type = SOF_SDW_DAI_TYPE_MIC, .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID}, .init = sof_sdw_cs42l43_dmic_init, - } + }, + { + .direction = {false, true}, + .dai_name = "cs42l43-dp2", + .dai_type = SOF_SDW_DAI_TYPE_JACK, + .dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID}, + }, }, .dai_num = 3, },