[PATCH 0/2] ASoC: Intel: cht_bsw_nau8824: 2 fixes for usage with sof-audio-acpi

[PATCH 0/2] ASoC: Intel: cht_bsw_nau8824: 2 fixes for usage with sof-audio-acpi

[Hans de Goede]

Hi All,

Here are 2 simple fixes which are necessary to make the
cht_bsw_nau8824 machine driver work together with the
sof-audio-acpi driver.

Note that atm the sof topology files are missing a .tplg
file for this setup. Simply copying over the standard
sof-byte-codec.tplg file does the trick, but then some
mixer setting changes are necessary to fix the right
speaker/headphones channel not working; and those mixer
settings break the right channel when used with the
sst-acpi driver.

I've been trying to fix this at the tplg level so that
we do not need to change the mixer settings, but no luck
sofar. I'll post a RFC with the topology changes which
I have and we can discuss this further there.

These 2 simple fixes are necessary to make the sof-audio-acpi
driver work regardless of the topology issue.

Regards,

Hans

[PATCH 1/2] ASoC: Intel: cht_bsw_nau8824: Drop compress-cpu-dai bits

[Hans de Goede]

When using the snd-soc-sst-acpi driver then the compress-cpu-dai bits are
not used, the cht_bsw_nau8824 machine-driver is the only BYT/CHT driver
defining them.

When using the snd-sof-acpi driver then the presence of the
compress-cpu-dai bits breaks things because the sof topology file for
by/cht devices does not contain routing info for them.

Drop the compress-cpu-dai bits, fixing the snd-sof-acpi driver not
working on devices using the cht_bsw_nau8824 machine-driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/intel/boards/cht_bsw_nau8824.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index 8131af1730f7..ac78173d01ec 100644
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -176,9 +176,6 @@ SND_SOC_DAILINK_DEF(media,
 SND_SOC_DAILINK_DEF(deepbuffer,
 	DAILINK_COMP_ARRAY(COMP_CPU("deepbuffer-cpu-dai")));
 
-SND_SOC_DAILINK_DEF(compress,
-	DAILINK_COMP_ARRAY(COMP_CPU("compress-cpu-dai")));
-
 SND_SOC_DAILINK_DEF(ssp2_port,
 	DAILINK_COMP_ARRAY(COMP_CPU("ssp2-port")));
 SND_SOC_DAILINK_DEF(ssp2_codec,
@@ -209,11 +206,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
 		.ops = &cht_aif1_ops,
 		SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
 	},
-	[MERR_DPCM_COMPR] = {
-		.name = "Compressed Port",
-		.stream_name = "Compress",
-		SND_SOC_DAILINK_REG(compress, dummy, platform),
-	},
 	/* Back End DAI links */
 	{
 		/* SSP2 - Codec */
-- 
2.28.0

[PATCH 2/2] ASoC: Intel: cht_bsw_nau8824: Change SSP2-Codec DAI id to 0

[Hans de Goede]

The snd-soc-sst-acpi driver does not care about the id specified for
the SSP2-Codec DAI, but it does matter for the snd-sof-acpi driver;
and when it is not 0 then the snd-sof-acpi driver does not work.

Set the SSP2-Codec DAI id to 0, fixing the snd-sof-acpi driver not
working on devices using the cht_bsw_nau8824 machine-driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index ac78173d01ec..fd5e25ca05f7 100644
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -210,7 +210,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
 	{
 		/* SSP2 - Codec */
 		.name = "SSP2-Codec",
-		.id = 1,
+		.id = 0,
 		.no_pcm = 1,
 		.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF
 			| SND_SOC_DAIFMT_CBS_CFS,
-- 
2.28.0

Re: [PATCH 0/2] ASoC: Intel: cht_bsw_nau8824: 2 fixes for usage with sof-audio-acpi

[Pierre-Louis Bossart]

On 12/6/20 6:24 AM, Hans de Goede wrote:
> Hi All,
> 
> Here are 2 simple fixes which are necessary to make the
> cht_bsw_nau8824 machine driver work together with the
> sof-audio-acpi driver.
> 
> Note that atm the sof topology files are missing a .tplg
> file for this setup. Simply copying over the standard
> sof-byte-codec.tplg file does the trick, but then some
> mixer setting changes are necessary to fix the right
> speaker/headphones channel not working; and those mixer
> settings break the right channel when used with the
> sst-acpi driver.
> 
> I've been trying to fix this at the tplg level so that
> we do not need to change the mixer settings, but no luck
> sofar. I'll post a RFC with the topology changes which
> I have and we can discuss this further there.
> 
> These 2 simple fixes are necessary to make the sof-audio-acpi
> driver work regardless of the topology issue.

Thanks for your work Hans, much appreciated. Both changes are valid and 
were missed.

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

Re: [PATCH 0/2] ASoC: Intel: cht_bsw_nau8824: 2 fixes for usage with sof-audio-acpi

[Mark Brown]

On Sun, 6 Dec 2020 13:24:34 +0100, Hans de Goede wrote:
> Here are 2 simple fixes which are necessary to make the
> cht_bsw_nau8824 machine driver work together with the
> sof-audio-acpi driver.
> 
> Note that atm the sof topology files are missing a .tplg
> file for this setup. Simply copying over the standard
> sof-byte-codec.tplg file does the trick, but then some
> mixer setting changes are necessary to fix the right
> speaker/headphones channel not working; and those mixer
> settings break the right channel when used with the
> sst-acpi driver.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: Intel: cht_bsw_nau8824: Drop compress-cpu-dai bits
      commit: e60ffc48fac4b6ba8f3ec500bd166909f3db03c3
[2/2] ASoC: Intel: cht_bsw_nau8824: Change SSP2-Codec DAI id to 0
      commit: 748e72e869718db8d735d773040bce95158c98c6

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark