Commit c491b044 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.11-rc6' of... 

Merge tag 'asoc-fix-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.11

A larger set of fixes than I'd like at this point, but mainly due to
people working on fixing module autoloading by adding missing exports of
ID tables rather than anything particularly concerning.  There are some
other runtime fixes and quirks, and a tweak to the ABI definition for
SOF which ensures that a struct layout doesn't vary depending on the
architecture of the host.
parents a83e4c97 77212f30

include/sound/sof/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ enum sof_comp_type { 
struct sof_ipc_comp {

	struct sof_ipc_cmd_hdr hdr;

	uint32_t id;

	enum sof_comp_type type;

	uint32_t type;

	uint32_t pipeline_id;

	uint32_t core;

include/uapi/sound/sof/abi.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
/* SOF ABI version major, minor and patch numbers */

#define SOF_ABI_MAJOR 3

#define SOF_ABI_MINOR 23

#define SOF_ABI_PATCH 0

#define SOF_ABI_PATCH 1



/* SOF ABI version number. Format within 32bit word is MMmmmppp */

#define SOF_ABI_MAJOR_SHIFT	24

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -353,6 +353,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 C7VF"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 17 D7VEK"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/chv3-codec.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static const struct of_device_id chv3_codec_of_match[] = { 
	{ .compatible = "google,chv3-codec", },

	{ }

};

MODULE_DEVICE_TABLE(of, chv3_codec_of_match);



static struct platform_driver chv3_codec_platform_driver = {

	.driver = {

sound/soc/codecs/lpass-va-macro.c

+10 −1
Original line number Diff line number Diff line
@@ -228,11 +228,13 @@ struct va_macro { 
struct va_macro_data {

	bool has_swr_master;

	bool has_npl_clk;

	int version;

};



static const struct va_macro_data sm8250_va_data = {

	.has_swr_master = false,

	.has_npl_clk = false,

	.version = LPASS_CODEC_VERSION_1_0,

};



static const struct va_macro_data sm8450_va_data = {
@@ -1587,6 +1589,13 @@ static int va_macro_probe(struct platform_device *pdev) 
			goto err_npl;

	}



	/**

	 * old version of codecs do not have a reliable way to determine the

	 * version from registers, get them from soc specific data

	 */

	if (data->version)

		lpass_macro_set_codec_version(data->version);

	else /* read version from register */

		va_macro_set_lpass_codec_version(va);



	if (va->has_swr_master) {