Skip to content

Commit 98fcb50

Browse files
committed
ASoC: Intel: soc-acpi-intel-tgl/mtl-match: declare adr
Merge series from Bard Liao <[email protected]>: The adr is u64.
2 parents 6b24e67 + 20efccc commit 98fcb50

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static const struct snd_soc_acpi_adr_device rt1316_3_single_adr[] = {
330330

331331
static const struct snd_soc_acpi_adr_device rt1318_1_single_adr[] = {
332332
{
333-
.adr = 0x000130025D131801,
333+
.adr = 0x000130025D131801ull,
334334
.num_endpoints = 1,
335335
.endpoints = &single_endpoint,
336336
.name_prefix = "rt1318-1"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -658,25 +658,25 @@ static const struct snd_soc_acpi_endpoint cs35l56_7_fb_endpoints[] = {
658658

659659
static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_1_4_fb_adr[] = {
660660
{
661-
.adr = 0x00003301fa355601,
661+
.adr = 0x00003301fa355601ull,
662662
.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
663663
.endpoints = cs35l56_l_fb_endpoints,
664664
.name_prefix = "AMP1"
665665
},
666666
{
667-
.adr = 0x00003201fa355601,
667+
.adr = 0x00003201fa355601ull,
668668
.num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),
669669
.endpoints = cs35l56_2_fb_endpoints,
670670
.name_prefix = "AMP2"
671671
},
672672
{
673-
.adr = 0x00003101fa355601,
673+
.adr = 0x00003101fa355601ull,
674674
.num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),
675675
.endpoints = cs35l56_4_fb_endpoints,
676676
.name_prefix = "AMP3"
677677
},
678678
{
679-
.adr = 0x00003001fa355601,
679+
.adr = 0x00003001fa355601ull,
680680
.num_endpoints = ARRAY_SIZE(cs35l56_6_fb_endpoints),
681681
.endpoints = cs35l56_6_fb_endpoints,
682682
.name_prefix = "AMP4"
@@ -685,25 +685,25 @@ static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_1_4_fb_adr[] = {
685685

686686
static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_5_8_fb_adr[] = {
687687
{
688-
.adr = 0x00013701fa355601,
688+
.adr = 0x00013701fa355601ull,
689689
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
690690
.endpoints = cs35l56_r_fb_endpoints,
691691
.name_prefix = "AMP8"
692692
},
693693
{
694-
.adr = 0x00013601fa355601,
694+
.adr = 0x00013601fa355601ull,
695695
.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
696696
.endpoints = cs35l56_3_fb_endpoints,
697697
.name_prefix = "AMP7"
698698
},
699699
{
700-
.adr = 0x00013501fa355601,
700+
.adr = 0x00013501fa355601ull,
701701
.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
702702
.endpoints = cs35l56_5_fb_endpoints,
703703
.name_prefix = "AMP6"
704704
},
705705
{
706-
.adr = 0x00013401fa355601,
706+
.adr = 0x00013401fa355601ull,
707707
.num_endpoints = ARRAY_SIZE(cs35l56_7_fb_endpoints),
708708
.endpoints = cs35l56_7_fb_endpoints,
709709
.name_prefix = "AMP5"

0 commit comments

Comments
 (0)