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

ASoC: SOF: Intel: Add support for MeteorLake 

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

Add platform abstraction for the Meteor Lake platform.

This platform has significant differences compared to the TGL/ADL
generation: it relies on new hardware using the code name 'ACE' and
only supports the INTEL_IPC4 protocol and firmware architecture based
on the Zephyr RTOS
parents 4edf738d 064520e8

include/linux/soundwire/sdw_intel.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


#define SDW_SHIM_BASE			0x2C000

#define SDW_ALH_BASE			0x2C800

#define SDW_SHIM_BASE_ACE		0x38000

#define SDW_ALH_BASE_ACE		0x24000

#define SDW_LINK_BASE			0x30000

#define SDW_LINK_SIZE			0x10000

sound/soc/sof/intel/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -221,6 +221,22 @@ config SND_SOC_SOF_ALDERLAKE 
	  Say Y if you have such a device.

	  If unsure select "N".



config SND_SOC_SOF_INTEL_MTL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_INTEL_IPC4



config SND_SOC_SOF_METEORLAKE

	tristate "SOF support for Meteorlake"

	default SND_SOC_SOF_PCI

	select SND_SOC_SOF_INTEL_MTL

	help

	  This adds support for Sound Open Firmware for Intel(R) platforms

	  using the Meteorlake processors.

	  Say Y if you have such a device.

	  If unsure select "N".



config SND_SOC_SOF_HDA_COMMON

	tristate

	select SND_SOC_SOF_INTEL_COMMON

sound/soc/sof/intel/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ snd-sof-acpi-intel-bdw-objs := bdw.o 
snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-bus.o \

				 apl.o cnl.o tgl.o icl.o hda-common-ops.o

				 apl.o cnl.o tgl.o icl.o mtl.o hda-common-ops.o

snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o



snd-sof-intel-hda-objs := hda-codec.o
@@ -24,9 +24,11 @@ snd-sof-pci-intel-apl-objs := pci-apl.o 
snd-sof-pci-intel-cnl-objs := pci-cnl.o

snd-sof-pci-intel-icl-objs := pci-icl.o

snd-sof-pci-intel-tgl-objs := pci-tgl.o

snd-sof-pci-intel-mtl-objs := pci-mtl.o



obj-$(CONFIG_SND_SOC_SOF_MERRIFIELD) += snd-sof-pci-intel-tng.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_APL) += snd-sof-pci-intel-apl.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_CNL) += snd-sof-pci-intel-cnl.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_ICL) += snd-sof-pci-intel-icl.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_TGL) += snd-sof-pci-intel-tgl.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_MTL) += snd-sof-pci-intel-mtl.o

sound/soc/sof/intel/apl.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	.ssp_base_offset = APL_SSP_BASE_OFFSET,

	.quirks = SOF_INTEL_PROCEN_FMT_QUIRK,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.hw_ip_version = SOF_INTEL_CAVS_1_5_PLUS,

};

EXPORT_SYMBOL_NS(apl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.sdw_alh_base = SDW_ALH_BASE,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.hw_ip_version = SOF_INTEL_CAVS_1_8,

};

EXPORT_SYMBOL_NS(cnl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
@@ -430,6 +431,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.sdw_alh_base = SDW_ALH_BASE,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.hw_ip_version = SOF_INTEL_CAVS_2_0,

};

EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);