Unverified Commit 02f29be6 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: catpt: Drop SND_SOC_ACPI_INTEL_MATCH dependency 



catpt-driver does not make use of most of the fields found in the
descriptor table and is the sole user of haswell machines list. Move the
tables to local directory and clean them up so it's clear what's
actually used by the solution.

Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220815165818.3050649-4-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent efbaa668

sound/soc/intel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config SND_SOC_INTEL_CATPT 
	depends on ACPI || COMPILE_TEST

	depends on DMADEVICES && SND_DMA_SGBUF

	select DW_DMAC_CORE

	select SND_SOC_ACPI_INTEL_MATCH

	select SND_SOC_ACPI if ACPI

	select WANT_DEV_COREDUMP

	select SND_INTEL_DSP_CONFIG

	help

sound/soc/intel/catpt/device.c

+30 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <sound/intel-dsp-config.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

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

#include "core.h"

#include "registers.h"
@@ -310,8 +309,36 @@ static int catpt_acpi_remove(struct platform_device *pdev) 
	return 0;

}



static struct snd_soc_acpi_mach lpt_machines[] = {

	{

		.id = "INT33CA",

		.drv_name = "hsw_rt5640",

	},

	{}

};



static struct snd_soc_acpi_mach wpt_machines[] = {

	{

		.id = "INT33CA",

		.drv_name = "hsw_rt5640",

	},

	{

		.id = "INT343A",

		.drv_name = "bdw_rt286",

	},

	{

		.id = "10EC5650",

		.drv_name = "bdw-rt5650",

	},

	{

		.id = "RT5677CE",

		.drv_name = "bdw-rt5677",

	},

	{}

};



static struct catpt_spec lpt_desc = {

	.machines = snd_soc_acpi_intel_haswell_machines,

	.machines = lpt_machines,

	.core_id = 0x01,

	.host_dram_offset = 0x000000,

	.host_iram_offset = 0x080000,
@@ -326,7 +353,7 @@ static struct catpt_spec lpt_desc = { 
};



static struct catpt_spec wpt_desc = {

	.machines = snd_soc_acpi_intel_broadwell_machines,

	.machines = wpt_machines,

	.core_id = 0x02,

	.host_dram_offset = 0x000000,

	.host_iram_offset = 0x0A0000,