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

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

ASoC: Intel: move SKL+ codec ACPI tables to common directory 



No functionality change, just move to common tables to make it easier
to deal with SOF and share the same machine drivers - as done
previously for BYT/CHT/HSW/BDW.

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

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

+5 −0
Original line number Diff line number Diff line
@@ -29,5 +29,10 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[];

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[];



#endif

sound/soc/intel/common/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -3,7 +3,11 @@ snd-soc-sst-dsp-objs := sst-dsp.o 
snd-soc-sst-acpi-objs := sst-acpi.o

snd-soc-sst-ipc-objs := sst-ipc.o

snd-soc-sst-firmware-objs := sst-firmware.o

snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o soc-acpi-intel-hsw-bdw-match.o

snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o \

	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



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-bxt-match.c

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

/*

 * soc-apci-intel-bxt-match.c - tables and support for BXT ACPI enumeration.

 *

 * Copyright (c) 2018, Intel Corporation.

 *

 */



#include <sound/soc-acpi.h>

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



static struct snd_soc_acpi_codecs bxt_codecs = {

	.num_codecs = 1,

	.codecs = {"MX98357A"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {

	{

		.id = "INT343A",

		.drv_name = "bxt_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

	},

	{

		.id = "DLGS7219",

		.drv_name = "bxt_da7219_max98357a",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &bxt_codecs,

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_bxt_machines);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel Common ACPI Match module");

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

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

/*

 * soc-apci-intel-cnl-match.c - tables and support for CNL ACPI enumeration.

 *

 * Copyright (c) 2018, Intel Corporation.

 *

 */



#include <sound/soc-acpi.h>

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

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



static struct skl_machine_pdata cnl_pdata = {

	.use_tplg_pcm = true,

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {

	{

		.id = "INT34C2",

		.drv_name = "cnl_rt274",

		.fw_filename = "intel/dsp_fw_cnl.bin",

		.pdata = &cnl_pdata,

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machines);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel Common ACPI Match module");

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

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

/*

 * soc-apci-intel-glk-match.c - tables and support for GLK ACPI enumeration.

 *

 * Copyright (c) 2018, Intel Corporation.

 *

 */



#include <sound/soc-acpi.h>

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



struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {

	{

		.id = "INT343A",

		.drv_name = "glk_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_glk.bin",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_glk_machines);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel Common ACPI Match module");