From patchwork Wed Aug 14 08:39:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 819159 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 D4E59C3DA4A for ; Wed, 14 Aug 2024 10:55: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 2B1972BA3; Wed, 14 Aug 2024 12:54:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2B1972BA3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1723632903; bh=4odUtP/AEWZfLJ3vVU3By93GqPTr0OWR8KAXnBFaSXQ=; 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=lhlB8eeU3WGOAaoMP1Q1ZlozvlhTduAfL02csPuyl2aslQKsfvuOb6GgvwBTrtnB3 rRYXK1z+vja4MCVjUmIHQ37jfCp0mD8oAdys4WEOknvIJtpGMAGRokZHa9tqxRtG9y Q6ccOQDVT8pMamCBDKSsWwOIwUZM9G0tK7Zl5GTk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1675FF805AF; Wed, 14 Aug 2024 12:53:23 +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 030E7F8068D; Wed, 14 Aug 2024 12:53:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 68152F80301; Wed, 14 Aug 2024 10:41:39 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 D3AFBF8058C for ; Wed, 14 Aug 2024 10:40:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D3AFBF8058C 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=HhnfN8j2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723624848; x=1755160848; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4odUtP/AEWZfLJ3vVU3By93GqPTr0OWR8KAXnBFaSXQ=; b=HhnfN8j27J8gPwtPFK4LVqsguHKGCxcJTTnrCcpEGRlY350+cBri2NJI eACBD4yRhnFV25id30v6hjVdvMrZK+JNijqqPh7VZL1SVd8YEio3KxcRw ZNg36l3UnLoSKpYxLx1TvxFxPEh5/JffGZC/mZthgOK33oEw4V17zncM9 JL+5+i0GdUFPw4+N6G1ldC5jsB+UmRGus0xhkOtdHlVvxBgFLcqcJ5wAF Jt9nHPQV55pqmaY/O6XRC7Rjj/pQHf+EY1Z1IL2gjI0sVJRG3bsw0DjOj /ZXkhtZLwodVbwtxEg0u17/bafSt+CgT/QWJT6fLbVMAp3KWHDQ1yF6hJ A==; X-CSE-ConnectionGUID: cpTrN2ILS0qa+im5H8GKMg== X-CSE-MsgGUID: wX2xnpEmT1S0RUfOA5ZaVQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="24735342" X-IronPort-AV: E=Sophos;i="6.09,288,1716274800"; d="scan'208";a="24735342" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 01:40:44 -0700 X-CSE-ConnectionGUID: PI6VbwLZRE6AK+q+Yt4rXg== X-CSE-MsgGUID: Wf09/Yv2TiaeZySrWhi2kg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,288,1716274800"; d="scan'208";a="63868161" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by orviesa004.jf.intel.com with ESMTP; 14 Aug 2024 01:40:41 -0700 From: Cezary Rojewski To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, andriy.shevchenko@linux.intel.com, cujomalainey@chromium.org, lmajczak@google.com, Cezary Rojewski Subject: [PATCH v2 14/14] ASoC: Intel: avs: Enable by default for all SST configurations Date: Wed, 14 Aug 2024 10:39:29 +0200 Message-Id: <20240814083929.1217319-15-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240814083929.1217319-1-cezary.rojewski@intel.com> References: <20240814083929.1217319-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: COUY5AXRPKVWH67TDNY6KFTQSGLAFHVD X-Message-ID-Hash: COUY5AXRPKVWH67TDNY6KFTQSGLAFHVD X-MailFrom: cezary.rojewski@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.9 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: The skylake-driver is deprecated in favour of the avs-driver. As the latter supports all configurations of its predecessor and more, update the existing selection mechanism to acknowledge the SST flag. Acked-by: Andy Shevchenko Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index f2dc82a2abc7..da7bac09acb4 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -422,8 +422,14 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) int ret; ret = snd_intel_dsp_driver_probe(pci); - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_AVS) + switch (ret) { + case SND_INTEL_DSP_DRIVER_ANY: + case SND_INTEL_DSP_DRIVER_SST: + case SND_INTEL_DSP_DRIVER_AVS: + break; + default: return -ENODEV; + } ret = pcim_enable_device(pci); if (ret < 0)