2021-05-21 06:23:32

by Richard Fitzgerald

[permalink] [raw]
Subject: [PATCH] ASoC: Intel: boards: Select SND_SOC_HDAC_HDMI for Soundwire machine driver

Add select of SND_SOC_HDAC_HDMI for SND_SOC_INTEL_SOUNDWIRE_SOF_MACH.
Without this the build results in missing references to
hdac_hdmi_jack_port_init and hdac_hdmi_jack_init.

Signed-off-by: Richard Fitzgerald <[email protected]>
---
sound/soc/intel/boards/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index eef5f4ac87c5..6a1639b14b67 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -601,6 +601,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
select SND_SOC_DMIC
select SND_SOC_INTEL_HDA_DSP_COMMON
select SND_SOC_INTEL_SOF_MAXIM_COMMON
+ select SND_SOC_HDAC_HDMI
help
Add support for Intel SoundWire-based platforms connected to
MAX98373, RT700, RT711, RT1308 and RT715
--
2.20.1


2021-05-24 17:42:56

by Pierre-Louis Bossart

[permalink] [raw]
Subject: Re: [PATCH] ASoC: Intel: boards: Select SND_SOC_HDAC_HDMI for Soundwire machine driver



On 5/20/21 11:33 AM, Richard Fitzgerald wrote:
> Add select of SND_SOC_HDAC_HDMI for SND_SOC_INTEL_SOUNDWIRE_SOF_MACH.
> Without this the build results in missing references to
> hdac_hdmi_jack_port_init and hdac_hdmi_jack_init.

Kai, can you comment on this one? There is nothing specific to HDMI in
this driver.

all the machine driver entries are now protected with a
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

but some entries have the select SND_SOC_HDAC_HDMI, others don't.

Something's inconsistent here, it's not limited to SoundWire I am afraid


> Signed-off-by: Richard Fitzgerald <[email protected]>
> ---
> sound/soc/intel/boards/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
> index eef5f4ac87c5..6a1639b14b67 100644
> --- a/sound/soc/intel/boards/Kconfig
> +++ b/sound/soc/intel/boards/Kconfig
> @@ -601,6 +601,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
> select SND_SOC_DMIC
> select SND_SOC_INTEL_HDA_DSP_COMMON
> select SND_SOC_INTEL_SOF_MAXIM_COMMON
> + select SND_SOC_HDAC_HDMI
> help
> Add support for Intel SoundWire-based platforms connected to
> MAX98373, RT700, RT711, RT1308 and RT715
>

2021-05-25 09:35:03

by Kai Vehmanen

[permalink] [raw]
Subject: Re: [PATCH] ASoC: Intel: boards: Select SND_SOC_HDAC_HDMI for Soundwire machine driver

Hi,

On Mon, 24 May 2021, Pierre-Louis Bossart wrote:

> On 5/20/21 11:33 AM, Richard Fitzgerald wrote:
> > Add select of SND_SOC_HDAC_HDMI for SND_SOC_INTEL_SOUNDWIRE_SOF_MACH.
> > Without this the build results in missing references to
> > hdac_hdmi_jack_port_init and hdac_hdmi_jack_init.
> Kai, can you comment on this one? There is nothing specific to HDMI in this
> driver.

usage of hdac-hdmi is removed in newer mach drivers (like
sof_da7219_max98373, sof-pcm512 and ehl_rt5660 -> and there's no select
for SND_SOC_HDAC_HDMI for these). For older ones, we've kept hdac-hdmi in
to keep compatibility.

For sof_sdw, there are still calls to hdac_hdmi_jack_init() and friends
in sof_sdw_hdmi.c, so this is a real problem.

I'd say a better fix is that we remove the hdac-hdmi support from sof_sdw.
I can do a patch for that.

> Something's inconsistent here, it's not limited to SoundWire I am afraid

I checked all the related mach drivers and the Kconfig definitions are
correct for others. So select is done to HDAC_HDMI whenever the mach
driver uses hdac_hdmi_jack_*().

Br, Kai

2021-05-25 10:32:25

by Richard Fitzgerald

[permalink] [raw]
Subject: Re: [PATCH] ASoC: Intel: boards: Select SND_SOC_HDAC_HDMI for Soundwire machine driver



On 25/05/2021 10:28, Kai Vehmanen wrote:
> Hi,
>
> On Mon, 24 May 2021, Pierre-Louis Bossart wrote:
>
>> On 5/20/21 11:33 AM, Richard Fitzgerald wrote:
>>> Add select of SND_SOC_HDAC_HDMI for SND_SOC_INTEL_SOUNDWIRE_SOF_MACH.
>>> Without this the build results in missing references to
>>> hdac_hdmi_jack_port_init and hdac_hdmi_jack_init.
>> Kai, can you comment on this one? There is nothing specific to HDMI in this
>> driver.
>
> usage of hdac-hdmi is removed in newer mach drivers (like
> sof_da7219_max98373, sof-pcm512 and ehl_rt5660 -> and there's no select
> for SND_SOC_HDAC_HDMI for these). For older ones, we've kept hdac-hdmi in
> to keep compatibility.
>
> For sof_sdw, there are still calls to hdac_hdmi_jack_init() and friends
> in sof_sdw_hdmi.c, so this is a real problem.
>
> I'd say a better fix is that we remove the hdac-hdmi support from sof_sdw.
> I can do a patch for that.
>

Ok with me. I'm not using the hdmi.

>> Something's inconsistent here, it's not limited to SoundWire I am afraid
>
> I checked all the related mach drivers and the Kconfig definitions are
> correct for others. So select is done to HDAC_HDMI whenever the mach
> driver uses hdac_hdmi_jack_*().
>
> Br, Kai
>