Unverified Commit b6a5f4f0 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Platform updates for AMD and Mediatek 

Merge series from Daniel Baluta <daniel.baluta@oss.nxp.com>:

This patchseries adds AMD Renoir ACP HW support.
parents 745a8e7c f063eba3

include/sound/sof/dai-amd.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */

/*

 * This file is provided under a dual BSD/GPLv2 license. When using or

 * redistributing this file, you may do so under either license.

 *

 * Copyright(c) 2021 Advanced Micro Devices, Inc.. All rights reserved.

 */



#ifndef __INCLUDE_SOUND_SOF_DAI_AMD_H__

#define __INCLUDE_SOUND_SOF_DAI_AMD_H__



#include <sound/sof/header.h>



/* ACP Configuration Request - SOF_IPC_DAI_AMD_CONFIG */

struct sof_ipc_dai_acp_params {

	struct sof_ipc_hdr hdr;



	uint32_t fsync_rate;    /* FSYNC frequency in Hz */

	uint32_t tdm_slots;

} __packed;

#endif

include/sound/sof/dai.h

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <sound/sof/header.h>

#include <sound/sof/dai-intel.h>

#include <sound/sof/dai-imx.h>

#include <sound/sof/dai-amd.h>



/*

 * DAI Configuration.
@@ -66,6 +67,9 @@ enum sof_ipc_dai_type { 
	SOF_DAI_INTEL_ALH,		/**< Intel ALH  */

	SOF_DAI_IMX_SAI,		/**< i.MX SAI */

	SOF_DAI_IMX_ESAI,		/**< i.MX ESAI */

	SOF_DAI_AMD_BT,			/**< AMD ACP BT*/

	SOF_DAI_AMD_SP,			/**< AMD ACP SP */

	SOF_DAI_AMD_DMIC,		/**< AMD ACP DMIC */

};



/* general purpose DAI configuration */
@@ -90,6 +94,9 @@ struct sof_ipc_dai_config { 
		struct sof_ipc_dai_alh_params alh;

		struct sof_ipc_dai_esai_params esai;

		struct sof_ipc_dai_sai_params sai;

		struct sof_ipc_dai_acp_params acpbt;

		struct sof_ipc_dai_acp_params acpsp;

		struct sof_ipc_dai_acp_params acpdmic;

	};

} __packed;

sound/soc/amd/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -96,4 +96,10 @@ config SND_SOC_AMD_YC_MACH 
	  Say m if you have such a device.

	  If unsure select "N".



config SND_AMD_ACP_CONFIG

	tristate "AMD ACP configuration selection"

	help

	 This option adds an auto detection to determine which ACP

	 driver modules to use



source "sound/soc/amd/acp/Kconfig"

sound/soc/amd/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ acp_audio_dma-objs := acp-pcm-dma.o 
snd-soc-acp-da7219mx98357-mach-objs := acp-da7219-max98357a.o

snd-soc-acp-rt5645-mach-objs := acp-rt5645.o

snd-soc-acp-rt5682-mach-objs := acp3x-rt5682-max9836.o

snd-acp-config-objs := acp-config.o



obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o

obj-$(CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH) += snd-soc-acp-da7219mx98357-mach.o
@@ -13,3 +14,4 @@ obj-$(CONFIG_SND_SOC_AMD_RENOIR) += renoir/ 
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/

obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/

obj-$(CONFIG_SND_SOC_AMD_ACP_COMMON) += acp/

obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o

sound/soc/amd/acp-config.c

0 → 100644
+71 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)

//

// This file is provided under a dual BSD/GPLv2 license. When using or

// redistributing this file, you may do so under either license.

//

// Copyright(c) 2021 Advanced Micro Devices, Inc.

//

// Authors: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>

//



/* ACP machine configuration module */



#include <linux/acpi.h>

#include <linux/bits.h>

#include <linux/dmi.h>

#include <linux/module.h>

#include <linux/pci.h>



#include "../sof/amd/acp.h"

#include "mach-config.h"



static int acp_quirk_data;



static const struct config_entry config_table[] = {

	{

		.flags = FLAG_AMD_SOF,

		.device = ACP_PCI_DEV_ID,

		.dmi_table = (const struct dmi_system_id []) {

			{

				.matches = {

					DMI_MATCH(DMI_SYS_VENDOR, "AMD"),

					DMI_MATCH(DMI_PRODUCT_NAME, "Majolica-CZN"),

				},

			},

			{}

		},

	},

};



int snd_amd_acp_find_config(struct pci_dev *pci)

{

	const struct config_entry *table = config_table;

	u16 device = pci->device;

	int i;



	for (i = 0; i < ARRAY_SIZE(config_table); i++, table++) {

		if (table->device != device)

			continue;

		if (table->dmi_table && !dmi_check_system(table->dmi_table))

			continue;

		acp_quirk_data = table->flags;

		return table->flags;

	}



	return 0;

}

EXPORT_SYMBOL(snd_amd_acp_find_config);



struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = {

	{

		.id = "AMDI1019",

		.drv_name = "renoir-dsp",

		.pdata = (void *)&acp_quirk_data,

		.fw_filename = "sof-rn.ri",

		.sof_tplg_filename = "sof-acp.tplg",

	},

	{},

};

EXPORT_SYMBOL(snd_soc_acpi_amd_sof_machines);



MODULE_LICENSE("Dual BSD/GPL");