Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: Intel: common: add table for HDA-based platforms 



Expose a table containing machine driver information for HDAudio-based
platforms handled by ASoC on Intel hardware.

We only set constant values that are valid across multiple
platforms. The firmware name used by the DSP will be set dynamically
for each platform.

The table is made of a single entry for now, if we need more
complicated set-up where HDAudio is mixed with ACPI-enumerated devices
(I2C, SoundWire) then we'd expect the differentiation to be handled
through information provided by the BIOS (as done for KBL
Chromebooks).

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b4af16d6

include/sound/soc-acpi-intel-match.h

+6 −0
Original line number Diff line number Diff line
@@ -25,4 +25,10 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[];



/*

 * generic table used for HDA codec-based platforms, possibly with

 * additional ACPI-enumerated codecs

 */

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[];



#endif

sound/soc/intel/common/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m 
	soc-acpi-intel-hsw-bdw-match.o \

	soc-acpi-intel-skl-match.o soc-acpi-intel-kbl-match.o \

	soc-acpi-intel-bxt-match.o soc-acpi-intel-glk-match.o \

	soc-acpi-intel-cnl-match.o

	soc-acpi-intel-cnl-match.o \

	soc-acpi-intel-hda-match.o



obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o

obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2018, Intel Corporation.



/*

 * soc-apci-intel-hda-match.c - tables and support for HDA+ACPI enumeration.

 *

 */



#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "../skylake/skl.h"



static struct skl_machine_pdata hda_pdata = {

	.use_tplg_pcm = true,

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[] = {

	{

		/* .id is not used in this file */

		.drv_name = "skl_hda_dsp_generic",



		/* .fw_filename is dynamically set in skylake driver */



		/* .sof_fw_filename is dynamically set in sof/intel driver */



		.sof_tplg_filename = "intel/sof-hda-generic.tplg",



		/*

		 * .machine_quirk and .quirk_data are not used here but

		 * can be used if we need a more complicated machine driver

		 * combining HDA+other device (e.g. DMIC).

		 */

		.pdata = &hda_pdata,

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_hda_machines);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel Common ACPI Match module");