From patchwork Tue Mar 9 22:16:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 397441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A56EC433E0 for ; Tue, 9 Mar 2021 22:17:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3B86650AE for ; Tue, 9 Mar 2021 22:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230325AbhCIWRK (ORCPT ); Tue, 9 Mar 2021 17:17:10 -0500 Received: from mga02.intel.com ([134.134.136.20]:28472 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231788AbhCIWQ5 (ORCPT ); Tue, 9 Mar 2021 17:16:57 -0500 IronPort-SDR: XmcNURJ8XpRYBNSyrBwPhhfPx2tUzz2VGHGgviCfB3FKFNDilSN+PZxc+42kdm2B1+z3+E66Ve cFq5XHGh8iHA== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="175439286" X-IronPort-AV: E=Sophos;i="5.81,236,1610438400"; d="scan'208";a="175439286" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2021 14:16:55 -0800 IronPort-SDR: bXlYi7Lv3NGv7d6MUTxNSFoWX02dxQJzxOjRNhkcqpVcwEU8l6w7SU9rrcIn3XAU56Ws5k8M8g 87rA6WbxH6SA== X-IronPort-AV: E=Sophos;i="5.81,236,1610438400"; d="scan'208";a="437777498" Received: from ckane-desk.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.251.135.181]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2021 14:16:54 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart , David Ward , Cezary Rojewski , stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin Subject: [PATCH v2] ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver Date: Tue, 9 Mar 2021 16:16:18 -0600 Message-Id: <20210309221618.246754-1-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In v5.10, the "haswell" driver was replaced by the "catpt" driver, but the mutual exclusion with the SOF driver was not updated. This leads to errors with card names and UCM profiles not being loaded by PulseAudio. This fix should only be applied on v5.10-stable, the mutual exclusion was removed in 5.11. Reported-by: David Ward Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211985 Fixes: 6cbfa11d2694 ("ASoC: Intel: Select catpt and deprecate haswell") Signed-off-by: Pierre-Louis Bossart Reviewed-by: Cezary Rojewski Acked-by: Mark Brown Cc: Cc: Greg Kroah-Hartman Cc: Sasha Levin --- v2: added Mark and Cezary tags, fixed stable address, added maintainers sound/soc/sof/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index de7ff2d097ab..6708a2c5a838 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,7 +84,7 @@ config SND_SOC_SOF_BAYTRAIL config SND_SOC_SOF_BROADWELL_SUPPORT bool "SOF support for Broadwell" - depends on SND_SOC_INTEL_HASWELL=n + depends on SND_SOC_INTEL_CATPT=n help This adds support for Sound Open Firmware for Intel(R) platforms using the Broadwell processors.