On 3/12/2020 8:33 PM, Pierre-Louis Bossart wrote:
For SoundWire, we need to know if endpoints needs to be 'aggregated' (MIPI parlance, meaning logically grouped), e.g. when two speaker amplifiers need to be handled as a single logical output.
We don't necessarily have the information at the firmware (BIOS) level, so add a notion of endpoints and specify if a device/endpoint is part of a group, with a position.
This may be expanded in future solutions, for now only provide a group and position information.
Since we modify the header file, change all existing upstream tables as well to avoid breaking compilation/bisect.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
include/sound/soc-acpi.h | 39 ++++++-- .../intel/common/soc-acpi-intel-cml-match.c | 87 +++++++++++++---- .../intel/common/soc-acpi-intel-icl-match.c | 97 +++++++++++++++---- .../intel/common/soc-acpi-intel-tgl-match.c | 49 ++++++++-- 4 files changed, 221 insertions(+), 51 deletions(-)
(...)
diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 752733013d54..36e2d09cf58c 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -33,55 +33,112 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines);
-static const u64 rt700_0_adr[] = {
- 0x000010025D070000
+static const struct snd_soc_acpi_endpoint single_endpoint = {
- .num = 0,
- .aggregated = 0,
- .group_position = 0,
- .group_id = 0,
+};
+static const struct snd_soc_acpi_endpoint spk_l_endpoint = {
- .num = 0,
- .aggregated = 1,
- .group_position = 0,
- .group_id = 1,
+};
+static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
- .num = 0,
- .aggregated = 1,
- .group_position = 1,
- .group_id = 1,
+};
+static const struct snd_soc_acpi_adr_device rt700_0_adr[] = {
{
.adr = 0x000010025D070000,.num_endpoints = 1,.endpoints = &single_endpoint,} };
static const struct snd_soc_acpi_link_adr icl_rvp[] = { { .mask = BIT(0), .num_adr = ARRAY_SIZE(rt700_0_adr),
.adr = rt700_0_adr,
.adr_d = rt700_0_adr,-static const u64 rt711_0_adr[] = {
- 0x000010025D071100
+static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
- {
.adr = 0x000010025D071100,.num_endpoints = 1,.endpoints = &single_endpoint,- }
+};
+static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
- {
.adr = 0x000110025D130800,.num_endpoints = 1,.endpoints = &single_endpoint,- } };
-static const u64 rt1308_1_adr[] = {
- 0x000110025D130800
+static const struct snd_soc_acpi_adr_device rt1308_2_adr[] = {
- {
.adr = 0x000210025D130800,.num_endpoints = 1,.endpoints = &single_endpoint,- } };
-static const u64 rt1308_2_adr[] = {
- 0x000210025D130800
+static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
- {
.adr = 0x000110025D130800,.num_endpoints = 1,.endpoints = &spk_l_endpoint,- } };
-static const u64 rt715_3_adr[] = {
- 0x000310025D071500
+static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
- {
.adr = 0x000210025D130800,.num_endpoints = 1,.endpoints = &spk_r_endpoint,- }
+};
+static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
{
.adr = 0x000310025D071500,.num_endpoints = 1,.endpoints = &single_endpoint,} };
static const struct snd_soc_acpi_link_adr icl_3_in_1_default[] = { { .mask = BIT(0), .num_adr = ARRAY_SIZE(rt711_0_adr),
.adr = rt711_0_adr,
.adr_d = rt711_0_adr,
.num_adr = ARRAY_SIZE(rt1308_1_adr),.adr = rt1308_1_adr,
.num_adr = ARRAY_SIZE(rt1308_1_group1_adr),.adr_d = rt1308_1_adr,
Is this right, you use different struct in ARRAY_SIZE and assignment?
}, { .mask = BIT(2),
.num_adr = ARRAY_SIZE(rt1308_2_adr),.adr = rt1308_2_adr,
.num_adr = ARRAY_SIZE(rt1308_2_group1_adr),.adr_d = rt1308_2_adr,
Same here.
}, { .mask = BIT(3), .num_adr = ARRAY_SIZE(rt715_3_adr),
.adr = rt715_3_adr,
.adr_d = rt715_3_adr,@@ -90,17 +147,17 @@ static const struct snd_soc_acpi_link_adr icl_3_in_1_mono_amp[] = { { .mask = BIT(0), .num_adr = ARRAY_SIZE(rt711_0_adr),
.adr = rt711_0_adr,
.adr_d = rt711_0_adr,
.adr = rt1308_1_adr,
.adr_d = rt1308_1_adr,
.adr = rt715_3_adr,
.adr_d = rt715_3_adr,
(...)