Unverified Commit 98fcb50a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: soc-acpi-intel-tgl/mtl-match: declare adr 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

The adr is u64.
parents 6b24e67b 20efccc5

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

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static const struct snd_soc_acpi_adr_device rt1316_3_single_adr[] = { 


static const struct snd_soc_acpi_adr_device rt1318_1_single_adr[] = {

	{

		.adr = 0x000130025D131801,

		.adr = 0x000130025D131801ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt1318-1"

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

+8 −8
Original line number Diff line number Diff line
@@ -658,25 +658,25 @@ static const struct snd_soc_acpi_endpoint cs35l56_7_fb_endpoints[] = { 


static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_1_4_fb_adr[] = {

	{

		.adr = 0x00003301fa355601,

		.adr = 0x00003301fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),

		.endpoints = cs35l56_l_fb_endpoints,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00003201fa355601,

		.adr = 0x00003201fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),

		.endpoints = cs35l56_2_fb_endpoints,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00003101fa355601,

		.adr = 0x00003101fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),

		.endpoints = cs35l56_4_fb_endpoints,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00003001fa355601,

		.adr = 0x00003001fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_6_fb_endpoints),

		.endpoints = cs35l56_6_fb_endpoints,

		.name_prefix = "AMP4"
@@ -685,25 +685,25 @@ static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_1_4_fb_adr[] = { 


static const struct snd_soc_acpi_adr_device cs35l56_sdw_eight_5_8_fb_adr[] = {

	{

		.adr = 0x00013701fa355601,

		.adr = 0x00013701fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),

		.endpoints = cs35l56_r_fb_endpoints,

		.name_prefix = "AMP8"

	},

	{

		.adr = 0x00013601fa355601,

		.adr = 0x00013601fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),

		.endpoints = cs35l56_3_fb_endpoints,

		.name_prefix = "AMP7"

	},

	{

		.adr = 0x00013501fa355601,

		.adr = 0x00013501fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),

		.endpoints = cs35l56_5_fb_endpoints,

		.name_prefix = "AMP6"

	},

	{

		.adr = 0x00013401fa355601,

		.adr = 0x00013401fa355601ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_7_fb_endpoints),

		.endpoints = cs35l56_7_fb_endpoints,

		.name_prefix = "AMP5"