Unverified Commit 3de9cf47 authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: amd: acp: Sort Cirrus Logic match entries 



In preparation for adding more match entries sort the ones that are
present.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/0a756390dfb7e928246d0f35c611f175e1311e55.1769534442.git.simont@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5eb3fc48

sound/soc/amd/acp/amd-acp70-acpi-match.c

+31 −31
Original line number Diff line number Diff line
@@ -187,80 +187,80 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = { 
	},

};



static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {

	{

		.adr = 0x00003001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = {

	{

		.adr = 0x00013001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	},

static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {

	{

		.adr = 0x00013001FA355601ull,

		.adr = 0x00013301FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00013101FA355601ull,

		.adr = 0x00013201FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00013201FA355601ull,

		.adr = 0x00013101FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00013301FA355601ull,

		.adr = 0x00013001FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP4"

	},

};



static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {

static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {

	{

		.adr = 0x00013301FA355601ull,

		.adr = 0x00003001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = {

	{

		.adr = 0x00013001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	},

	{

		.adr = 0x00013001FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00013201FA355601ull,

		.adr = 0x00013101FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00013101FA355601ull,

		.adr = 0x00013201FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00013001FA355601ull,

		.adr = 0x00013301FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP4"

	},

};



static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {

static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),

		.adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,

		.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),

		.adr_d = cs35l56x4_l1u3210_adr,

	},

	{}

};
@@ -279,11 +279,11 @@ static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u3210[] 
	{}

};



static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = {

static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),

		.adr_d = cs35l56x4_l1u3210_adr,

		.num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),

		.adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,

	},

	{}

};