From patchwork Mon Aug 7 21:49:59 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: 712003 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 C4EC2C001DB for ; Mon, 7 Aug 2023 21:52:11 +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 A82F2850; Mon, 7 Aug 2023 23:51:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A82F2850 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691445129; bh=AxnK1EnqOwsIlsUyEZHBS+ITY6bccL0OykTpi5k12vQ=; 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=MHO10tH8RaTGMZ6Cnxac6ABW+tRbiudyQbXia066VlEhT+UEJDvUUWI8UF/rIY35Z luQYhZKNLnKXbb8a3gtUcbpKg4CPbAt/Vbbe6xkOeg4ZpascIfb02JPLHX+BFGY2mm Dx0HlfKZEUlz6YUatjtP5kj/RCsqLu/stCqWLVBo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BC45AF8056F; Mon, 7 Aug 2023 23:50:24 +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 6C689F80564; Mon, 7 Aug 2023 23:50:24 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C69D4F8051E; Mon, 7 Aug 2023 23:50:20 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) (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 509C2F80116 for ; Mon, 7 Aug 2023 23:50:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 509C2F80116 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=l0TkJhc4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691445018; x=1722981018; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AxnK1EnqOwsIlsUyEZHBS+ITY6bccL0OykTpi5k12vQ=; b=l0TkJhc4fkge4GLaiudQm3IjhSMG1AvXApLKcaCDOh8iGKtMB6F4IfJH zK8wihDCJpFtdPvbitMtbphj2BRTZVwuH9rZlTq6mPYwE2t87Q6cvG4LJ X6heGawYZzNL3f2ci0q4gp0HfpCk/yen5S1BSzwUENFS49YDQmOCEZHm5 G1Q+Qxm/CnZj9qi2BBPJljcpHT4iP/NjqyZhCMBrl3kBSy+cFnExeyK8e f5KaPK/5WDqq81cbl0gn4CLeWU5+2Gx0rpuY/CPNf5vjn6AI/zr0wSEBc W849BShMQU+G5Sb1Cq02gu7tKW2jHCpJX2ouKjUmlF+UDjL8B3X3VePef Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="434505572" X-IronPort-AV: E=Sophos;i="6.01,263,1684825200"; d="scan'208";a="434505572" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 14:50:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="874470769" Received: from mkabani-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.55.216]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 14:50:13 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, jairaj-arava , Pierre-Louis Bossart , Ranjani Sridharan , Bard Liao Subject: [PATCH 1/2] ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping Date: Mon, 7 Aug 2023 16:49:59 -0500 Message-Id: <20230807215000.515846-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807215000.515846-1-pierre-louis.bossart@linux.intel.com> References: <20230807215000.515846-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: 7YVNBS2XREDRMYERTGA7GVMDIXIH3QYN X-Message-ID-Hash: 7YVNBS2XREDRMYERTGA7GVMDIXIH3QYN 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: jairaj-arava The CS42142 soundwire codec button mapping is corrected to handle the button detection correctly. Fixes: 1340018d8683 ("ASoC: Intel: sof_sdw: Add helper function for cs42l42 codec") Signed-off-by: jairaj-arava Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao --- sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c index c4a16e4c9f69..ad130d913415 100644 --- a/sound/soc/intel/boards/sof_sdw_cs42l42.c +++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c @@ -99,9 +99,9 @@ static int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd) jack = &ctx->sdw_headset; snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); ret = snd_soc_component_set_jack(component, jack, NULL); From patchwork Mon Aug 7 21:50:00 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: 711150 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 A114BC001DB for ; Mon, 7 Aug 2023 21:52: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 1F399845; Mon, 7 Aug 2023 23:51:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1F399845 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691445122; bh=SCbd4gzEtA0QmN7CUNPAY/z2LKhm20XUhaFWuFOlVHg=; 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=fB6bntO+97rFjm1xsoGtO7tVOP5zd5gj+SBcsORdYyVL9eSlBiN+XOs0752XTniC7 HVb1KMFKAIH2kvs5+DXcLpmemyB0SjVnKQVlmDivBRkPLYGKmuQ5r3n/lRt9H8YYrO G3DVW2NRfY0lRXhwaLun0NDEV+pk/B8zuLbpfP8U= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D5C53F80534; Mon, 7 Aug 2023 23:50:22 +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 24213F80551; Mon, 7 Aug 2023 23:50:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CCEACF8016D; Mon, 7 Aug 2023 23:50:17 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) (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 C7C5EF80116 for ; Mon, 7 Aug 2023 23:50:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C7C5EF80116 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=Nr5yqmbh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691445016; x=1722981016; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SCbd4gzEtA0QmN7CUNPAY/z2LKhm20XUhaFWuFOlVHg=; b=Nr5yqmbh/ew+qNo6A/ajUrUPnCmbwcodbfDtBQNYFwt85RyD3L0ivUVm yQet4vYDrjSnM42NFgtp/3Uwy8f9m3Hgv0mpxleXHjXGSsADvPyxHLu08 gVrumghA6AaEj+lGd5b3t9cJDyI+3oE8o6xkTgkprimTwHDG+Dpp74MwP 4KhEEDuW4f/yXVOQOyFPwbIAepJr5d1IjNBcI5F3392Vu/6k3px24ZzIU //d2mSiKJ5jI+19FNshAqTZdHGiWYgNPvrQ7e7voyH9Hka7UkvDcHjxOu f2Gaf3oYlEcufD0J99Ns8nTqwaKDMzrGIG+s+ZwOT6pAqJ8C8uw8sobme Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="434505567" X-IronPort-AV: E=Sophos;i="6.01,263,1684825200"; d="scan'208";a="434505567" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 14:50:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="874470770" Received: from mkabani-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.55.216]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 14:50:14 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart , Bard Liao , Ranjani Sridharan Subject: [PATCH 2/2] ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP Date: Mon, 7 Aug 2023 16:50:00 -0500 Message-Id: <20230807215000.515846-3-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807215000.515846-1-pierre-louis.bossart@linux.intel.com> References: <20230807215000.515846-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: Z2JZPLM57HYJXRAG33ZSIWLOPCTH4HDK X-Message-ID-Hash: Z2JZPLM57HYJXRAG33ZSIWLOPCTH4HDK 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: Experimental results show that the headset is only detected with the JD2 quirk. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao Reviewed-by: Ranjani Sridharan --- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index f283c0d528df..5a1c750e6ae6 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -488,7 +488,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "Lunar Lake Client Platform"), }, - .driver_data = (void *)(RT711_JD2_100K), + .driver_data = (void *)(RT711_JD2), }, {} };