[Sound-open-firmware] [PATCH -next] ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV

[Pierre-Louis Bossart]

On 3/23/22 04:25, Zheng Bin wrote:
> If SND_SOC_SOF_PCI_DEV is n, bulding fails:
> 
> sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to `sof_pci_probe'
> sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to `sof_pci_remove'
> sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to `sof_pci_shutdown'
> sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to `sof_pci_pm'
> 
> Make SND_SOC_SOF_MERRIFIELD select SND_SOC_SOF_PCI_DEV to fix this.
> 
> Fixes: 8d4ba1be3d22 ("ASoC: SOF: pci: split PCI into different drivers")
> Reported-by: Hulk Robot <hulkci at huawei.com>
> Signed-off-by: Zheng Bin <zhengbin13 at huawei.com>

Indeed that's a miss, thanks for the patch. We select 
SND_SOC_SOF_PCI_DEV for all HDaudio-based PCI devices but forgot 
Merrifield which is PCI-based but not HDaudio-based.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>

> ---
>   sound/soc/sof/intel/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
> index b53f216d4ecc..172419392b33 100644
> --- a/sound/soc/sof/intel/Kconfig
> +++ b/sound/soc/sof/intel/Kconfig
> @@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI
>   config SND_SOC_SOF_MERRIFIELD
>   	tristate "SOF support for Tangier/Merrifield"
>   	default SND_SOC_SOF_PCI
> +	select SND_SOC_SOF_PCI_DEV
>   	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
>   	help
>   	  This adds support for Sound Open Firmware for Intel(R) platforms
> --
> 2.31.1
>