summaryrefslogtreecommitdiff
path: root/sound/soc/intel/common/soc-acpi-intel-icl-match.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-10-09 17:42:31 +0300
committerMark Brown <broonie@kernel.org>2020-10-09 17:42:31 +0300
commitc890e30b069a2792a5a34e8510a7a437dd6f5b3d (patch)
treef7fc7cb5e6fddbe4cae599b41bb39ebc349b94cd /sound/soc/intel/common/soc-acpi-intel-icl-match.c
parent7ffe09eebf732f9c95623613fb706dada858c07d (diff)
parent86f29c7442ac4ba5fe19fc2ada457f76c0080dd6 (diff)
downloadlinux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.tar.xz
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-icl-match.c')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-icl-match.c16
1 files changed, 11 insertions, 5 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 6927bbbc66fc..9a529a785288 100644
--- 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"
}
};
@@ -73,41 +74,46 @@ 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,
+ .name_prefix = "rt711"
}
};
static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
{
- .adr = 0x000110025D130800,
+ .adr = 0x000120025D130800,
.num_endpoints = 1,
.endpoints = &single_endpoint,
+ .name_prefix = "rt1308-1"
}
};
static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
{
- .adr = 0x000110025D130800,
+ .adr = 0x000120025D130800,
.num_endpoints = 1,
.endpoints = &spk_l_endpoint,
+ .name_prefix = "rt1308-1"
}
};
static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
{
- .adr = 0x000210025D130800,
+ .adr = 0x000220025D130800,
.num_endpoints = 1,
.endpoints = &spk_r_endpoint,
+ .name_prefix = "rt1308-2"
}
};
static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
{
- .adr = 0x000310025D071500,
+ .adr = 0x000320025D071500,
.num_endpoints = 1,
.endpoints = &single_endpoint,
+ .name_prefix = "rt715"
}
};