Unverified Commit 69a785da authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

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: default avatarRander Wang <rander.wang@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-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: default avatarMark Brown <broonie@kernel.org>
parent fcea8b02

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

+5 −5
Original line number Diff line number Diff line
@@ -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,

	}

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

+5 −5
Original line number Diff line number Diff line
@@ -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,

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE