Unverified Commit 004bd416 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: soc-acpi: expand description of _ADR-based devices 



For SoundWire, we need to know if endpoints needs to be 'aggregated'
(MIPI parlance, meaning logically grouped), e.g. when two speaker
amplifiers need to be handled as a single logical output.

We don't necessarily have the information at the firmware (BIOS)
level, so add a notion of endpoints and specify if a device/endpoint
is part of a group, with a position.

This may be expanded in future solutions, for now only provide a group
and position information.

Since we modify the header file, change all existing upstream tables
as well to avoid breaking compilation/bisect.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200325215027.28716-2-pierre-louis.bossart@linux.intel.com


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

include/sound/soc-acpi.h

+33 −6
Original line number Diff line number Diff line
@@ -75,18 +75,45 @@ struct snd_soc_acpi_mach_params { 
};



/**

 * snd_soc_acpi_link_adr: ACPI-based list of _ADR, with a variable

 * number of devices per link

 *

 * snd_soc_acpi_endpoint - endpoint descriptor

 * @num: endpoint number (mandatory, unique per device)

 * @aggregated: 0 (independent) or 1 (logically grouped)

 * @group_position: zero-based order (only when @aggregated is 1)

 * @group_id: platform-unique group identifier (only when @aggregrated is 1)

 */

struct snd_soc_acpi_endpoint {

	u8 num;

	u8 aggregated;

	u8 group_position;

	u8 group_id;

};



/**

 * snd_soc_acpi_adr_device - descriptor for _ADR-enumerated device

 * @adr: 64 bit ACPI _ADR value

 * @num_endpoints: number of endpoints for this device

 * @endpoints: array of endpoints

 */

struct snd_soc_acpi_adr_device {

	const u64 adr;

	const u8 num_endpoints;

	const struct snd_soc_acpi_endpoint *endpoints;

};



/**

 * snd_soc_acpi_link_adr - ACPI-based list of _ADR enumerated devices

 * @mask: one bit set indicates the link this list applies to

 * @num_adr: ARRAY_SIZE of adr

 * @adr: array of _ADR (represented as u64).

 * @num_adr: ARRAY_SIZE of devices

 * @adr_d: array of devices

 *

 * The number of devices per link can be more than 1, e.g. in SoundWire

 * multi-drop configurations.

 */



struct snd_soc_acpi_link_adr {

	const u32 mask;

	const u32 num_adr;

	const u64 *adr;

	const struct snd_soc_acpi_adr_device *adr_d;

};



/**

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

+70 −17
Original line number Diff line number Diff line
@@ -59,42 +59,95 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { 
};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cml_machines);



static const u64 rt711_0_adr[] = {

	0x000010025D071100

static const struct snd_soc_acpi_endpoint single_endpoint = {

	.num = 0,

	.aggregated = 0,

	.group_position = 0,

	.group_id = 0,

};



static const u64 rt1308_1_adr[] = {

	0x000110025D130800

static const struct snd_soc_acpi_endpoint spk_l_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 0,

	.group_id = 1,

};



static const u64 rt1308_2_adr[] = {

	0x000210025D130800

static const struct snd_soc_acpi_endpoint spk_r_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const u64 rt715_3_adr[] = {

	0x000310025D071500

static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {

	{

		.adr = 0x000010025D071100,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {

	{

		.adr = 0x000110025D130800,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_2_adr[] = {

	{

		.adr = 0x000210025D130800,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {

	{

		.adr = 0x000110025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {

	{

		.adr = 0x000210025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {

	{

		.adr = 0x000310025D071500,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_link_adr cml_3_in_1_default[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1308_1_adr),

		.adr = rt1308_1_adr,

		.num_adr = ARRAY_SIZE(rt1308_1_group1_adr),

		.adr_d = rt1308_1_group1_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1308_2_adr),

		.adr = rt1308_2_adr,

		.num_adr = ARRAY_SIZE(rt1308_2_group1_adr),

		.adr_d = rt1308_2_group1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt715_3_adr),

		.adr = rt715_3_adr,

		.adr_d = rt715_3_adr,

	},

	{}

};
@@ -103,17 +156,17 @@ static const struct snd_soc_acpi_link_adr cml_3_in_1_mono_amp[] = { 
	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1308_1_adr),

		.adr = rt1308_1_adr,

		.adr_d = rt1308_1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt715_3_adr),

		.adr = rt715_3_adr,

		.adr_d = rt715_3_adr,

	},

	{}

};

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

+77 −20
Original line number Diff line number Diff line
@@ -33,55 +33,112 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { 
};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines);



static const u64 rt700_0_adr[] = {

	0x000010025D070000

static const struct snd_soc_acpi_endpoint single_endpoint = {

	.num = 0,

	.aggregated = 0,

	.group_position = 0,

	.group_id = 0,

};



static const struct snd_soc_acpi_endpoint spk_l_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 0,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_r_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const struct snd_soc_acpi_adr_device rt700_0_adr[] = {

	{

		.adr = 0x000010025D070000,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_link_adr icl_rvp[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt700_0_adr),

		.adr = rt700_0_adr,

		.adr_d = rt700_0_adr,

	},

	{}

};



static const u64 rt711_0_adr[] = {

	0x000010025D071100

static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {

	{

		.adr = 0x000010025D071100,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {

	{

		.adr = 0x000110025D130800,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const u64 rt1308_1_adr[] = {

	0x000110025D130800

static const struct snd_soc_acpi_adr_device rt1308_2_adr[] = {

	{

		.adr = 0x000210025D130800,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const u64 rt1308_2_adr[] = {

	0x000210025D130800

static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {

	{

		.adr = 0x000110025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

	}

};



static const u64 rt715_3_adr[] = {

	0x000310025D071500

static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {

	{

		.adr = 0x000210025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {

	{

		.adr = 0x000310025D071500,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_link_adr icl_3_in_1_default[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1308_1_adr),

		.adr = rt1308_1_adr,

		.num_adr = ARRAY_SIZE(rt1308_1_group1_adr),

		.adr_d = rt1308_1_group1_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1308_2_adr),

		.adr = rt1308_2_adr,

		.num_adr = ARRAY_SIZE(rt1308_2_group1_adr),

		.adr_d = rt1308_2_group1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt715_3_adr),

		.adr = rt715_3_adr,

		.adr_d = rt715_3_adr,

	},

	{}

};
@@ -90,17 +147,17 @@ static const struct snd_soc_acpi_link_adr icl_3_in_1_mono_amp[] = { 
	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1308_1_adr),

		.adr = rt1308_1_adr,

		.adr_d = rt1308_1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt715_3_adr),

		.adr = rt715_3_adr,

		.adr_d = rt715_3_adr,

	},

	{}

};

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

+41 −8
Original line number Diff line number Diff line
@@ -14,20 +14,53 @@ static struct snd_soc_acpi_codecs tgl_codecs = { 
	.codecs = {"MX98357A"}

};



static const u64 rt711_0_adr[] = {

	0x000010025D071100

static const struct snd_soc_acpi_endpoint single_endpoint = {

	.num = 0,

	.aggregated = 0,

	.group_position = 0,

	.group_id = 0,

};



static const u64 rt1308_1_adr[] = {

	0x000120025D130800,

	0x000122025D130800

static const struct snd_soc_acpi_endpoint spk_l_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 0,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_r_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {

	{

		.adr = 0x000010025D071100,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

	}

};



static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {

	{

		.adr = 0x000120025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

	},

	{

		.adr = 0x000122025D130800,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

	}

};



static const struct snd_soc_acpi_link_adr tgl_i2s_rt1308[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{}

};
@@ -36,12 +69,12 @@ static const struct snd_soc_acpi_link_adr tgl_rvp[] = { 
	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_0_adr),

		.adr = rt711_0_adr,

		.adr_d = rt711_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1308_1_adr),

		.adr = rt1308_1_adr,

		.adr_d = rt1308_1_adr,

	},

	{}

};