Re: [alsa-devel] [PATCH] ASoC: SOF: Intel: add PCI ID for CometLake-S

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 pierre-louis.bossart@linux.intel.com

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