Unverified Commit 2694cda7 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: soc-acpi: cnl: add table for SoundWire mockup devices 



Add support for two configurations with SoundWire mockup devices that
emulate the two CometLake configurations with one and two amps. This
patch helps test the SOF firmware on an UpExtreme board without any
hardware connected, e.g. by doing a loopback of the playback stream on
capture streams.

The mapping of the partIDs is as follows:

0xAAAA: generic full-duplex codec (not currently used)
0xAA55: headset codec (mock-up of RT711/RT5682) - full-duplex
0x55AA: amplifier (mock-up of RT1308/RT1316/Maxim 98373) - playback
with IV sense feedback
0x5555: mic codec (mock-up of RT715) - capture-only

The tables are added in a separate file to allow for mockup codecs to be
added on other platforms, but the mapping to specific topologies
remains platform-specific.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210714032209.11284-3-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 81d3d3d0

sound/soc/intel/common/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m 
	soc-acpi-intel-cml-match.o soc-acpi-intel-icl-match.o \

	soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \

	soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \

	soc-acpi-intel-hda-match.o

	soc-acpi-intel-hda-match.o \

	soc-acpi-intel-sdw-mockup-match.o



obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o

obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o

sound/soc/intel/common/soc-acpi-intel-cnl-match.c

+15 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "../skylake/skl.h"

#include "soc-acpi-intel-sdw-mockup-match.h"



static struct skl_machine_pdata cnl_pdata = {

	.use_tplg_pcm = true,
@@ -60,6 +61,20 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[] = { 
		.sof_fw_filename = "sof-cnl.ri",

		.sof_tplg_filename = "sof-cnl-rt5682-sdw2.tplg"

	},

	{

		.link_mask = GENMASK(3, 0),

		.links = sdw_mockup_headset_2amps_mic,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-cnl.ri",

		.sof_tplg_filename = "sof-cml-rt711-rt1308-rt715.tplg",

	},

	{

		.link_mask = BIT(0) | BIT(1) | BIT(3),

		.links = sdw_mockup_headset_1amp_mic,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-cnl.ri",

		.sof_tplg_filename = "sof-cml-rt711-rt1308-mono-rt715.tplg",

	},

	{}

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_sdw_machines);

sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c

0 → 100644
+166 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// soc-acpi-intel-sdw-mockup-match.c - tables and support for SoundWire

// mockup device ACPI enumeration.

//

// Copyright (c) 2021, Intel Corporation.

//



#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "soc-acpi-intel-sdw-mockup-match.h"



static const struct snd_soc_acpi_endpoint sdw_mockup_single_endpoint = {

	.num = 0,

	.aggregated = 0,

	.group_position = 0,

	.group_id = 0,

};



static const struct snd_soc_acpi_endpoint sdw_mockup_l_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 0,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint sdw_mockup_r_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const struct snd_soc_acpi_adr_device sdw_mockup_headset_0_adr[] = {

	{

		.adr = 0x0000000105AA5500ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_headset0"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_headset_1_adr[] = {

	{

		.adr = 0x0001000105AA5500ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_headset1"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_amp_1_adr[] = {

	{

		.adr = 0x000100010555AA00ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_amp1"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_amp_2_adr[] = {

	{

		.adr = 0x000200010555AA00ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_amp2"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_mic_0_adr[] = {

	{

		.adr = 0x0000000105555500ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_mic0"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_mic_3_adr[] = {

	{

		.adr = 0x0003000105555500ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_single_endpoint,

		.name_prefix = "sdw_mockup_mic3"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_amp_1_group1_adr[] = {

	{

		.adr = 0x000100010555AA00ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_l_endpoint,

		.name_prefix = "sdw_mockup_amp1_l"

	}

};



static const struct snd_soc_acpi_adr_device sdw_mockup_amp_2_group1_adr[] = {

	{

		.adr = 0x000200010555AA00ull,

		.num_endpoints = 1,

		.endpoints = &sdw_mockup_r_endpoint,

		.name_prefix = "sdw_mockup_amp2_r"

	}

};



const struct snd_soc_acpi_link_adr sdw_mockup_headset_1amp_mic[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(sdw_mockup_headset_0_adr),

		.adr_d = sdw_mockup_headset_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(sdw_mockup_amp_1_adr),

		.adr_d = sdw_mockup_amp_1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(sdw_mockup_mic_3_adr),

		.adr_d = sdw_mockup_mic_3_adr,

	},

	{}

};



const struct snd_soc_acpi_link_adr sdw_mockup_headset_2amps_mic[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(sdw_mockup_headset_0_adr),

		.adr_d = sdw_mockup_headset_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(sdw_mockup_amp_1_group1_adr),

		.adr_d = sdw_mockup_amp_1_group1_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(sdw_mockup_amp_2_group1_adr),

		.adr_d = sdw_mockup_amp_2_group1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(sdw_mockup_mic_3_adr),

		.adr_d = sdw_mockup_mic_3_adr,

	},

	{}

};



const struct snd_soc_acpi_link_adr sdw_mockup_mic_headset_1amp[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(sdw_mockup_headset_1_adr),

		.adr_d = sdw_mockup_headset_1_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(sdw_mockup_amp_2_adr),

		.adr_d = sdw_mockup_amp_2_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(sdw_mockup_mic_0_adr),

		.adr_d = sdw_mockup_mic_0_adr,

	},

	{}

};

sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * soc-acpi-intel-sdw-mockup-match.h - tables and support for SoundWire

 * mockup device ACPI enumeration.

 *

 * Copyright (c) 2021, Intel Corporation.

 *

 */



#ifndef _SND_SOC_ACPI_INTEL_SDW_MOCKUP_MATCH

#define _SND_SOC_ACPI_INTEL_SDW_MOCKUP_MATCH



extern const struct snd_soc_acpi_link_adr sdw_mockup_headset_1amp_mic[];

extern const struct snd_soc_acpi_link_adr sdw_mockup_headset_2amps_mic[];

extern const struct snd_soc_acpi_link_adr sdw_mockup_mic_headset_1amp[];



#endif