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

ASoC: SOF: remove references to Haswell 



There are no known commercial devices using Haswell, and there is no
support for Haswell in SOF so remove remaining definitions and
structures.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191217202231.18259-5-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ config SND_SOC_SOF_ACPI 
	select IOSF_MBI if X86 && PCI

	help

	  This adds support for ACPI enumeration. This option is required

	  to enable Intel Haswell/Broadwell/Baytrail/Cherrytrail devices

	  to enable Intel Broadwell/Baytrail/Cherrytrail devices

	  Say Y if you need this option

	  If unsure select "N".

sound/soc/sof/intel/shim.h

+2 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#define __SOF_INTEL_SHIM_H



/*

 * SHIM registers for BYT, BSW, CHT, HSW, BDW

 * SHIM registers for BYT, BSW, CHT, BDW

 */



#define SHIM_CSR		(SHIM_OFFSET + 0x00)
@@ -38,7 +38,7 @@ 
#define SHIM_PWMCTRL		0x1000



/*

 * SST SHIM register bits for BYT, BSW, CHT HSW, BDW

 * SST SHIM register bits for BYT, BSW, CHT, BDW

 * Register bit naming and functionaility can differ between devices.

 */
@@ -169,13 +169,11 @@ struct sof_intel_dsp_desc { 
extern const struct snd_sof_dsp_ops sof_tng_ops;

extern const struct snd_sof_dsp_ops sof_byt_ops;

extern const struct snd_sof_dsp_ops sof_cht_ops;

extern const struct snd_sof_dsp_ops sof_hsw_ops;

extern const struct snd_sof_dsp_ops sof_bdw_ops;



extern const struct sof_intel_dsp_desc byt_chip_info;

extern const struct sof_intel_dsp_desc cht_chip_info;

extern const struct sof_intel_dsp_desc bdw_chip_info;

extern const struct sof_intel_dsp_desc hsw_chip_info;

extern const struct sof_intel_dsp_desc tng_chip_info;



struct sof_intel_stream {

sound/soc/sof/sof-acpi-dev.c

+0 −20
Original line number Diff line number Diff line
@@ -35,23 +35,6 @@ MODULE_PARM_DESC(sof_acpi_debug, "SOF ACPI debug options (0x0 all off)"); 


#define SOF_ACPI_DISABLE_PM_RUNTIME BIT(0)



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HASWELL)

static const struct sof_dev_desc sof_acpi_haswell_desc = {

	.machines = snd_soc_acpi_intel_haswell_machines,

	.resindex_lpe_base = 0,

	.resindex_pcicfg_base = 1,

	.resindex_imr_base = -1,

	.irqindex_host_ipc = 0,

	.chip_info = &hsw_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.default_fw_filename = "sof-hsw.ri",

	.nocodec_tplg_filename = "sof-hsw-nocodec.tplg",

	.ops = &sof_hsw_ops,

	.arch_ops = &sof_xtensa_arch_ops

};

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

static const struct sof_dev_desc sof_acpi_broadwell_desc = {

	.machines = snd_soc_acpi_intel_broadwell_machines,
@@ -213,9 +196,6 @@ static int sof_acpi_remove(struct platform_device *pdev) 
}



static const struct acpi_device_id sof_acpi_match[] = {

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HASWELL)

	{ "INT33C8", (unsigned long)&sof_acpi_haswell_desc },

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

	{ "INT3438", (unsigned long)&sof_acpi_broadwell_desc },

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE