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

ASoC: Intel: HSW and BDW updates 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

Sharing this PR as it touches on cross-driver subjects. Four commits yet
two subject. Given the small delta, decided to combine within single PR
here.
parents 63d375b9 a25e1183

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

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * these tables are not constants, some fields can be used for

 * pdata or machine ops

 */

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_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[];

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/boards/Makefile

+4 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

snd-soc-sst-haswell-objs := hsw_rt5640.o

snd-soc-hsw-rt5640-objs := hsw_rt5640.o

snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o

snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o

snd-soc-sst-broadwell-objs := bdw_rt286.o

snd-soc-bdw-rt286-objs := bdw_rt286.o

snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o

snd-soc-sst-bxt-rt298-objs := bxt_rt298.o

snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o
@@ -47,13 +47,13 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o 
obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH) += snd-soc-sof_es8336.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH) += snd-soc-sof_nau8825.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-hsw-rt5640.o

obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o

obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o

obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o

obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o

obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-bdw-rt286.o

obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o

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,

sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c

+0 −15
Original line number Diff line number Diff line
@@ -9,40 +9,25 @@ 
#include <sound/soc-acpi.h>

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



struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[] = {

	{

		.id = "INT33CA",

		.drv_name = "hsw_rt5640",

		.fw_filename = "intel/IntcSST1.bin",

		.sof_tplg_filename = "sof-hsw.tplg",

	},

	{}

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_haswell_machines);



struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = {

	{

		.id = "INT343A",

		.drv_name = "bdw_rt286",

		.fw_filename =  "intel/IntcSST2.bin",

		.sof_tplg_filename = "sof-bdw-rt286.tplg",

	},

	{

		.id = "10EC5650",

		.drv_name = "bdw-rt5650",

		.fw_filename = "intel/IntcSST2.bin",

		.sof_tplg_filename = "sof-bdw-rt5650.tplg",

	},

	{

		.id = "RT5677CE",

		.drv_name = "bdw-rt5677",

		.fw_filename =  "intel/IntcSST2.bin",

		.sof_tplg_filename = "sof-bdw-rt5677.tplg",

	},

	{

		.id = "INT33CA",

		.drv_name = "hsw_rt5640",

		.fw_filename = "intel/IntcSST2.bin",

		.sof_tplg_filename = "sof-bdw-rt5640.tplg",

	},

	{}