ASoC: Intel: modify SoundWire version id in acpi match table

The SoundWire version id of the existing RT1308, RT711, and RT715
codecs should be 2 (index for SoundWire 1.1), it was mistakenly set as
1 which pointed to the wrong version (SoundWire 1.0).

This off-by-one error had no functional impact so far since the
version number was not used, however in future patches this version
will be required.

Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200821195603.215535-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

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 dee1f0fa998b5bbd902dff4d03d618293c12beb1..51535cd60a0a18aaf55629dc8bd02bdce752178e 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -112,7 +112,7 @@ static const struct snd_soc_acpi_link_adr cml_rvp[] = {
 
 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
        {
-               .adr = 0x000010025D071100,
+               .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }
@@ -120,7 +120,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
        {
-               .adr = 0x000110025D130800,
+               .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }
@@ -128,7 +128,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
        {
-               .adr = 0x000110025D130800,
+               .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
        }
@@ -136,7 +136,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
        {
-               .adr = 0x000210025D130800,
+               .adr = 0x000220025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
        }
@@ -144,7 +144,7 @@ static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
        {
-               .adr = 0x000310025D071500,
+               .adr = 0x000320025D071500,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }

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 6927bbbc66fcc6fadb55d91c608a55ca75ba8e83..ebe13197410f17992e3c71cf2d02322dd8b82944 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -73,7 +73,7 @@ static const struct snd_soc_acpi_link_adr icl_rvp[] = {
 
 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
        {
-               .adr = 0x000010025D071100,
+               .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }
@@ -81,7 +81,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
        {
-               .adr = 0x000110025D130800,
+               .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }
@@ -89,7 +89,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
        {
-               .adr = 0x000110025D130800,
+               .adr = 0x000120025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_l_endpoint,
        }
@@ -97,7 +97,7 @@ static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
        {
-               .adr = 0x000210025D130800,
+               .adr = 0x000220025D130800,
                .num_endpoints = 1,
                .endpoints = &spk_r_endpoint,
        }
@@ -105,7 +105,7 @@ static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
 
 static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
        {
-               .adr = 0x000310025D071500,
+               .adr = 0x000320025D071500,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }

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 2ffa608d987dd0b3c06d7695f00b2d03ceef2c72..472f58ddda1f8ca041880fe5ab90b687c03561b5 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -37,7 +37,7 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
 
 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
        {
-               .adr = 0x000010025D071100,
+               .adr = 0x000020025D071100,
                .num_endpoints = 1,
                .endpoints = &single_endpoint,
        }