From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1DE35C432C0 for ; Tue, 26 Nov 2019 14:24:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A030C20722 for ; Tue, 26 Nov 2019 14:24:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="PytFwawS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A030C20722 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E3E4E16FB; Tue, 26 Nov 2019 15:23:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E3E4E16FB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1574778266; bh=GX85bhsgjjxEdvRN9XWa4wJa7xoAynXP1qCtY1t9tRQ=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PytFwawSfFf8S/M0Z6HOtOLI9awp/xnvZjAhLM9sJA23zMfchi3vYyIlkV/3jRjcH DHdWZAlDMrXKTI6LdEAw4fXt6Ps9rdyjrrFxOgaKHRSLkMJ4sbf4cV0LZNOQ1Z54pJ wTb9BVsMZRziYxktyHr/Y/JAf6Teo1hlS2qQ4xwE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 63D13F80149; Tue, 26 Nov 2019 15:23:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DEED7F80159; Tue, 26 Nov 2019 15:23:33 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 19298F800DD for ; Tue, 26 Nov 2019 15:23:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 19298F800DD X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C5167B3A9; Tue, 26 Nov 2019 14:23:29 +0000 (UTC) Date: Tue, 26 Nov 2019 15:23:29 +0100 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart In-Reply-To: <20191126141423.21523-1-pierre-louis.bossart@linux.intel.com> References: <20191126141423.21523-1-pierre-louis.bossart@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: alsa-devel@alsa-project.org, broonie@kernel.org Subject: Re: [alsa-devel] [PATCH] ASoC: SOF: Intel: add PCI ID for CometLake-S X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Tue, 26 Nov 2019 15:14:23 +0100, Pierre-Louis Bossart wrote: > > Mirror ID added for legacy HDaudio > > Signed-off-by: Pierre-Louis Bossart > --- > sound/soc/sof/intel/Kconfig | 16 ++++++++++++++++ > sound/soc/sof/sof-pci-dev.c | 4 ++++ > 2 files changed, 20 insertions(+) > > diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig > index cc09bb606f7d..91c8bbcc015a 100644 > --- a/sound/soc/sof/intel/Kconfig > +++ b/sound/soc/sof/intel/Kconfig > @@ -27,6 +27,7 @@ config SND_SOC_SOF_INTEL_PCI > select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT > select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT > select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT > + select SND_SOC_SOF_COMETLAKE_S if SND_SOC_SOF_COMETLAKE_S_SUPPORT > select SND_SOC_SOF_TIGERLAKE if SND_SOC_SOF_TIGERLAKE_SUPPORT > select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT > select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT > @@ -231,6 +232,21 @@ config SND_SOC_SOF_COMETLAKE_H_SUPPORT > Say Y if you have such a device. > If unsure select "N". > > +config SND_SOC_SOF_COMETLAKE_S > + tristate > + select SND_SOC_SOF_HDA_COMMON > + help > + This option is not user-selectable but automagically handled by > + 'select' statements at a higher level > + > +config SND_SOC_SOF_COMETLAKE_S_SUPPORT > + bool "SOF support for CometLake-S" > + help > + This adds support for Sound Open Firmware for Intel(R) platforms > + using the Cometlake-H processors. > + Say Y if you have such a device. > + If unsure select "N". > + > config SND_SOC_SOF_TIGERLAKE_SUPPORT > bool "SOF support for Tigerlake" > help > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > index bbeffd932de7..0b39ea6117cf 100644 > --- a/sound/soc/sof/sof-pci-dev.c > +++ b/sound/soc/sof/sof-pci-dev.c > @@ -417,6 +417,10 @@ static const struct pci_device_id sof_pci_ids[] = { > { PCI_DEVICE(0x8086, 0x06c8), > .driver_data = (unsigned long)&cml_desc}, > #endif > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_S) > + { PCI_DEVICE(0x8086, 0xa3f0), > + .driver_data = (unsigned long)&cml_desc}, > +#endif > #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) > { PCI_DEVICE(0x8086, 0xa0c8), > .driver_data = (unsigned long)&tgl_desc}, I guess the change in ifdef for cml_desc definition is still missing. But, I wonder whether it'd be simpler to have Kconfigs only per sof_dev_desc? That is, have CONFIG_SND_SOC_SOF_COMETLAKE, and all CML model PCI entries are enabled by that as long as they use the same cml_desc definition. Also, can we reduce even the ifdef around sof_dev_desc definitions by __maybe_unused atttribute? thanks, Takashi _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel