ASoC: Intel: add codec name prefix to ACPI machine description

The current SOF machine driver adds a name prefix for each codec,
mainly to differentiate ALSA controls for left and right amplifiers.

This is a good idea, but the machine driver duplicates some of the
information that already exists in ACPI descriptors, so add those
prefixes there. Follow-up patches will make use of the information
encoded in these tables and remove duplication.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200923080514.3242858-4-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index b77b05c413a399134d91f748b5b185bec9af7ca2..b16a844d16ef90b18a89d3144a2213bdd414aee3 100644 (file)
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -93,11 +93,13 @@ struct snd_soc_acpi_endpoint {
  * @adr: 64 bit ACPI _ADR value
  * @num_endpoints: number of endpoints for this device
  * @endpoints: array of endpoints
+ * @name_prefix: string used for codec controls
  */
 struct snd_soc_acpi_adr_device {
        const u64 adr;
        const u8 num_endpoints;
        const struct snd_soc_acpi_endpoint *endpoints;
+       const char *name_prefix;
 };
 
 /**

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index ec01884ef93d14e03e421c0dc6cb068e2680c9fa..26dde88bb2279c43f6b63983509fd01fde09da8e 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -98,6 +98,7 @@ static const struct snd_soc_acpi_adr_device rt700_1_adr[] = {
                .adr = 0x000110025D070000,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt700"
        }
 };
 
@@ -115,6 +116,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
                .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt711"
        }
 };
 
@@ -123,6 +125,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_single_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -131,6 +134,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -139,6 +143,7 @@ static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
                .adr = 0x000220025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1308-2"
        }
 };
 
@@ -147,6 +152,7 @@ static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
                .adr = 0x000320025D071500,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt715"
        }
 };
 
@@ -155,6 +161,7 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
                .adr = 0x000030025D071101,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt711"
        }
 };
 
@@ -163,6 +170,7 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = {
                .adr = 0x000131025D131601, /* unique ID is set for some reason */
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1316-1"
        }
 };
 
@@ -171,6 +179,7 @@ static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = {
                .adr = 0x000230025D131601,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1316-2"
        }
 };
 
@@ -179,6 +188,7 @@ static const struct snd_soc_acpi_adr_device rt714_3_adr[] = {
                .adr = 0x000330025D071401,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt714"
        }
 };
 

diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
index 7d61e0da808b74ad44064921a4b7d43b4a684aa8..b80f032a8b76dd9cf4148d551d575f7ae006b57f 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
@@ -39,6 +39,7 @@ static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = {
                .adr = 0x000220025D568200,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt5682"
        }
 };
 

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 ebe13197410f17992e3c71cf2d02322dd8b82944..9a529a785288568a15bcc672de8e4cdd4e59b915 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -59,6 +59,7 @@ static const struct snd_soc_acpi_adr_device rt700_0_adr[] = {
                .adr = 0x000010025D070000,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt700"
        }
 };
 
@@ -76,6 +77,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
                .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt711"
        }
 };
 
@@ -84,6 +86,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -92,6 +95,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -100,6 +104,7 @@ static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
                .adr = 0x000220025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1308-2"
        }
 };
 
@@ -108,6 +113,7 @@ static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
                .adr = 0x000320025D071500,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt715"
        }
 };
 

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 6816847bee409c9429e014e133187840a73e2f87..76f4eaf684b0fe2bd9d7bb555760b3a52792f2cd 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -40,6 +40,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
                .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt711"
        }
 };
 
@@ -48,11 +49,13 @@ static const struct snd_soc_acpi_adr_device rt1308_1_dual_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1308-1"
        },
        {
                .adr = 0x000122025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1308-2"
        }
 };
 
@@ -61,6 +64,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_single_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -69,6 +73,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
                .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1308-1"
        }
 };
 
@@ -77,6 +82,7 @@ static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
                .adr = 0x000220025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1308-2"
        }
 };
 
@@ -85,6 +91,7 @@ static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
                .adr = 0x000320025D071500,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt715"
        }
 };
 
@@ -93,11 +100,13 @@ static const struct snd_soc_acpi_adr_device mx8373_1_adr[] = {
                .adr = 0x000123019F837300,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "Right"
        },
        {
                .adr = 0x000127019F837300,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "Left"
        }
 };
 
@@ -106,6 +115,7 @@ static const struct snd_soc_acpi_adr_device rt5682_0_adr[] = {
                .adr = 0x000021025D568200,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt5682"
        }
 };
 
@@ -114,6 +124,7 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
                .adr = 0x000030025D071101,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt711"
        }
 };
 
@@ -122,6 +133,7 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = {
                .adr = 0x000131025D131601, /* unique ID is set for some reason */
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1316-1"
        }
 };
 
@@ -130,6 +142,7 @@ static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = {
                .adr = 0x000230025D131601,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1316-2"
        }
 };
 
@@ -138,6 +151,7 @@ static const struct snd_soc_acpi_adr_device rt714_3_adr[] = {
                .adr = 0x000330025D071401,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
+               .name_prefix = "rt714"
        }
 };